rscm 0.4.5 → 0.5.0

data/test/rscm/scm/cvs_test.rb

@@ -1,13 +1,16 @@
-require 'rscm/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 module RSCM
   class CvsTest < Test::Unit::TestCase
-    include Compatibility::DamageControlMinimal
-    include Compatibility::Full
+    compat(:rscm_engine, :full)
     
     def create_scm(repository_root_dir, path)
       Cvs.local(repository_root_dir, path)
     end
+
+    def test_dummy
+      # need 1 test in case p4 is not installed (compat will not add tests)
+    end
   end
 
   class Cvs

data/test/rscm/scm/darcs_test.rb

@@ -1,14 +1,11 @@
-require 'test/unit'
-require 'fileutils'
-require 'rscm'
-require 'rscm/generic_scm_tests'
+require File.dirname(__FILE__) + '/../test_helper'
 
 module RSCM
   class DarcsTest < Test::Unit::TestCase
-    include GenericSCMTests
+    compat(:rscm_engine)
 
-    def create_scm(repository_root_dir, path)
-      Darcs.new(repository_root_dir)
+    def test_dummy
+      # need 1 test in case darcs is not installed (compat will not add tests)
     end
   end
 end

data/test/rscm/scm/perforce_test.rb

@@ -1,7 +1,11 @@
-require 'rscm/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 module RSCM
   class PerforceTest < Test::Unit::TestCase
-    include Compatibility::DamageControlMinimal
+    compat(:rscm_engine)
+
+    def test_dummy
+      # need 1 test in case p4 is not installed (compat will not add tests)
+    end
   end
 end

data/test/rscm/scm/star_team_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module RSCM
+  class StarTeamTest < Test::Unit::TestCase
+
+    def test_dummy
+    end
+
+  end
+end

data/test/rscm/scm/subversion_log_parser_test.rb

@@ -1,6 +1,5 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'stringio'
-require 'rscm'
 
 module RSCM
   class SubversionLogParserTest < Test::Unit::TestCase
@@ -135,7 +134,7 @@ Updated website for 1.1.2 release.
 ------------------------------------------------------------------------
 EOF
 
-    def test_should_filter_out_unwanted_entries
+    def OBSOLETE_SINCE_URL_ARG_WILL_FILTER_test_should_filter_out_unwanted_entries
       parser = SubversionLogParser.new(StringIO.new(SVN_XSTREAM_LOG), "svn://foo/trunk/xstream/")
       revisions = parser.parse_revisions
       assert_equal(593, revisions[0].identifier)
@@ -180,7 +179,8 @@ EOF
       assert_equal("build.xml", slep.relative_path(url, "trunk/xstream/build.xml"))
       assert_equal("build.xml", slep.relative_path(url, "scm/trunk/xstream/build.xml"))
       assert_equal("boo/build.xml", slep.relative_path(url, "trunk/xstream/boo/build.xml"))
-      assert_equal(nil, slep.relative_path(url, "trunk/xstream-website/boo/build.xml"))
+      #obsolete since url arg will filter out
+      #assert_equal(nil, slep.relative_path(url, "trunk/xstream-website/boo/build.xml"))
     end
 
     # http://jira.codehaus.org/browse/DC-427
@@ -218,10 +218,43 @@ EOF
     
     # We support paths from root only if path is specified
     def test_no_prefix_log
-      parser = SubversionLogParser.new(StringIO.new(NO_PREFIX_LOG), "svn://mooky/funny/", nil, "")
+      parser = SubversionLogParser.new(StringIO.new(NO_PREFIX_LOG), "svn://mooky/funny", nil, nil, "")
       revisions = parser.parse_revisions
       assert_equal("Rakefile", revisions[0][0].path)
       assert_equal("lib/foo.rb", revisions[0][1].path)
     end
+
+NO_AUTHOR_LOG = <<-EOF
+------------------------------------------------------------------------
+r407118 | (no author) | (no date) | 1 line
+
+
+------------------------------------------------------------------------
+r407119 | sebor | 2006-05-16 20:27:28 -0500 (Tue, 16 May 2006) | 5 lines
+Changed paths:
+   M /incubator/stdcxx/trunk/tests/containers/23.vector.modifiers.cpp
+
+2006-05-16  Martin Sebor  <sebor@roguewave.com>
+
+        * vector_modifiers.cpp (test_insert): Corrected formatting.
+        (test_insert_range): Added test cases exercising STDCXX-179.
+
+------------------------------------------------------------------------
+EOF
+
+    # sometimes svn logs have no authors or dates. this is probably because of
+    # migrating from a different scm such as cvs
+    def test_no_author_log
+      url = "http://svn.apache.org/repos/asf/incubator/stdcxx/trunk"
+      path = "incubator/stdcxx/trunk"
+      parser = SubversionLogParser.new(StringIO.new(NO_AUTHOR_LOG), url, nil, nil, path)
+      revisions = parser.parse_revisions
+      revisions.sort!
+      assert_equal(1, revisions.length)
+
+      assert_equal(1, revisions[0].length)
+      assert_equal("tests/containers/23.vector.modifiers.cpp", revisions[0][0].path)
+    end
+    
   end
 end

