From commits-return-5771-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Wed Oct 07 02:17:35 2009 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 57052 invoked from network); 7 Oct 2009 02:17:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Oct 2009 02:17:35 -0000 Received: (qmail 83465 invoked by uid 500); 7 Oct 2009 02:17:35 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 83412 invoked by uid 500); 7 Oct 2009 02:17:35 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 83402 invoked by uid 99); 7 Oct 2009 02:17:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Oct 2009 02:17:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Oct 2009 02:17:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0B8C623888D6; Wed, 7 Oct 2009 02:17:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r822551 - /continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Date: Wed, 07 Oct 2009 02:17:10 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091007021711.0B8C623888D6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctan Date: Wed Oct 7 02:17:10 2009 New Revision: 822551 URL: http://svn.apache.org/viewvc?rev=822551&view=rev Log: fixed unit test for removing a project with build result Modified: continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Modified: continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=822551&r1=822550&r2=822551&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Wed Oct 7 02:17:10 2009 @@ -27,6 +27,7 @@ import java.util.Map; import org.apache.continuum.buildmanager.BuildsManager; +import org.apache.continuum.dao.BuildResultDao; import org.apache.continuum.dao.ProjectDao; import org.apache.continuum.model.release.ContinuumReleaseResult; import org.apache.continuum.model.repository.LocalRepository; @@ -37,6 +38,7 @@ import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants; import org.apache.maven.continuum.initialization.ContinuumInitializer; import org.apache.maven.continuum.model.project.BuildDefinition; +import org.apache.maven.continuum.model.project.BuildResult; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.model.project.ProjectNotifier; @@ -62,6 +64,8 @@ private ProjectDao projectDao; + private BuildResultDao buildResultDao; + @Override protected void setUp() throws Exception @@ -170,39 +174,40 @@ { Continuum continuum = (Continuum) lookup( Continuum.ROLE ); - String url = getTestFile( "src/test-projects/project1/pom.xml" ).toURL().toExternalForm(); + Project project = makeStubProject( "test-project" ); - ContinuumProjectBuildingResult result = continuum.addMavenTwoProject( url ); + ProjectGroup defaultGroup = getDefaultProjectGroup(); - assertNotNull( result ); + defaultGroup.addProject( project ); - List projects = result.getProjects(); + getProjectGroupDao().updateProjectGroup( defaultGroup ); - assertEquals( 1, projects.size() ); + project = getProjectDao().getProjectByName( "test-project" ); - assertEquals( Project.class, projects.get( 0 ).getClass() ); + assertNotNull ( project ); - Project project = projects.get( 0 ); + BuildResult buildResult = new BuildResult(); - continuum.buildProject( project.getId() ); + getBuildResultDao().addBuildResult( project, buildResult ); - // wait for build to finish - Thread.sleep( 5000 ); + Collection brs = continuum.getBuildResultsForProject( project.getId() ); + + assertEquals( "Build result of project was not added", 1, brs.size() ); // delete project continuum.removeProject( project.getId() ); try { - project = continuum.getProject( project.getId() ); - - assertNull( project ); + continuum.getProject( project.getId() ); fail( "Project was not removed" ); } - catch ( Exception e ) + catch ( ContinuumException expected ) { - // successfully removed project + brs = continuum.getBuildResultsForProject( project.getId() ); + + assertEquals( "Build result of project was not removed", 0, brs.size() ); } } @@ -620,4 +625,9 @@ { return (Continuum) lookup( Continuum.ROLE ); } + + private BuildResultDao getBuildResultDao() + { + return (BuildResultDao) lookup( BuildResultDao.class.getName() ); + } }