Diff of /maven/continuum/trunk/continuum-core-it/it.py

Parent Directory | Revision Log | Patch

--- maven/continuum/trunk/continuum-core-it/it.py	2005/05/02 10:55:17	165618
+++ maven/continuum/trunk/continuum-core-it/it.py	2005/05/02 11:49:52	165619
@@ -305,7 +305,7 @@ print "Running integration tests"
 print ""
 print "NOTE:"
 print "When running these integration tests you will get some"
-print "stacktraces related."
+print "stacktraces. This is normal and expected."
 print "############################################################"
 print ""
 
@@ -335,7 +335,7 @@ if 1:
     progress( "Initializing Maven 1 CVS project" )
     initMaven1Project( maven1Project, "cvs", cvsroot, "maven-1" )
     progress( "Adding Maven 1 project" )
-    maven1Id = continuum.addProjectFromUrl( "file:" + maven1Project + "/project.xml", "maven-1" )
+    maven1Id = continuum.addMavenOneProject( "file:" + maven1Project + "/project.xml" )
     maven1 = continuum.getProject( maven1Id )
     assertProject( maven1Id, "Maven 1 Project", email, continuum.STATE_NEW, "1.0", "maven-1", maven1 )
     assertCheckedOutFiles( maven1, [ "/project.xml", "/src/main/java/Foo.java" ] )
@@ -371,7 +371,7 @@ if 1:
     progress( "Initializing Maven 2 CVS project" )
     initMaven2Project( maven2Project, cvsroot, "maven-2" )
     progress( "Adding Maven 2 project" )
-    maven2Id = continuum.addProjectFromUrl( "file:" + maven2Project + "/pom.xml", "maven2" )
+    maven2Id = continuum.addMavenTwoProject( "file:" + maven2Project + "/pom.xml" )
     maven2 = continuum.getProject( maven2Id )
     assertProject( maven2Id, "Maven 2 Project", email, continuum.STATE_NEW, "2.0-SNAPSHOT", "maven2", maven2 )
 
@@ -391,11 +391,11 @@ if 1:
     svnImport( antProject, svnroot, "ant-svn" )
 
     progress( "Adding Ant SVN project" )
-    antSvnId = continuum.addProjectFromScm( "scm:svn:file://" + svnroot + "/ant-svn", "ant", "Ant SVN Project", email, "3.0",
-                                            {
-                                                "executable": "ant",
-                                                "targets" : "clean, build"
-                                            } )
+    antSvnId = continuum.addAntProject( "scm:svn:file://" + svnroot + "/ant-svn", "Ant SVN Project", email, "3.0",
+                                        {
+                                            "executable": "ant",
+                                            "targets" : "clean, build"
+                                        } )
     antSvn = continuum.getProject( antSvnId )
     assertProject( antSvnId, "Ant SVN Project", email, continuum.STATE_NEW, "3.0", "ant", antSvn )
     progress( "Building SVN Ant project" )
@@ -408,8 +408,8 @@ if 1:
     progress( "Initializing Ant CVS project" )
     initAntProject( antProject )
     cvsImport( antProject, cvsroot, "ant-cvs" )
-    antCvsId = continuum.addProjectFromScm( "scm:cvs:local:" + basedir + "/cvsroot:ant-cvs", "ant", "Ant CVS Project", email, "3.0",
-                                         { "executable": "ant", "targets" : "clean, build"} )
+    antCvsId = continuum.addAntProject( "scm:cvs:local:" + basedir + "/cvsroot:ant-cvs", "Ant CVS Project", email, "3.0",
+                                      { "executable": "ant", "targets" : "clean, build"} )
     antCvs = continuum.getProject( antCvsId )
     assertProject( antCvsId, "Ant CVS Project", email, continuum.STATE_NEW, "3.0", "ant", antCvs )
     progress( "Building CVS Ant project" )
@@ -423,8 +423,8 @@ if 1:
     cvsImport( shellProject, cvsroot, "shell" )
 
     progress( "Adding CVS Shell project" )
-    shellId = continuum.addProjectFromScm( "scm:cvs:local:" + basedir + "/cvsroot:shell", "shell", "Shell Project", email, "3.0",
-                                           { "executable": "script.sh", "arguments" : ""} )
+    shellId = continuum.addShellProject( "scm:cvs:local:" + basedir + "/cvsroot:shell", "Shell Project", email, "3.0",
+                                         { "executable": "script.sh", "arguments" : ""} )
 
     shell = continuum.getProject( shellId )
     assertProject( shellId, "Shell Project", email, continuum.STATE_NEW, "3.0", "shell", shell )