data/test/rscm/scm/subversion_test.rb

@@ -1,9 +1,8 @@
-require 'rscm/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 module RSCM
   class SubversionTest < Test::Unit::TestCase
-    include Compatibility::DamageControlMinimal
-    include Compatibility::Full
+    compat(:rscm_engine, :full)
 
     def create_scm(repository_root_dir, path)
       Subversion.new(PathConverter.filepath_to_nativeurl("#{repository_root_dir}/#{path}"), path)

data/test/rscm/test_helper.rb

@@ -1,9 +1,48 @@
 require 'test/unit'
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../test')
+$LOAD_PATH.uniq!
 require 'rscm'
 require 'rscm/tempdir'
 require 'rscm/compatibility/full'
-require 'rscm/compatibility/damage_control_minimal'
+require 'rscm/compatibility/rscm_engine'
 
 module RSCM
-  DEFAULT_OPTIONS = {:stdout => 'target/stdout.log', :stderr => 'target/stderr.log'}.freeze
+  class Base
+    DEFAULT_OPTIONS = {:stdout => 'target/stdout.log', :stderr => 'target/stderr.log'}.freeze unless defined? DEFAULT_OPTIONS
+
+    def default_options
+      DEFAULT_OPTIONS
+    end
+  end
+end
+
+module Test
+  module Unit
+    class TestCase
+      SUITES = {
+        :rscm_engine     => RSCM::Compatibility::RscmEngine,
+        :full            => RSCM::Compatibility::Full
+      } unless defined? SUITES
+
+      # Call from scm adapter tests to have compatibility test suites included.
+      def self.compat(*suite_keys)
+        scm_class_name = self.name.match(/(.*)Test/)[1]
+        scm_class = eval(scm_class_name)
+        scm = scm_class.new
+        if(scm.installed?)
+          suite_keys.each do |key| 
+            suite = SUITES[key]
+            raise "The compat method arguments must be among #{SUITES.keys.join(', ')}" if suite.nil?
+
+            STDERR.puts "INFO: Running #{suite} suite for #{scm_class_name}."
+            include suite
+          end
+        else
+          STDERR.puts "WARNING: Skipping #{suite} suite for #{scm_class_name}. It's not available."
+        end
+      end
+    
+    end
+  end
 end

data/testproject/damagecontrolled/build.xml

