continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r732284 - /continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
Date Wed, 07 Jan 2009 09:28:02 GMT
Author: oching
Date: Wed Jan  7 01:28:01 2009
New Revision: 732284

URL: http://svn.apache.org/viewvc?rev=732284&view=rev
Log:
updated test cases in DefaultContinuumTest wrt to changes for parallel builds

Modified:
    continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java

Modified: continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=732284&r1=732283&r2=732284&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
(original)
+++ continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
Wed Jan  7 01:28:01 2009
@@ -40,8 +40,6 @@
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.utils.ContinuumUrlValidator;
-import org.codehaus.plexus.taskqueue.TaskQueue;
-import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,19 +57,7 @@
     {
         lookup( Continuum.ROLE );
     }
-
-    public void testLookups()
-        throws Exception
-    {
-        lookup( TaskQueue.ROLE, "build-project" );
-
-        lookup( TaskQueue.ROLE, "check-out-project" );
-
-        lookup( TaskQueueExecutor.ROLE, "build-project" );
-
-        lookup( TaskQueueExecutor.ROLE, "check-out-project" );
-    }
-
+    
     public void testAddMavenTwoProjectSet()
         throws Exception
     {
@@ -352,10 +338,8 @@
         throws Exception
     {
         Continuum continuum = (Continuum) lookup( Continuum.ROLE );
-
-        TaskQueueManager taskQueueManager = (TaskQueueManager) lookup( TaskQueueManager.ROLE
);
         
-        BuildsManager parallelBuildsManager = (BuildsManager) lookup( BuildsManager.class,
"parallel" );
+        BuildsManager parallelBuildsManager = continuum.getBuildsManager();
         
         String url = getTestFile( "src/test-projects/project1/pom.xml" ).toURL().toExternalForm();
 
@@ -370,14 +354,11 @@
         assertEquals( Project.class, projects.get( 0 ).getClass() );
 
         Project project = (Project) projects.get( 0 );
-
-        /*assertTrue( "project missing from the checkout queue",
-                    parallelBuildsManager.removeProjectFromCheckoutQueue( project.getId()
) );*/
-        /*assertTrue( "project missing from the checkout queue",
-                    taskQueueManager.removeProjectFromCheckoutQueue( project.getId() ) );
-
+        
+        parallelBuildsManager.removeProjectFromCheckoutQueue( project.getId() );
+        
         assertFalse( "project still exist on the checkout queue",
-                     taskQueueManager.removeProjectFromCheckoutQueue( project.getId() ) );*/
+                     parallelBuildsManager.isInAnyCheckoutQueue( project.getId() ) );
     }
 
     public void testAddAntProjectWithdefaultBuildDef()



Mime
View raw message