You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2010/01/15 02:38:05 UTC
svn commit: r899512 -
/continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutorTest.java
Author: ctan
Date: Fri Jan 15 01:38:05 2010
New Revision: 899512
URL: http://svn.apache.org/viewvc?rev=899512&view=rev
Log:
fixed test
Modified:
continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutorTest.java
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutorTest.java?rev=899512&r1=899511&r2=899512&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutorTest.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutorTest.java Fri Jan 15 01:38:05 2010
@@ -25,8 +25,11 @@
import java.util.List;
import java.util.Map;
+import org.apache.continuum.buildmanager.BuildsManager;
+import org.apache.continuum.buildmanager.ParallelBuildsManager;
import org.apache.continuum.dao.ProjectScmRootDao;
import org.apache.continuum.model.project.ProjectScmRoot;
+import org.apache.continuum.taskqueue.BuildProjectTask;
import org.apache.continuum.taskqueue.PrepareBuildProjectsTask;
import org.apache.maven.continuum.AbstractContinuumTest;
import org.apache.maven.continuum.configuration.ConfigurationService;
@@ -59,6 +62,8 @@
private ConfigurationService configurationService;
+ private BuildsManager buildsManager;
+
@Override
protected void setUp()
throws Exception
@@ -77,6 +82,8 @@
actionManager = (ActionManager) lookup( ActionManager.ROLE );
configurationService = (ConfigurationService ) lookup( "configurationService" );
+
+ buildsManager = (ParallelBuildsManager) lookup( BuildsManager.class, "parallel" );
}
public void testCheckoutPrepareBuildMultiModuleProject()
@@ -111,6 +118,12 @@
assertTrue( "checkout directory of project 'module-A' does not exist.", new File( workingDir, Integer.toString( moduleA.getId() ) ).exists() );
assertTrue( "checkout directory of project 'module-B' does not exist.", new File( workingDir, Integer.toString( moduleB.getId() ) ).exists() );
+
+ while( !buildsManager.getCurrentBuilds().isEmpty() ||
+ isAnyProjectInBuildQueue() )
+ {
+ Thread.sleep( 10 );
+ }
}
public void testCheckoutPrepareBuildMultiModuleProjectFreshBuild()
@@ -145,6 +158,12 @@
assertTrue( "checkout directory of project 'module-A' does not exist.", new File( workingDir, Integer.toString( moduleA.getId() ) ).exists() );
assertTrue( "checkout directory of project 'module-B' does not exist.", new File( workingDir, Integer.toString( moduleB.getId() ) ).exists() );
+
+ while( !buildsManager.getCurrentBuilds().isEmpty() ||
+ isAnyProjectInBuildQueue() )
+ {
+ Thread.sleep( 10 );
+ }
}
/*
public void testCheckoutPrepareBuildSingleCheckedoutMultiModuleProject()
@@ -424,4 +443,20 @@
return path1.substring( 0, indexDiff );
}
}
+
+ private boolean isAnyProjectInBuildQueue()
+ throws Exception
+ {
+ Map<String, List<BuildProjectTask>> buildTasks = buildsManager.getProjectsInBuildQueues();
+
+ for ( String queue : buildTasks.keySet() )
+ {
+ if ( !buildTasks.get( queue ).isEmpty() )
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
}