@@ -1,155 +1,155 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0
-  on date October 26 2003, time 1700-->
-
-<project default="jar" name="damagecontrolled" basedir=".">
-  <property name="defaulttargetdir" value="target">
-  </property>
-  <property name="libdir" value="target/lib">
-  </property>
-  <property name="classesdir" value="target/classes">
-  </property>
-  <property name="testclassesdir" value="target/test-classes">
-  </property>
-  <property name="testreportdir" value="target/test-reports">
-  </property>
-  <property name="distdir" value="dist">
-  </property>
-  <property name="javadocdir" value="dist/docs/api">
-  </property>
-  <property name="final.name" value="damagecontrolled-1.0">
-  </property>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}">
-    </mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}">
-      </equals>
-    </condition>
-  </target>
-  <target name="compile" description="o Compile the code" depends="get-deps">
-    <mkdir dir="${classesdir}">
-    </mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/java">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-      </classpath>
-    </javac>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile,test">
-    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
-    </jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}">
-    </delete>
-    <delete dir="${distdir}">
-    </delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist">
-    </mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar">
-      </fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*">
-      </fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures.">
-    </fail>
-  </target>
-  <target name="internal-test" depends="compile-tests">
-    <mkdir dir="${testreportdir}">
-    </mkdir>
-    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
-      <sysproperty key="basedir" value=".">
-      </sysproperty>
-      <formatter type="xml">
-      </formatter>
-      <formatter usefile="false" type="plain">
-      </formatter>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${testclassesdir}">
-        </pathelement>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="C:\scm\damagecontrol\testdata\damagecontrolled\src\test">
-          <include name="**/*TestCase.java">
-          </include>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="compile-tests" depends="compile">
-    <mkdir dir="${testclassesdir}">
-    </mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="C:\scm\damagecontrol\testdata\damagecontrolled\src\test">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-    </javac>
-  </target>
-  <target name="javadoc" description="o Generate javadoc" depends="jar">
-    <mkdir dir="${javadocdir}">
-    </mkdir>
-    <tstamp>
-      <format pattern="2003-yyyy" property="year">
-      </format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved.">
-    </property>
-    <property name="title" value="DamageControlled 1.0 API">
-    </property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="C:\scm\damagecontrol\testdata\damagecontrolled\src\java" packagenames="com.thoughtworks.*">
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement location="target/${final.name}.jar">
-        </pathelement>
-      </classpath>
-    </javadoc>
-  </target>
-  <target name="get-deps" unless="noget" depends="init">
-    <!--
-    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
-    </get>
-    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
-    </get>
-    <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
-    </get>
-    -->
-  </target>
-  <target name="install-maven">
-    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
-    </get>
-    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-    </unjar>
-  </target>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--build.xml generated by maven from project.xml version 1.0
+  on date October 26 2003, time 1700-->
+
+<project default="jar" name="damagecontrolled" basedir=".">
+  <property name="defaulttargetdir" value="target">
+  </property>
+  <property name="libdir" value="target/lib">
+  </property>
+  <property name="classesdir" value="target/classes">
+  </property>
+  <property name="testclassesdir" value="target/test-classes">
+  </property>
+  <property name="testreportdir" value="target/test-reports">
+  </property>
+  <property name="distdir" value="dist">
+  </property>
+  <property name="javadocdir" value="dist/docs/api">
+  </property>
+  <property name="final.name" value="damagecontrolled-1.0">
+  </property>
+  <target name="init" description="o Initializes some properties">
+    <mkdir dir="${libdir}">
+    </mkdir>
+    <condition property="noget">
+      <equals arg2="only" arg1="${build.sysclasspath}">
+      </equals>
+    </condition>
+  </target>
+  <target name="compile" description="o Compile the code" depends="get-deps">
+    <mkdir dir="${classesdir}">
+    </mkdir>
+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+      <src>
+        <pathelement location="${basedir}/src/java">
+        </pathelement>
+      </src>
+      <classpath>
+        <fileset dir="${libdir}">
+          <include name="*.jar">
+          </include>
+        </fileset>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" description="o Create the jar" depends="compile,test">
+    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+    </jar>
+  </target>
+  <target name="clean" description="o Clean up the generated directories">
+    <delete dir="${defaulttargetdir}">
+    </delete>
+    <delete dir="${distdir}">
+    </delete>
+  </target>
+  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+    <mkdir dir="dist">
+    </mkdir>
+    <copy todir="dist">
+      <fileset dir="${defaulttargetdir}" includes="*.jar">
+      </fileset>
+      <fileset dir="${basedir}" includes="LICENSE*, README*">
+      </fileset>
+    </copy>
+  </target>
+  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+    <fail message="There were test failures.">
+    </fail>
+  </target>
+  <target name="internal-test" depends="compile-tests">
+    <mkdir dir="${testreportdir}">
+    </mkdir>
+    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+      <sysproperty key="basedir" value=".">
+      </sysproperty>
+      <formatter type="xml">
+      </formatter>
+      <formatter usefile="false" type="plain">
+      </formatter>
+      <classpath>
+        <fileset dir="${libdir}">
+          <include name="*.jar">
+          </include>
+        </fileset>
+        <pathelement path="${testclassesdir}">
+        </pathelement>
+        <pathelement path="${classesdir}">
+        </pathelement>
+      </classpath>
+      <batchtest todir="${testreportdir}">
+        <fileset dir="C:\scm\damagecontrol\testdata\damagecontrolled\src\test">
+          <include name="**/*TestCase.java">
+          </include>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="compile-tests" depends="compile">
+    <mkdir dir="${testclassesdir}">
+    </mkdir>
+    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+      <src>
+        <pathelement location="C:\scm\damagecontrol\testdata\damagecontrolled\src\test">
+        </pathelement>
+      </src>
+      <classpath>
+        <fileset dir="${libdir}">
+          <include name="*.jar">
+          </include>
+        </fileset>
+        <pathelement path="${classesdir}">
+        </pathelement>
+      </classpath>
+    </javac>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="jar">
+    <mkdir dir="${javadocdir}">
+    </mkdir>
+    <tstamp>
+      <format pattern="2003-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved.">
+    </property>
+    <property name="title" value="DamageControlled 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="C:\scm\damagecontrol\testdata\damagecontrolled\src\java" packagenames="com.thoughtworks.*">
+      <classpath>
+        <fileset dir="${libdir}">
+          <include name="*.jar">
+          </include>
+        </fileset>
+        <pathelement location="target/${final.name}.jar">
+        </pathelement>
+      </classpath>
+    </javadoc>
+  </target>
+  <target name="get-deps" unless="noget" depends="init">
+    <!--
+    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
+    </get>
+    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
+    </get>
+    <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
+    </get>
+    -->
+  </target>
+  <target name="install-maven">
+    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
+    </get>
+    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+    </unjar>
+  </target>
 </project>