continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1372260 [21/30] - in /continuum/trunk: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/ continuum-api/src/main/java/org/a...
Date Mon, 13 Aug 2012 04:29:28 GMT
Modified: continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java (original)
+++ continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java Mon Aug 13 04:29:09 2012
@@ -175,13 +175,13 @@ public abstract class AbstractContinuumS
 
         createStore();
 
-        directoryPurgeConfigurationDao =
-            (DirectoryPurgeConfigurationDao) lookup( DirectoryPurgeConfigurationDao.class.getName() );
+        directoryPurgeConfigurationDao = (DirectoryPurgeConfigurationDao) lookup(
+            DirectoryPurgeConfigurationDao.class.getName() );
 
         localRepositoryDao = (LocalRepositoryDao) lookup( LocalRepositoryDao.class.getName() );
 
-        repositoryPurgeConfigurationDao =
-            (RepositoryPurgeConfigurationDao) lookup( RepositoryPurgeConfigurationDao.class.getName() );
+        repositoryPurgeConfigurationDao = (RepositoryPurgeConfigurationDao) lookup(
+            RepositoryPurgeConfigurationDao.class.getName() );
 
         installationDao = (InstallationDao) lookup( InstallationDao.class.getName() );
 
@@ -301,8 +301,8 @@ public abstract class AbstractContinuumS
         defaultProjectGroup = createTestProjectGroup( "Default Group", "The Default Group",
                                                       "org.apache.maven.test.default", localRepository1 );
 
-        testProjectGroup2 =
-            createTestProjectGroup( "test group 2", "test group 2 desc", "test group 2 groupId", localRepository2 );
+        testProjectGroup2 = createTestProjectGroup( "test group 2", "test group 2 desc", "test group 2 groupId",
+                                                    localRepository2 );
 
         testProject1 = createTestProject( "artifactId1", 1, "description1", defaultProjectGroup.getGroupId(), "name1",
                                           "scmUrl1", 1, "url1", "version1", "workingDirectory1" );
@@ -314,21 +314,21 @@ public abstract class AbstractContinuumS
         testSchedule1 = createTestSchedule( "name1", "description1", 1, "cronExpression1", true );
         testSchedule1.addBuildQueue( buildQueue1 );
         testSchedule1.addBuildQueue( buildQueue2 );
-        
+
         testSchedule2 = createTestSchedule( "name2", "description2", 2, "cronExpression2", true );
         testSchedule2.addBuildQueue( buildQueue2 );
         testSchedule2.addBuildQueue( buildQueue3 );
 
         testSchedule3 = createTestSchedule( "name3", "description3", 3, "cronExpression3", true );
 
-        testInstallationJava13 =
-            createTestInstallation( "JDK 1.3", InstallationService.JDK_TYPE, "JAVA_HOME", "/usr/local/java-1.3" );
-        testInstallationJava14 =
-            createTestInstallation( "JDK 1.4", InstallationService.JDK_TYPE, "JAVA_HOME", "/usr/local/java-1.4" );
+        testInstallationJava13 = createTestInstallation( "JDK 1.3", InstallationService.JDK_TYPE, "JAVA_HOME",
+                                                         "/usr/local/java-1.3" );
+        testInstallationJava14 = createTestInstallation( "JDK 1.4", InstallationService.JDK_TYPE, "JAVA_HOME",
+                                                         "/usr/local/java-1.4" );
         testInstallationMaven20a3 = createTestInstallation( "Maven 2.0 alpha 3", InstallationService.MAVEN2_TYPE,
                                                             "M2_HOME", "/usr/local/maven-2.0-alpha-3" );
-        testInstallationEnvVar =
-            createTestInstallation( "Maven Heap Size", InstallationService.ENVVAR_TYPE, "MAVEN_OPTS", "-Xms256m -Xmx256m" );
+        testInstallationEnvVar = createTestInstallation( "Maven Heap Size", InstallationService.ENVVAR_TYPE,
+                                                         "MAVEN_OPTS", "-Xms256m -Xmx256m" );
 
         ProjectNotifier testGroupNotifier1 = createTestNotifier( 1, true, false, true, "type1" );
         ProjectNotifier testGroupNotifier2 = createTestNotifier( 2, false, true, false, "type2" );
@@ -352,7 +352,7 @@ public abstract class AbstractContinuumS
         Calendar cal = Calendar.getInstance();
         cal.setTime( new Date( baseTime ) );
         cal.add( Calendar.DAY_OF_MONTH, 1 );
-        
+
         long newTime = cal.getTimeInMillis();
 
         // successful forced build
@@ -460,14 +460,14 @@ public abstract class AbstractContinuumS
             installationEnvVar.setInstallationId( 4 );
         }
 
-        testProfile1 =
-            createTestProfile( "name1", "description1", 1, true, true, installationJava13, installationMaven20a3 );
-        testProfile2 =
-            createTestProfile( "name2", "description2", 2, false, true, installationJava14, installationMaven20a3 );
-        testProfile3 =
-            createTestProfile( "name3", "description3", 3, true, false, installationJava14, installationMaven20a3 );
-        testProfile4 =
-            createTestProfile( "name4", "description4", 4, false, false, installationJava14, installationMaven20a3 );
+        testProfile1 = createTestProfile( "name1", "description1", 1, true, true, installationJava13,
+                                          installationMaven20a3 );
+        testProfile2 = createTestProfile( "name2", "description2", 2, false, true, installationJava14,
+                                          installationMaven20a3 );
+        testProfile3 = createTestProfile( "name3", "description3", 3, true, false, installationJava14,
+                                          installationMaven20a3 );
+        testProfile4 = createTestProfile( "name4", "description4", 4, false, false, installationJava14,
+                                          installationMaven20a3 );
         testProfile4.addEnvironmentVariable( installationEnvVar );
 
         Profile profile1 = createTestProfile( testProfile1 );
@@ -514,76 +514,77 @@ public abstract class AbstractContinuumS
             profile4.setId( 4 );
         }
 
-        testRepoPurgeConfiguration1 =
-            createTestRepositoryPurgeConfiguration( true, 5, 50, false, schedule2, true, localRepository1 );
+        testRepoPurgeConfiguration1 = createTestRepositoryPurgeConfiguration( true, 5, 50, false, schedule2, true,
+                                                                              localRepository1 );
         if ( addToStore )
         {
-            testRepoPurgeConfiguration1 =
-                repositoryPurgeConfigurationDao.addRepositoryPurgeConfiguration( testRepoPurgeConfiguration1 );
+            testRepoPurgeConfiguration1 = repositoryPurgeConfigurationDao.addRepositoryPurgeConfiguration(
+                testRepoPurgeConfiguration1 );
         }
         else
         {
             testRepoPurgeConfiguration1.setId( 1 );
         }
 
-        testRepoPurgeConfiguration2 =
-            createTestRepositoryPurgeConfiguration( false, 10, 200, true, schedule1, true, localRepository2 );
+        testRepoPurgeConfiguration2 = createTestRepositoryPurgeConfiguration( false, 10, 200, true, schedule1, true,
+                                                                              localRepository2 );
         if ( addToStore )
         {
-            testRepoPurgeConfiguration2 =
-                repositoryPurgeConfigurationDao.addRepositoryPurgeConfiguration( testRepoPurgeConfiguration2 );
+            testRepoPurgeConfiguration2 = repositoryPurgeConfigurationDao.addRepositoryPurgeConfiguration(
+                testRepoPurgeConfiguration2 );
         }
         else
         {
             testRepoPurgeConfiguration2.setId( 2 );
         }
 
-        testRepoPurgeConfiguration3 =
-            createTestRepositoryPurgeConfiguration( false, 10, 200, true, schedule2, true, localRepository1 );
+        testRepoPurgeConfiguration3 = createTestRepositoryPurgeConfiguration( false, 10, 200, true, schedule2, true,
+                                                                              localRepository1 );
         if ( addToStore )
         {
-            testRepoPurgeConfiguration3 =
-                repositoryPurgeConfigurationDao.addRepositoryPurgeConfiguration( testRepoPurgeConfiguration3 );
+            testRepoPurgeConfiguration3 = repositoryPurgeConfigurationDao.addRepositoryPurgeConfiguration(
+                testRepoPurgeConfiguration3 );
         }
         else
         {
             testRepoPurgeConfiguration3.setId( 3 );
         }
 
-        testDirectoryPurgeConfig =
-            createTestDirectoryPurgeConfiguration( "location1", "directoryType1", true, 10, 50, schedule2, true );
+        testDirectoryPurgeConfig = createTestDirectoryPurgeConfiguration( "location1", "directoryType1", true, 10, 50,
+                                                                          schedule2, true );
         if ( addToStore )
         {
-            testDirectoryPurgeConfig =
-                directoryPurgeConfigurationDao.addDirectoryPurgeConfiguration( testDirectoryPurgeConfig );
+            testDirectoryPurgeConfig = directoryPurgeConfigurationDao.addDirectoryPurgeConfiguration(
+                testDirectoryPurgeConfig );
         }
         else
         {
             testDirectoryPurgeConfig.setId( 1 );
         }
 
-        BuildDefinition testGroupBuildDefinition1 =
-            createTestBuildDefinition( "arguments1", "buildFile1", "goals1", profile1, schedule2, false, false );
-        BuildDefinition testGroupBuildDefinition2 =
-            createTestBuildDefinition( "arguments2", "buildFile2", "goals2", profile1, schedule1, false, false );
-        BuildDefinition testGroupBuildDefinition3 =
-            createTestBuildDefinition( "arguments3", "buildFile3", "goals3", profile2, schedule1, false, false );
-        BuildDefinition testGroupBuildDefinition4 =
-            createTestBuildDefinition( null, null, "deploy", null, null, false, false );
-
-        BuildDefinition testBuildDefinition1 =
-            createTestBuildDefinition( "arguments11", "buildFile11", "goals11", profile2, schedule1, false, false );
-        BuildDefinition testBuildDefinition2 =
-            createTestBuildDefinition( "arguments12", "buildFile12", "goals12", profile2, schedule2, false, false );
-        BuildDefinition testBuildDefinition3 =
-            createTestBuildDefinition( "arguments13", "buildFile13", "goals13", profile1, schedule2, false, false );
-        BuildDefinition testBuildDefinition4 =
-            createTestBuildDefinition( null, null, "deploy", null, null, false, false );
-        BuildDefinition testBuildDefinition5 =
-            createTestBuildDefinition( "arguments14", "buildFile14", "goals14", profile1, schedule1, false, false );
+        BuildDefinition testGroupBuildDefinition1 = createTestBuildDefinition( "arguments1", "buildFile1", "goals1",
+                                                                               profile1, schedule2, false, false );
+        BuildDefinition testGroupBuildDefinition2 = createTestBuildDefinition( "arguments2", "buildFile2", "goals2",
+                                                                               profile1, schedule1, false, false );
+        BuildDefinition testGroupBuildDefinition3 = createTestBuildDefinition( "arguments3", "buildFile3", "goals3",
+                                                                               profile2, schedule1, false, false );
+        BuildDefinition testGroupBuildDefinition4 = createTestBuildDefinition( null, null, "deploy", null, null, false,
+                                                                               false );
+
+        BuildDefinition testBuildDefinition1 = createTestBuildDefinition( "arguments11", "buildFile11", "goals11",
+                                                                          profile2, schedule1, false, false );
+        BuildDefinition testBuildDefinition2 = createTestBuildDefinition( "arguments12", "buildFile12", "goals12",
+                                                                          profile2, schedule2, false, false );
+        BuildDefinition testBuildDefinition3 = createTestBuildDefinition( "arguments13", "buildFile13", "goals13",
+                                                                          profile1, schedule2, false, false );
+        BuildDefinition testBuildDefinition4 = createTestBuildDefinition( null, null, "deploy", null, null, false,
+                                                                          false );
+        BuildDefinition testBuildDefinition5 = createTestBuildDefinition( "arguments14", "buildFile14", "goals14",
+                                                                          profile1, schedule1, false, false );
         testBuildDefinition5.setTemplate( true );
-            
-        BuildDefinitionTemplate testBuildDefinitionTemplate1 = createTestBuildDefinitionTemplate( "template2", "type2", false );
+
+        BuildDefinitionTemplate testBuildDefinitionTemplate1 = createTestBuildDefinitionTemplate( "template2", "type2",
+                                                                                                  false );
         testBuildDefinitionTemplate1.addBuildDefinition( testBuildDefinition5 );
 
         if ( addToStore )
@@ -723,7 +724,7 @@ public abstract class AbstractContinuumS
         systemConfiguration.setWorkingDirectory( "workingDirectory" );
 
         if ( addToStore && !isTestFromDataManagementTool )
-        {   
+        {
             systemConfiguration = systemConfigurationDao.addSystemConfiguration( systemConfiguration );
         }
         else
@@ -741,8 +742,8 @@ public abstract class AbstractContinuumS
             {
                 isExisting = true;
             }
-            
-            if( !isExisting )
+
+            if ( !isExisting )
             {
                 systemConfiguration = systemConfigurationDao.getSystemConfiguration();
                 systemConfiguration.setBaseUrl( "baseUrl" );
@@ -753,11 +754,11 @@ public abstract class AbstractContinuumS
                 systemConfiguration.setGuestAccountEnabled( false );
                 systemConfiguration.setInitialized( true );
                 systemConfiguration.setWorkingDirectory( "workingDirectory" );
-                
+
                 systemConfigurationDao.updateSystemConfiguration( systemConfiguration );
             }
         }
-        
+
         testProjectScmRoot = createTestProjectScmRoot( "scmRootAddress1", 1, 0, "error1", group );
         ProjectScmRoot scmRoot = createTestProjectScmRoot( testProjectScmRoot );
 
@@ -967,9 +968,12 @@ public abstract class AbstractContinuumS
 */
         assertSystemConfiguration( systemConfiguration, systemConfigurationDao.getSystemConfiguration() );
 
-        assertLocalRepositoryEquals( testLocalRepository1, localRepositoryDao.getLocalRepository( testLocalRepository1.getId() ) );
-        assertLocalRepositoryEquals( testLocalRepository2, localRepositoryDao.getLocalRepository( testLocalRepository2.getId() ) );
-        assertLocalRepositoryEquals( testLocalRepository3, localRepositoryDao.getLocalRepository( testLocalRepository3.getId() ) );
+        assertLocalRepositoryEquals( testLocalRepository1, localRepositoryDao.getLocalRepository(
+            testLocalRepository1.getId() ) );
+        assertLocalRepositoryEquals( testLocalRepository2, localRepositoryDao.getLocalRepository(
+            testLocalRepository2.getId() ) );
+        assertLocalRepositoryEquals( testLocalRepository3, localRepositoryDao.getLocalRepository(
+            testLocalRepository3.getId() ) );
 
 /*
         assertRepositoryPurgeConfigurationEquals( testRepoPurgeConfiguration1,
@@ -982,9 +986,11 @@ public abstract class AbstractContinuumS
         assertDirectoryPurgeConfigurationEquals( testDirectoryPurgeConfig, 
                                                  directoryPurgeConfigurationDao.getDirectoryPurgeConfiguration( testDirectoryPurgeConfig.getId() ) );
 */
-        assertProjectScmRootEquals( testProjectScmRoot, projectScmRootDao.getProjectScmRoot( testProjectScmRoot.getId() ) );
+        assertProjectScmRootEquals( testProjectScmRoot, projectScmRootDao.getProjectScmRoot(
+            testProjectScmRoot.getId() ) );
 
-        assertReleaseResultEquals( testContinuumReleaseResult, releaseResultDao.getContinuumReleaseResult( testContinuumReleaseResult.getId() ) );
+        assertReleaseResultEquals( testContinuumReleaseResult, releaseResultDao.getContinuumReleaseResult(
+            testContinuumReleaseResult.getId() ) );
     }
 
     private void assertSystemConfiguration( SystemConfiguration expected, SystemConfiguration actual )
@@ -1007,7 +1013,7 @@ public abstract class AbstractContinuumS
         assertEquals( 0, profileDao.getAllProfilesByName().size() );
         assertEquals( 0, projectGroupDao.getAllProjectGroups().size() );
         assertEquals( 0, projectDao.getAllProjectsByName().size() );
-        if( !isTestFromDataManagementTool )
+        if ( !isTestFromDataManagementTool )
         {
             assertNull( systemConfigurationDao.getSystemConfiguration() );
         }
@@ -1016,9 +1022,9 @@ public abstract class AbstractContinuumS
     protected static BuildDefinition createTestBuildDefinition( BuildDefinition buildDefinition )
     {
         return createTestBuildDefinition( buildDefinition.getArguments(), buildDefinition.getBuildFile(),
-                                          buildDefinition.getGoals(), buildDefinition.getProfile(), buildDefinition
-            .getSchedule(), buildDefinition.isDefaultForProject(), buildDefinition
-            .isBuildFresh() );
+                                          buildDefinition.getGoals(), buildDefinition.getProfile(),
+                                          buildDefinition.getSchedule(), buildDefinition.isDefaultForProject(),
+                                          buildDefinition.isBuildFresh() );
     }
 
     protected static BuildDefinition createTestBuildDefinition( String arguments, String buildFile, String goals,
@@ -1111,7 +1117,8 @@ public abstract class AbstractContinuumS
     }
 
     private static BuildResult createTestBuildResult( int trigger, boolean success, int state, int exitCode,
-                                                      String error, int buildNumber, long startTime, long endTime, String triggeredBy )
+                                                      String error, int buildNumber, long startTime, long endTime,
+                                                      String triggeredBy )
     {
         BuildResult result = new BuildResult();
         result.setBuildNumber( buildNumber );
@@ -1144,8 +1151,8 @@ public abstract class AbstractContinuumS
 
     protected static Schedule createTestSchedule( Schedule schedule )
     {
-        return createTestSchedule( schedule.getName(), schedule.getDescription(), schedule.getDelay(), schedule
-            .getCronExpression(), schedule.isActive(), schedule.getBuildQueues() );
+        return createTestSchedule( schedule.getName(), schedule.getDescription(), schedule.getDelay(),
+                                   schedule.getCronExpression(), schedule.isActive(), schedule.getBuildQueues() );
     }
 
     protected static Schedule createTestSchedule( String name, String description, int delay, String cronExpression,
@@ -1153,7 +1160,7 @@ public abstract class AbstractContinuumS
     {
         return createTestSchedule( name, description, delay, cronExpression, active, null );
     }
-                                                  
+
     protected static Schedule createTestSchedule( String name, String description, int delay, String cronExpression,
                                                   boolean active, List<BuildQueue> buildQueues )
     {
@@ -1170,9 +1177,9 @@ public abstract class AbstractContinuumS
 
     protected static Profile createTestProfile( Profile profile )
     {
-        return createTestProfile( profile.getName(), profile.getDescription(), profile.getScmMode(), profile
-            .isBuildWithoutChanges(), profile.isActive(), profile.getJdk(), profile.getBuilder(),
-                                      profile.getEnvironmentVariables() );
+        return createTestProfile( profile.getName(), profile.getDescription(), profile.getScmMode(),
+                                  profile.isBuildWithoutChanges(), profile.isActive(), profile.getJdk(),
+                                  profile.getBuilder(), profile.getEnvironmentVariables() );
     }
 
     protected static Profile createTestProfile( String name, String description, int scmMode,
@@ -1217,9 +1224,9 @@ public abstract class AbstractContinuumS
 
     protected static Project createTestProject( Project project )
     {
-        return createTestProject( project.getArtifactId(), project.getBuildNumber(), project.getDescription(), project
-            .getGroupId(), project.getName(), project.getScmUrl(), project.getState(), project.getUrl(), project
-            .getVersion(), project.getWorkingDirectory() );
+        return createTestProject( project.getArtifactId(), project.getBuildNumber(), project.getDescription(),
+                                  project.getGroupId(), project.getName(), project.getScmUrl(), project.getState(),
+                                  project.getUrl(), project.getVersion(), project.getWorkingDirectory() );
     }
 
     protected static Project createTestProject( String artifactId, int buildNumber, String description, String groupId,
@@ -1250,14 +1257,14 @@ public abstract class AbstractContinuumS
         assertEquals( "compare expectedProject - groupId", expectedProject.getGroupId(), project.getGroupId() );
         assertEquals( "compare expectedProject - artifactId", expectedProject.getArtifactId(),
                       project.getArtifactId() );
-        assertEquals( "compare expectedProject - buildNumber", expectedProject.getBuildNumber(), project
-            .getBuildNumber() );
+        assertEquals( "compare expectedProject - buildNumber", expectedProject.getBuildNumber(),
+                      project.getBuildNumber() );
         assertEquals( "compare expectedProject - scmUrl", expectedProject.getScmUrl(), project.getScmUrl() );
         assertEquals( "compare expectedProject - state", expectedProject.getState(), project.getState() );
         assertEquals( "compare expectedProject - url", expectedProject.getUrl(), project.getUrl() );
         assertEquals( "compare expectedProject - version", expectedProject.getVersion(), project.getVersion() );
-        assertEquals( "compare expectedProject - workingDirectory", expectedProject.getWorkingDirectory(), project
-            .getWorkingDirectory() );
+        assertEquals( "compare expectedProject - workingDirectory", expectedProject.getWorkingDirectory(),
+                      project.getWorkingDirectory() );
     }
 
     protected static void assertProjectGroupEquals( ProjectGroup expectedGroup, ProjectGroup actualGroup )
@@ -1281,8 +1288,8 @@ public abstract class AbstractContinuumS
             assertEquals( "compare schedule - desc", expectedSchedule.getDescription(),
                           actualSchedule.getDescription() );
             assertEquals( "compare schedule - delay", expectedSchedule.getDelay(), actualSchedule.getDelay() );
-            assertEquals( "compare schedule - cron", expectedSchedule.getCronExpression(), actualSchedule
-                .getCronExpression() );
+            assertEquals( "compare schedule - cron", expectedSchedule.getCronExpression(),
+                          actualSchedule.getCronExpression() );
             assertEquals( "compare schedule - active", expectedSchedule.isActive(), actualSchedule.isActive() );
         }
     }
@@ -1296,8 +1303,8 @@ public abstract class AbstractContinuumS
             assertEquals( "compare profile - name", expectedProfile.getName(), actualProfile.getName() );
             assertEquals( "compare profile - desc", expectedProfile.getDescription(), actualProfile.getDescription() );
             assertEquals( "compare profile - scmMode", expectedProfile.getScmMode(), actualProfile.getScmMode() );
-            assertEquals( "compare profile - build w/o changes", expectedProfile.isBuildWithoutChanges(), actualProfile
-                .isBuildWithoutChanges() );
+            assertEquals( "compare profile - build w/o changes", expectedProfile.isBuildWithoutChanges(),
+                          actualProfile.isBuildWithoutChanges() );
             assertEquals( "compare profile - active", expectedProfile.isActive(), actualProfile.isActive() );
         }
     }
@@ -1329,8 +1336,8 @@ public abstract class AbstractContinuumS
         assertEquals( "compare SCM result - changes size", actual.getChanges().size(), expected.getChanges().size() );
         for ( int i = 0; i < actual.getChanges().size(); i++ )
         {
-            assertChangeSetEquals( (ChangeSet) expected.getChanges().get( i ),
-                                   (ChangeSet) actual.getChanges().get( i ) );
+            assertChangeSetEquals( (ChangeSet) expected.getChanges().get( i ), (ChangeSet) actual.getChanges().get(
+                i ) );
         }
     }
 
@@ -1343,8 +1350,8 @@ public abstract class AbstractContinuumS
         assertEquals( "compare change set result - files size", expected.getFiles().size(), actual.getFiles().size() );
         for ( int i = 0; i < actual.getFiles().size(); i++ )
         {
-            assertChangeFileEquals( (ChangeFile) expected.getFiles().get( i ),
-                                    (ChangeFile) actual.getFiles().get( i ) );
+            assertChangeFileEquals( (ChangeFile) expected.getFiles().get( i ), (ChangeFile) actual.getFiles().get(
+                i ) );
         }
     }
 
@@ -1392,8 +1399,8 @@ public abstract class AbstractContinuumS
                       actualBuildDefinition.getArguments() );
         assertEquals( "compare build definition - build file", expectedBuildDefinition.getBuildFile(),
                       actualBuildDefinition.getBuildFile() );
-        assertEquals( "compare build definition - goals", expectedBuildDefinition.getGoals(), actualBuildDefinition
-            .getGoals() );
+        assertEquals( "compare build definition - goals", expectedBuildDefinition.getGoals(),
+                      actualBuildDefinition.getGoals() );
         assertEquals( "compare build definition - build fresh", expectedBuildDefinition.isBuildFresh(),
                       actualBuildDefinition.isBuildFresh() );
         assertEquals( "compare build definition - defaultForProject", expectedBuildDefinition.isDefaultForProject(),
@@ -1405,8 +1412,7 @@ public abstract class AbstractContinuumS
     {
         for ( int i = 0; i < actualDevelopers.size(); i++ )
         {
-            assertDeveloperEquals( expectedDevelopers.get( i ), actualDevelopers
-                .get( i ) );
+            assertDeveloperEquals( expectedDevelopers.get( i ), actualDevelopers.get( i ) );
         }
     }
 
@@ -1415,8 +1421,8 @@ public abstract class AbstractContinuumS
         assertEquals( "compare developer - name", expectedDeveloper.getName(), actualDeveloper.getName() );
         assertEquals( "compare developer - email", expectedDeveloper.getEmail(), actualDeveloper.getEmail() );
         assertEquals( "compare developer - scmId", expectedDeveloper.getScmId(), actualDeveloper.getScmId() );
-        assertEquals( "compare developer - continuumId", expectedDeveloper.getContinuumId(), actualDeveloper
-            .getContinuumId() );
+        assertEquals( "compare developer - continuumId", expectedDeveloper.getContinuumId(),
+                      actualDeveloper.getContinuumId() );
     }
 
     protected static void assertDependenciesEqual( List<ProjectDependency> expectedDependencies,
@@ -1432,8 +1438,8 @@ public abstract class AbstractContinuumS
                                                   ProjectDependency actualDependency )
     {
         assertEquals( "compare dependency - groupId", expectedDependency.getGroupId(), actualDependency.getGroupId() );
-        assertEquals( "compare dependency - artifactId", expectedDependency.getArtifactId(), actualDependency
-            .getArtifactId() );
+        assertEquals( "compare dependency - artifactId", expectedDependency.getArtifactId(),
+                      actualDependency.getArtifactId() );
         assertEquals( "compare dependency - version", expectedDependency.getVersion(), actualDependency.getVersion() );
     }
 
@@ -1444,8 +1450,8 @@ public abstract class AbstractContinuumS
 
     protected static ProjectDeveloper createTestDeveloper( ProjectDeveloper developer )
     {
-        return createTestDeveloper( developer.getContinuumId(), developer.getEmail(), developer.getName(), developer
-            .getScmId() );
+        return createTestDeveloper( developer.getContinuumId(), developer.getEmail(), developer.getName(),
+                                    developer.getScmId() );
     }
 
     protected static ProjectDependency createTestDependency( String groupId, String artifactId, String version )
@@ -1587,38 +1593,38 @@ public abstract class AbstractContinuumS
         assertEquals( "compare directory purge configuration - enabled", expectedConfig.isEnabled(),
                       actualConfig.isEnabled() );
     }
-    
+
     protected static ProjectScmRoot createTestProjectScmRoot( String scmRootAddress, int state, int oldState,
                                                               String error, ProjectGroup group )
     {
         ProjectScmRoot projectScmRoot = new ProjectScmRoot();
-        
+
         projectScmRoot.setScmRootAddress( scmRootAddress );
         projectScmRoot.setState( state );
         projectScmRoot.setOldState( oldState );
         projectScmRoot.setError( error );
         projectScmRoot.setProjectGroup( group );
-        
+
         return projectScmRoot;
     }
 
     protected static ProjectScmRoot createTestProjectScmRoot( ProjectScmRoot scmRoot )
     {
-        return createTestProjectScmRoot( scmRoot.getScmRootAddress(), scmRoot.getState(), scmRoot.getOldState(), 
+        return createTestProjectScmRoot( scmRoot.getScmRootAddress(), scmRoot.getState(), scmRoot.getOldState(),
                                          scmRoot.getError(), scmRoot.getProjectGroup() );
     }
 
     protected static void assertProjectScmRootEquals( ProjectScmRoot expectedConfig, ProjectScmRoot actualConfig )
     {
         assertEquals( "compare project scm root - id", expectedConfig.getId(), actualConfig.getId() );
-        assertEquals( "compare project scm root - scmUrl", expectedConfig.getScmRootAddress(), 
-                                                           actualConfig.getScmRootAddress() );
+        assertEquals( "compare project scm root - scmUrl", expectedConfig.getScmRootAddress(),
+                      actualConfig.getScmRootAddress() );
         assertEquals( "compare project scm root - state", expectedConfig.getState(), actualConfig.getState() );
         assertEquals( "compare project scm root - oldState", expectedConfig.getOldState(), actualConfig.getOldState() );
         assertEquals( "compare project scm root - error", expectedConfig.getError(), actualConfig.getError() );
     }
 
-    protected static ContinuumReleaseResult createTestContinuumReleaseResult( ProjectGroup group, Project project, 
+    protected static ContinuumReleaseResult createTestContinuumReleaseResult( ProjectGroup group, Project project,
                                                                               String releaseGoal, int resultCode,
                                                                               long startTime, long endTime )
     {
@@ -1629,26 +1635,26 @@ public abstract class AbstractContinuumS
         releaseResult.setResultCode( resultCode );
         releaseResult.setStartTime( startTime );
         releaseResult.setEndTime( endTime );
-        
+
         return releaseResult;
     }
 
     protected static ContinuumReleaseResult createTestContinuumReleaseResult( ContinuumReleaseResult releaseResult )
     {
-        return createTestContinuumReleaseResult( releaseResult.getProjectGroup(), releaseResult.getProject(), 
+        return createTestContinuumReleaseResult( releaseResult.getProjectGroup(), releaseResult.getProject(),
                                                  releaseResult.getReleaseGoal(), releaseResult.getResultCode(),
                                                  releaseResult.getStartTime(), releaseResult.getEndTime() );
     }
 
-    protected static void assertReleaseResultEquals( ContinuumReleaseResult expectedConfig, 
+    protected static void assertReleaseResultEquals( ContinuumReleaseResult expectedConfig,
                                                      ContinuumReleaseResult actualConfig )
     {
         assertEquals( "compare continuum release result - id", expectedConfig.getId(), actualConfig.getId() );
         assertEquals( "compare continuum release result - releaseGoal", expectedConfig.getReleaseGoal(),
                       actualConfig.getReleaseGoal() );
-        assertEquals( "compare continuum release result - resultCode", expectedConfig.getResultCode(), 
+        assertEquals( "compare continuum release result - resultCode", expectedConfig.getResultCode(),
                       actualConfig.getResultCode() );
-        assertEquals( "compare continuum release result - startTime", expectedConfig.getStartTime(), 
+        assertEquals( "compare continuum release result - startTime", expectedConfig.getStartTime(),
                       actualConfig.getStartTime() );
         assertEquals( "compare continuum release result - endTime", expectedConfig.getEndTime(),
                       actualConfig.getEndTime() );
@@ -1673,7 +1679,8 @@ public abstract class AbstractContinuumS
         assertEquals( "compare build queue - name", expectedConfig.getName(), actualConfig.getName() );
     }
 
-    protected static BuildDefinitionTemplate createTestBuildDefinitionTemplate( String name, String type, boolean continuumDefault )
+    protected static BuildDefinitionTemplate createTestBuildDefinitionTemplate( String name, String type,
+                                                                                boolean continuumDefault )
     {
         BuildDefinitionTemplate template = new BuildDefinitionTemplate();
         template.setName( name );
@@ -1691,8 +1698,8 @@ public abstract class AbstractContinuumS
     protected void createStore()
         throws Exception
     {
-        DefaultConfigurableJdoFactory jdoFactory =
-            (DefaultConfigurableJdoFactory) lookup( JdoFactory.ROLE, "continuum" );
+        DefaultConfigurableJdoFactory jdoFactory = (DefaultConfigurableJdoFactory) lookup( JdoFactory.ROLE,
+                                                                                           "continuum" );
 
         jdoFactory.setUrl( "jdbc:hsqldb:mem:" + getName() );
 

Modified: continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java (original)
+++ continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java Mon Aug 13 04:29:09 2012
@@ -372,7 +372,7 @@ public class ContinuumStoreTest
         assertEquals( "check size of buildQueues", 2, schedule.getBuildQueues().size() );
         assertBuildQueueEquals( buildQueue1, schedule.getBuildQueues().get( 0 ) );
         assertBuildQueueEquals( buildQueue2, schedule.getBuildQueues().get( 1 ) );
-        
+
         schedule = schedules.get( 1 );
         assertScheduleEquals( testSchedule2, schedule );
         assertEquals( "check size of buildQueues", 2, schedule.getBuildQueues().size() );
@@ -525,17 +525,17 @@ public class ContinuumStoreTest
         String nameFirstEnvVar = "firstEnvVar";
         String nameSecondEnvVar = "secondEnvVar";
 
-        Installation testOne =
-            createTestInstallation( nameFirstInst, InstallationService.JDK_TYPE, "varName", "varValue" );
+        Installation testOne = createTestInstallation( nameFirstInst, InstallationService.JDK_TYPE, "varName",
+                                                       "varValue" );
 
-        Installation testTwo =
-            createTestInstallation( nameSecondInst, InstallationService.MAVEN2_TYPE, "varName", "varValue" );
+        Installation testTwo = createTestInstallation( nameSecondInst, InstallationService.MAVEN2_TYPE, "varName",
+                                                       "varValue" );
 
-        Installation firstEnvVar =
-            createTestInstallation( nameFirstEnvVar, InstallationService.MAVEN2_TYPE, "varName", "varValue" );
+        Installation firstEnvVar = createTestInstallation( nameFirstEnvVar, InstallationService.MAVEN2_TYPE, "varName",
+                                                           "varValue" );
 
-        Installation secondEnvVar =
-            createTestInstallation( nameSecondEnvVar, InstallationService.MAVEN2_TYPE, "varName", "varValue" );
+        Installation secondEnvVar = createTestInstallation( nameSecondEnvVar, InstallationService.MAVEN2_TYPE,
+                                                            "varName", "varValue" );
 
         testOne = installationDao.addInstallation( testOne );
         testTwo = installationDao.addInstallation( testTwo );
@@ -745,9 +745,8 @@ public class ContinuumStoreTest
     public void testGetProjectGroupWithDetails()
         throws ContinuumStoreException
     {
-        ProjectGroup retrievedGroup =
-            projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId( defaultProjectGroup
-                .getId() );
+        ProjectGroup retrievedGroup = projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId(
+            defaultProjectGroup.getId() );
         assertProjectGroupEquals( defaultProjectGroup, retrievedGroup );
         assertNotifiersEqual( defaultProjectGroup.getNotifiers(), retrievedGroup.getNotifiers() );
         assertBuildDefinitionsEqual( retrievedGroup.getBuildDefinitions(), defaultProjectGroup.getBuildDefinitions() );
@@ -983,7 +982,7 @@ public class ContinuumStoreTest
         project = projectDao.getProjectWithAllDetails( testProject1.getId() );
         assertEquals( "check # build defs", 2, project.getBuildDefinitions().size() );
         BuildDefinition retrievedBuildDefinition = project.getBuildDefinitions().get( 0 );
-        
+
         assertBuildDefinitionEquals( copy, retrievedBuildDefinition );
         assertScheduleEquals( testSchedule1, retrievedBuildDefinition.getSchedule() );
         assertProfileEquals( testProfile2, retrievedBuildDefinition.getProfile() );
@@ -1012,8 +1011,8 @@ public class ContinuumStoreTest
     public void testAddNotifierToProjectGroup()
         throws ContinuumStoreException
     {
-        ProjectGroup projectGroup =
-            projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId( defaultProjectGroup.getId() );
+        ProjectGroup projectGroup = projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId(
+            defaultProjectGroup.getId() );
 
         ProjectNotifier notifier = createTestNotifier( 14, true, false, true, "TADNTPG type" );
         ProjectNotifier copy = createTestNotifier( notifier );
@@ -1028,8 +1027,8 @@ public class ContinuumStoreTest
     public void testEditGroupNotifier()
         throws ContinuumStoreException
     {
-        ProjectGroup projectGroup =
-            projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId( defaultProjectGroup.getId() );
+        ProjectGroup projectGroup = projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId(
+            defaultProjectGroup.getId() );
 
         ProjectNotifier newNotifier = projectGroup.getNotifiers().get( 0 );
         // If we use "type1.1", jpox-rc2 store "type1", weird
@@ -1047,8 +1046,8 @@ public class ContinuumStoreTest
     public void testDeleteGroupNotifier()
         throws ContinuumStoreException
     {
-        ProjectGroup projectGroup =
-            projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId( defaultProjectGroup.getId() );
+        ProjectGroup projectGroup = projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId(
+            defaultProjectGroup.getId() );
         ProjectNotifier notifier = projectGroup.getNotifiers().get( 1 );
         projectGroup.getNotifiers().remove( 0 );
         projectGroupDao.updateProjectGroup( projectGroup );
@@ -1064,8 +1063,8 @@ public class ContinuumStoreTest
     public void testAddBuildDefinitionToProjectGroup()
         throws ContinuumStoreException
     {
-        ProjectGroup projectGroup =
-            projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId( defaultProjectGroup.getId() );
+        ProjectGroup projectGroup = projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId(
+            defaultProjectGroup.getId() );
 
         Profile profile = profileDao.getProfile( testProfile1.getId() );
         Schedule schedule = scheduleDao.getSchedule( testSchedule1.getId() );
@@ -1086,8 +1085,8 @@ public class ContinuumStoreTest
     public void testEditGroupBuildDefinition()
         throws ContinuumStoreException
     {
-        ProjectGroup projectGroup =
-            projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId( defaultProjectGroup.getId() );
+        ProjectGroup projectGroup = projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId(
+            defaultProjectGroup.getId() );
 
         BuildDefinition newBuildDefinition = projectGroup.getBuildDefinitions().get( 0 );
 
@@ -1109,8 +1108,8 @@ public class ContinuumStoreTest
     public void testDeleteGroupBuildDefinition()
         throws ContinuumStoreException
     {
-        ProjectGroup projectGroup =
-            projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId( defaultProjectGroup.getId() );
+        ProjectGroup projectGroup = projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId(
+            defaultProjectGroup.getId() );
         projectGroup.getBuildDefinitions().remove( 0 );
         projectGroupDao.updateProjectGroup( projectGroup );
 
@@ -1148,8 +1147,8 @@ public class ContinuumStoreTest
         assertEquals( all + 1, buildDefinitionDao.getAllBuildDefinitions().size() );
         assertEquals( 2, buildDefinitionTemplateDao.getAllBuildDefinitionTemplate().size() );
 
-        template = buildDefinitionTemplateDao
-            .getContinuumBuildDefinitionTemplateWithType( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR );
+        template = buildDefinitionTemplateDao.getContinuumBuildDefinitionTemplateWithType(
+            ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR );
 
         assertNotNull( template );
         assertEquals( 1, template.getBuildDefinitions().size() );
@@ -1217,15 +1216,15 @@ public class ContinuumStoreTest
         LocalRepository repository = localRepositoryDao.getLocalRepository( testLocalRepository3.getId() );
         Schedule schedule = scheduleDao.getSchedule( testSchedule1.getId() );
 
-        RepositoryPurgeConfiguration repoPurge =
-            createTestRepositoryPurgeConfiguration( true, 2, 100, false, schedule, true, repository );
+        RepositoryPurgeConfiguration repoPurge = createTestRepositoryPurgeConfiguration( true, 2, 100, false, schedule,
+                                                                                         true, repository );
 
         RepositoryPurgeConfiguration copy = createTestRepositoryPurgeConfiguration( repoPurge );
         repositoryPurgeConfigurationDao.addRepositoryPurgeConfiguration( repoPurge );
         copy.setId( repoPurge.getId() );
 
-        RepositoryPurgeConfiguration retrieved =
-            repositoryPurgeConfigurationDao.getRepositoryPurgeConfiguration( repoPurge.getId() );
+        RepositoryPurgeConfiguration retrieved = repositoryPurgeConfigurationDao.getRepositoryPurgeConfiguration(
+            repoPurge.getId() );
         assertRepositoryPurgeConfigurationEquals( copy, retrieved );
         assertLocalRepositoryEquals( testLocalRepository3, retrieved.getRepository() );
         assertScheduleEquals( testSchedule1, retrieved.getSchedule() );
@@ -1234,8 +1233,8 @@ public class ContinuumStoreTest
     public void testRemoveRepositoryPurgeConfiguration()
         throws Exception
     {
-        RepositoryPurgeConfiguration repoPurge =
-            repositoryPurgeConfigurationDao.getRepositoryPurgeConfiguration( testRepoPurgeConfiguration2.getId() );
+        RepositoryPurgeConfiguration repoPurge = repositoryPurgeConfigurationDao.getRepositoryPurgeConfiguration(
+            testRepoPurgeConfiguration2.getId() );
         repositoryPurgeConfigurationDao.removeRepositoryPurgeConfiguration( repoPurge );
 
         List<RepositoryPurgeConfiguration> repoPurgeList =
@@ -1251,15 +1250,15 @@ public class ContinuumStoreTest
         String directoryType = "release";
 
         Schedule schedule = scheduleDao.getSchedule( testSchedule1.getId() );
-        DirectoryPurgeConfiguration dirPurge =
-            createTestDirectoryPurgeConfiguration( location, directoryType, false, 2, 100, schedule, true );
+        DirectoryPurgeConfiguration dirPurge = createTestDirectoryPurgeConfiguration( location, directoryType, false, 2,
+                                                                                      100, schedule, true );
 
         DirectoryPurgeConfiguration copy = createTestDirectoryPurgeConfiguration( dirPurge );
         directoryPurgeConfigurationDao.addDirectoryPurgeConfiguration( dirPurge );
         copy.setId( dirPurge.getId() );
 
-        DirectoryPurgeConfiguration retrieved =
-            directoryPurgeConfigurationDao.getDirectoryPurgeConfiguration( dirPurge.getId() );
+        DirectoryPurgeConfiguration retrieved = directoryPurgeConfigurationDao.getDirectoryPurgeConfiguration(
+            dirPurge.getId() );
         assertDirectoryPurgeConfigurationEquals( copy, retrieved );
         assertScheduleEquals( testSchedule1, retrieved.getSchedule() );
     }
@@ -1267,8 +1266,8 @@ public class ContinuumStoreTest
     public void testRemoveDirectoryPurgeConfiguration()
         throws Exception
     {
-        DirectoryPurgeConfiguration dirPurge =
-            directoryPurgeConfigurationDao.getDirectoryPurgeConfiguration( testDirectoryPurgeConfig.getId() );
+        DirectoryPurgeConfiguration dirPurge = directoryPurgeConfigurationDao.getDirectoryPurgeConfiguration(
+            testDirectoryPurgeConfig.getId() );
         directoryPurgeConfigurationDao.removeDirectoryPurgeConfiguration( dirPurge );
 
         List<DirectoryPurgeConfiguration> dirPurgeList =
@@ -1297,17 +1296,17 @@ public class ContinuumStoreTest
     {
         ProjectGroup projectGroup = projectGroupDao.getProjectGroup( testProjectGroup2.getId() );
         ProjectScmRoot projectScmRoot = createTestProjectScmRoot( "scmRootAddress", 1, 0, "", projectGroup );
-        
+
         projectScmRoot = projectScmRootDao.addProjectScmRoot( projectScmRoot );
-        
-        List<ProjectScmRoot> projectScmRoots = 
-            projectScmRootDao.getProjectScmRootByProjectGroup( projectGroup.getId() );
-        
+
+        List<ProjectScmRoot> projectScmRoots = projectScmRootDao.getProjectScmRootByProjectGroup(
+            projectGroup.getId() );
+
         assertEquals( "check # of project scm root", 2, projectScmRoots.size() );
-        
-        ProjectScmRoot retrievedProjectScmRoot = 
-            projectScmRootDao.getProjectScmRootByProjectGroupAndScmRootAddress( projectGroup.getId(), "scmRootAddress" );
-        
+
+        ProjectScmRoot retrievedProjectScmRoot = projectScmRootDao.getProjectScmRootByProjectGroupAndScmRootAddress(
+            projectGroup.getId(), "scmRootAddress" );
+
         assertProjectScmRootEquals( projectScmRoot, retrievedProjectScmRoot );
         assertProjectGroupEquals( projectScmRoot.getProjectGroup(), retrievedProjectScmRoot.getProjectGroup() );
     }
@@ -1316,95 +1315,95 @@ public class ContinuumStoreTest
         throws Exception
     {
         ProjectGroup projectGroup = projectGroupDao.getProjectGroup( testProjectGroup2.getId() );
-        
-        List<ProjectScmRoot> projectScmRoots = 
-            projectScmRootDao.getProjectScmRootByProjectGroup( projectGroup.getId() );
-        
+
+        List<ProjectScmRoot> projectScmRoots = projectScmRootDao.getProjectScmRootByProjectGroup(
+            projectGroup.getId() );
+
         assertEquals( "check # of project scm root", 1, projectScmRoots.size() );
-        
+
         ProjectScmRoot projectScmRoot = projectScmRoots.get( 0 );
         projectScmRootDao.removeProjectScmRoot( projectScmRoot );
-        
-        projectScmRoots = 
-            projectScmRootDao.getProjectScmRootByProjectGroup( projectGroup.getId() );
-        
+
+        projectScmRoots = projectScmRootDao.getProjectScmRootByProjectGroup( projectGroup.getId() );
+
         assertEquals( "check # of project scm root", 0, projectScmRoots.size() );
     }
 
-	public void testRemoveProjectWithReleaseResult()
+    public void testRemoveProjectWithReleaseResult()
         throws Exception
     {
         Project project = projectDao.getProject( testProject1.getId() );
         ProjectGroup group = project.getProjectGroup();
-        
-        ContinuumReleaseResult releaseResult = createTestContinuumReleaseResult( group, project, "releaseGoal", 0, 0, 0 );
+
+        ContinuumReleaseResult releaseResult = createTestContinuumReleaseResult( group, project, "releaseGoal", 0, 0,
+                                                                                 0 );
         releaseResult = releaseResultDao.addContinuumReleaseResult( releaseResult );
-        
+
         List<ContinuumReleaseResult> releaseResults = releaseResultDao.getAllContinuumReleaseResults();
         assertEquals( "check size of continuum release results", 2, releaseResults.size() );
-        
+
         ContinuumReleaseResult retrievedResult = releaseResults.get( 1 );
         assertReleaseResultEquals( releaseResult, retrievedResult );
         assertProjectGroupEquals( group, retrievedResult.getProjectGroup() );
         assertProjectEquals( project, retrievedResult.getProject() );
-        
+
         releaseResultDao.removeContinuumReleaseResult( releaseResult );
         projectDao.removeProject( project );
         assertFalse( projectDao.getProjectsInGroup( group.getId() ).contains( project ) );
-        
+
         releaseResults = releaseResultDao.getAllContinuumReleaseResults();
         assertEquals( "check size of continuum release results", 1, releaseResults.size() );
     }
 
-	public void testGetProjectSummaryByProjectGroup()
-	    throws Exception
-	{
-	    List<Project> projects = projectDao.getProjectsInGroup( defaultProjectGroup.getId() );
-	    assertEquals( 2, projects.size() );
-
-	    Project project = projects.get( 0 );
-	    project.setState( 2 );
-	    projectDao.updateProject( project );
-
-	    project = projects.get( 1 );
-	    project.setState( 2 );
-	    projectDao.updateProject( project );
-
-	    ProjectGroup newGroup = projectGroupDao.getProjectGroupWithProjects( testProjectGroup2.getId() );
-	    Project project1 = createTestProject( testProject1 );
-	    project1.setState( 4 );
-	    newGroup.addProject( project1 );
-
-	    Project project2 = createTestProject( testProject2 );
-	    project2.setState( 1 );
-	    newGroup.addProject( project2 );
-	    projectGroupDao.updateProjectGroup( newGroup );
-
-	    Map<Integer, ProjectGroupSummary> summaries = projectDao.getProjectsSummary();
-
-	    assertNotNull( summaries );
-	    assertEquals( "check size of project summaries", 2, summaries.size() );
-
-	    ProjectGroupSummary summary = summaries.get( testProjectGroup2.getId() );
-	    assertEquals( "check id of project group", testProjectGroup2.getId(), summary.getProjectGroupId() );
-	    assertEquals( "check number of errors", 1, summary.getNumberOfErrors() );
-	    assertEquals( "check number of successes", 0, summary.getNumberOfSuccesses() );
-	    assertEquals( "check number of failures", 0, summary.getNumberOfFailures() );
-	    assertEquals( "check number of projects", 2, summary.getNumberOfProjects() );
+    public void testGetProjectSummaryByProjectGroup()
+        throws Exception
+    {
+        List<Project> projects = projectDao.getProjectsInGroup( defaultProjectGroup.getId() );
+        assertEquals( 2, projects.size() );
+
+        Project project = projects.get( 0 );
+        project.setState( 2 );
+        projectDao.updateProject( project );
+
+        project = projects.get( 1 );
+        project.setState( 2 );
+        projectDao.updateProject( project );
 
-	    summary = summaries.get( defaultProjectGroup.getId() );
-	    assertEquals( "check id of project group", defaultProjectGroup.getId(), summary.getProjectGroupId() );
+        ProjectGroup newGroup = projectGroupDao.getProjectGroupWithProjects( testProjectGroup2.getId() );
+        Project project1 = createTestProject( testProject1 );
+        project1.setState( 4 );
+        newGroup.addProject( project1 );
+
+        Project project2 = createTestProject( testProject2 );
+        project2.setState( 1 );
+        newGroup.addProject( project2 );
+        projectGroupDao.updateProjectGroup( newGroup );
+
+        Map<Integer, ProjectGroupSummary> summaries = projectDao.getProjectsSummary();
+
+        assertNotNull( summaries );
+        assertEquals( "check size of project summaries", 2, summaries.size() );
+
+        ProjectGroupSummary summary = summaries.get( testProjectGroup2.getId() );
+        assertEquals( "check id of project group", testProjectGroup2.getId(), summary.getProjectGroupId() );
+        assertEquals( "check number of errors", 1, summary.getNumberOfErrors() );
+        assertEquals( "check number of successes", 0, summary.getNumberOfSuccesses() );
+        assertEquals( "check number of failures", 0, summary.getNumberOfFailures() );
+        assertEquals( "check number of projects", 2, summary.getNumberOfProjects() );
+
+        summary = summaries.get( defaultProjectGroup.getId() );
+        assertEquals( "check id of project group", defaultProjectGroup.getId(), summary.getProjectGroupId() );
         assertEquals( "check number of errors", 0, summary.getNumberOfErrors() );
         assertEquals( "check number of successes", 2, summary.getNumberOfSuccesses() );
         assertEquals( "check number of failures", 0, summary.getNumberOfFailures() );
         assertEquals( "check number of projects", 2, summary.getNumberOfProjects() );
 
-	}
+    }
 
     public void testGetBuildResultsInRange()
         throws Exception
     {
-        List<BuildResult> results = buildResultDao.getBuildResultsInRange( null, null, 0, null, 0 );	    
+        List<BuildResult> results = buildResultDao.getBuildResultsInRange( null, null, 0, null, 0 );
         assertEquals( "check number of build results returned", 3, results.size() );
 
         results = buildResultDao.getBuildResultsInRange( null, null, 2, null, 0 );
@@ -1412,15 +1411,17 @@ public class ContinuumStoreTest
 
         results = buildResultDao.getBuildResultsInRange( null, null, 0, "user", 0 );
         assertEquals( "check number of build results returned with triggeredBy == user", 1, results.size() );
-	    
+
         results = buildResultDao.getBuildResultsInRange( null, null, 0, "schedule", 0 );
         assertEquals( "check number of build results returned with triggeredBy == schedule", 2, results.size() );
-        
+
         results = buildResultDao.getBuildResultsInRange( null, null, 2, "schedule", 0 );
-        assertEquals( "check number of build results returned with state == Ok and triggeredBy == schedule", 1, results.size() );
+        assertEquals( "check number of build results returned with state == Ok and triggeredBy == schedule", 1,
+                      results.size() );
 
         results = buildResultDao.getBuildResultsInRange( null, null, 3, "user", 0 );
-        assertEquals( "check number of build results returned with state == Failed and triggeredBy == user", 0, results.size() );
+        assertEquals( "check number of build results returned with state == Failed and triggeredBy == user", 0,
+                      results.size() );
 
         Calendar cal = Calendar.getInstance();
         cal.setTime( new Date( baseTime ) );
@@ -1431,10 +1432,10 @@ public class ContinuumStoreTest
 
         results = buildResultDao.getBuildResultsInRange( new Date( baseTime ), new Date( baseTime ), 0, null, 0 );
         assertEquals( "check number of build results returned with the same startDate and endDate", 1, results.size() );
-        
+
         results = buildResultDao.getBuildResultsInRange( null, null, 0, null, 1 );
         assertEquals( "check number of build results returned with an existing group id", 3, results.size() );
-        
+
         results = buildResultDao.getBuildResultsInRange( null, null, 0, null, 2 );
         assertEquals( "check number of build results returned with non-existing group id", 0, results.size() );
     }
@@ -1505,7 +1506,7 @@ public class ContinuumStoreTest
 
         buildResultDao = (BuildResultDao) lookup( BuildResultDao.class.getName() );
 
-        createBuildDatabase(false);
+        createBuildDatabase( false );
     }
 
     private static void checkProjectFetchGroup( Project project, boolean checkoutFetchGroup,

Modified: continuum/trunk/continuum-test/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-test/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-test/pom.xml (original)
+++ continuum/trunk/continuum-test/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
@@ -54,6 +55,6 @@ under the License.
     <dependency>
       <groupId>org.codehaus.redback</groupId>
       <artifactId>plexus-spring</artifactId>
-    </dependency>    
+    </dependency>
   </dependencies>
 </project>

Modified: continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original)
+++ continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Mon Aug 13 04:29:09 2012
@@ -19,16 +19,6 @@ package org.apache.maven.continuum;
  * under the License.
  */
 
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-
 import org.apache.continuum.dao.DaoUtils;
 import org.apache.continuum.dao.ProjectDao;
 import org.apache.continuum.dao.ProjectGroupDao;
@@ -50,6 +40,15 @@ import org.codehaus.plexus.jdo.JdoFactor
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.jpox.SchemaTool;
 
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
@@ -64,7 +63,7 @@ public abstract class AbstractContinuumT
     private ProjectGroupDao projectGroupDao;
 
     private ScheduleDao scheduleDao;
-    
+
     private ProjectScmRootDao projectScmRootDao;
 
     // ----------------------------------------------------------------------
@@ -84,7 +83,7 @@ public abstract class AbstractContinuumT
         getProjectGroupDao();
 
         getScheduleDao();
-        
+
         getProjectScmRootDao();
 
         setUpConfigurationService( (ConfigurationService) lookup( "configurationService" ) );
@@ -213,8 +212,8 @@ public abstract class AbstractContinuumT
             System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
         }
 
-        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/package.jdo" )}, new URL[]{}, null,
-                                       false, null );
+        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/package.jdo" )}, new URL[]{}, null, false,
+                                       null );
 
         // ----------------------------------------------------------------------
         //
@@ -249,7 +248,7 @@ public abstract class AbstractContinuumT
         }
         return scheduleDao;
     }
-    
+
     protected ProjectScmRootDao getProjectScmRootDao()
     {
         if ( projectScmRootDao == null )
@@ -420,9 +419,8 @@ public abstract class AbstractContinuumT
 
                 assertEquals( "project.notifiers.notifier.type", notifier.getType(), actualNotifier.getType() );
 
-                assertEquals( "project.notifiers.notifier.configuration.address",
-                              notifier.getConfiguration().get( "address" ),
-                              actualNotifier.getConfiguration().get( "address" ) );
+                assertEquals( "project.notifiers.notifier.configuration.address", notifier.getConfiguration().get(
+                    "address" ), actualNotifier.getConfiguration().get( "address" ) );
             }
         }
 

Modified: continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/configuration/ConfigurationServiceMock.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/configuration/ConfigurationServiceMock.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/configuration/ConfigurationServiceMock.java (original)
+++ continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/configuration/ConfigurationServiceMock.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,6 @@ package org.apache.maven.continuum.confi
  * under the License.
  */
 
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.continuum.buildqueue.BuildQueueServiceException;
 import org.apache.continuum.configuration.BuildAgentConfiguration;
 import org.apache.continuum.configuration.BuildAgentGroupConfiguration;
@@ -30,6 +26,10 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.project.Schedule;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Mock class for testing WagonContinuumNotifier's call to ConfigurationService.getBuildOutputFile()
  *
@@ -184,7 +184,7 @@ public class ConfigurationServiceMock
     }
 
     public void setSharedSecretPassword( String sharedSecretPassword )
-    {        
+    {
     }
 
     public boolean isLoaded()

Modified: continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/jdo/MemoryJdoFactory.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/jdo/MemoryJdoFactory.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/jdo/MemoryJdoFactory.java (original)
+++ continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/jdo/MemoryJdoFactory.java Mon Aug 13 04:29:09 2012
@@ -1,9 +1,9 @@
 package org.apache.maven.continuum.jdo;
 
-import java.util.Properties;
-
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 
+import java.util.Properties;
+
 public class MemoryJdoFactory
     extends DefaultConfigurableJdoFactory
 {

Modified: continuum/trunk/continuum-test/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-test/src/main/resources/META-INF/plexus/components.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-test/src/main/resources/META-INF/plexus/components.xml (original)
+++ continuum/trunk/continuum-test/src/main/resources/META-INF/plexus/components.xml Mon Aug 13 04:29:09 2012
@@ -19,57 +19,57 @@
 
 <component-set>
   <components>
-<!--
-    <component>
-      <role>org.codehaus.plexus.jdo.JdoFactory</role>
-      <role-hint>continuum</role-hint>
-      <implementation>org.apache.maven.continuum.jdo.MemoryJdoFactory</implementation>
-      <configuration>
-        <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
-        <driverName>org.hsqldb.jdbcDriver</driverName>
-        <url>jdbc:hsqldb:${plexus.home}/database</url>
-        <userName>sa</userName>
-        <password></password>
-        <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
+    <!--
+        <component>
+          <role>org.codehaus.plexus.jdo.JdoFactory</role>
+          <role-hint>continuum</role-hint>
+          <implementation>org.apache.maven.continuum.jdo.MemoryJdoFactory</implementation>
+          <configuration>
+            <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
+            <driverName>org.hsqldb.jdbcDriver</driverName>
+            <url>jdbc:hsqldb:${plexus.home}/database</url>
+            <userName>sa</userName>
+            <password></password>
+            <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
 
-        <otherProperties>
-          <property>
-            <name>org.jpox.autoCreateSchema</name>
-            <value>true</value>
-          </property>
-          <property>
-            <name>org.jpox.validateTables</name>
-            <value>false</value>
-          </property>
-          <property>
-            <name>org.jpox.validateColumns</name>
-            <value>false</value>
-          </property>
-          <property>
-            <name>org.jpox.validateConstraints</name>
-            <value>false</value>
-          </property>
+            <otherProperties>
+              <property>
+                <name>org.jpox.autoCreateSchema</name>
+                <value>true</value>
+              </property>
+              <property>
+                <name>org.jpox.validateTables</name>
+                <value>false</value>
+              </property>
+              <property>
+                <name>org.jpox.validateColumns</name>
+                <value>false</value>
+              </property>
+              <property>
+                <name>org.jpox.validateConstraints</name>
+                <value>false</value>
+              </property>
 
-          <property>
-            <name>org.jpox.autoStartMechanism</name>
-            <value>SchemaTable</value>
-          </property>
-          <property>
-            <name>org.jpox.autoStartMechanismMode</name>
-            <value>Ignored</value>
-          </property>
-          <property>
-            <name>org.jpox.transactionIsolation</name>
-            <value>READ_COMMITTED</value>
-          </property>
-          <property>
-            <name>org.jpox.poid.transactionIsolation</name>
-            <value>READ_COMMITTED</value>
-          </property>
-        </otherProperties>
-      </configuration>
-    </component>
--->
+              <property>
+                <name>org.jpox.autoStartMechanism</name>
+                <value>SchemaTable</value>
+              </property>
+              <property>
+                <name>org.jpox.autoStartMechanismMode</name>
+                <value>Ignored</value>
+              </property>
+              <property>
+                <name>org.jpox.transactionIsolation</name>
+                <value>READ_COMMITTED</value>
+              </property>
+              <property>
+                <name>org.jpox.poid.transactionIsolation</name>
+                <value>READ_COMMITTED</value>
+              </property>
+            </otherProperties>
+          </configuration>
+        </component>
+    -->
     <component>
       <role>org.codehaus.plexus.jdo.JdoFactory</role>
       <role-hint>users</role-hint>

Modified: continuum/trunk/continuum-test/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-test/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-test/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-test/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012
@@ -18,19 +18,18 @@
   ~ under the License.
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
-<!--
-  <bean id="jdoProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
-    <property name="location" value="classpath:jdo.properties"/>
-  </bean>
--->
+  <!--
+    <bean id="jdoProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+      <property name="location" value="classpath:jdo.properties"/>
+    </bean>
+  -->
   <util:properties id="jdoProperties" location="classpath:jdo.properties"/>
 
   <bean name="jdoFactory#continuum" depends-on="jdoProperties"
@@ -41,13 +40,13 @@
         p:password=""
         p:url="jdbc:hsqldb:mem:test">
 
-<!-- 
-        <property name="persistenceManagerFactoryClass" value="org.jpox.PersistenceManagerFactoryImpl"/>
--->
+    <!--
+            <property name="persistenceManagerFactoryClass" value="org.jpox.PersistenceManagerFactoryImpl"/>
+    -->
     <property name="otherProperties" ref="jdoProperties"/>
   </bean>
-<!--
-        p:url="jdbc:hsqldb:${plexus.home}/database"
--->
+  <!--
+          p:url="jdbc:hsqldb:${plexus.home}/database"
+  -->
 
 </beans>

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/config/testng-multienvironment.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/config/testng-multienvironment.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/config/testng-multienvironment.xml (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/config/testng-multienvironment.xml Mon Aug 13 04:29:09 2012
@@ -20,29 +20,29 @@ under the License.
 -->
 
 <suite name="ContinuumTestMultiEnvironment" verbose="1" parallel="tests" thread-count="2">
-    <listeners>
-        <listener class-name="org.apache.continuum.web.test.listener.CaptureScreenShotsListener"/>
-    </listeners>
-    <test name="safari4Windows">
-        <parameter name="browser" value="Safari 4 on Windows"/>
-        <groups>
-            <run>
-                <include name="login" />
-            </run>
-        </groups>
-        <packages>
-            <package name="org.apache.continuum.web.test" />
-        </packages>
-    </test>
-	<test name="firefox3Linux">
-        <parameter name="browser" value="Firefox 3 on Linux"/>
-        <groups>
-            <run>
-                <include name="login" />
-            </run>
-        </groups>
-		<packages>
-			<package name="org.apache.continuum.web.test" />
-		</packages>
-	</test>
+  <listeners>
+    <listener class-name="org.apache.continuum.web.test.listener.CaptureScreenShotsListener"/>
+  </listeners>
+  <test name="safari4Windows">
+    <parameter name="browser" value="Safari 4 on Windows"/>
+    <groups>
+      <run>
+        <include name="login"/>
+      </run>
+    </groups>
+    <packages>
+      <package name="org.apache.continuum.web.test"/>
+    </packages>
+  </test>
+  <test name="firefox3Linux">
+    <parameter name="browser" value="Firefox 3 on Linux"/>
+    <groups>
+      <run>
+        <include name="login"/>
+      </run>
+    </groups>
+    <packages>
+      <package name="org.apache.continuum.web.test"/>
+    </packages>
+  </test>
 </suite>

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/config/testng.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/config/testng.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/config/testng.xml (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/config/testng.xml Mon Aug 13 04:29:09 2012
@@ -43,23 +43,23 @@ under the License.
         <include name="login"/>
         <include name="projectGroup"/>
         <include name="mavenTwoProject"/>
-        <include name="mavenOneProject" />
+        <include name="mavenOneProject"/>
         <include name="antProject"/>
         <include name="shellProject"/>
         <include name="report"/>
         <include name="agent"/>
         <include name="release"/>
-        <include name="buildDefinition" />
+        <include name="buildDefinition"/>
         <include name="notifier"/>
-        <include name="myAccount" />
+        <include name="myAccount"/>
         <include name="schedule"/>
         <include name="queue"/>
-        <include name="purge" />
-        <include name="repository" />
-        <include name="configuration" />
+        <include name="purge"/>
+        <include name="repository"/>
+        <include name="configuration"/>
         <include name="installation"/>
-        <include name="buildEnvironment" />
-        <include name="buildDefinitionTemplate" />
+        <include name="buildEnvironment"/>
+        <include name="buildDefinitionTemplate"/>
         <include name="userroles"/>
         <include name="csrf"/>
         <include name="distributed"/>

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java Mon Aug 13 04:29:09 2012
@@ -28,7 +28,7 @@ import org.testng.annotations.Test;
  * @author José Morales Martínez
  * @version $Id$
  */
-@Test( groups = { "about" }, alwaysRun = true )
+@Test( groups = {"about"}, alwaysRun = true )
 public class AboutTest
     extends AbstractContinuumTest
 {

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java Mon Aug 13 04:29:09 2012
@@ -29,7 +29,7 @@ import org.testng.annotations.Test;
  * @author José Morales Martínez
  * @version $Id$
  */
-@Test( groups = { "antProject" } )
+@Test( groups = {"antProject"} )
 public class AntProjectTest
     extends AbstractAdminTest
 {
@@ -108,7 +108,7 @@ public class AntProjectTest
         assertTextPresent( "SCM Url is required and cannot contain null or spaces only" );
     }
 
-    @Test( dependsOnMethods = { "testAddAntProject" } )
+    @Test( dependsOnMethods = {"testAddAntProject"} )
     public void testAddDuplicateAntProject()
         throws Exception
     {

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java Mon Aug 13 04:29:09 2012
@@ -20,14 +20,14 @@ package org.apache.continuum.web.test;
  */
 
 //import org.apache.continuum.web.test.parent.AbstractBuildQueueTest;
+
+import org.apache.continuum.web.test.parent.AbstractBuildAgentsTest;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.apache.continuum.web.test.parent.AbstractBuildAgentsTest;
-import org.testng.Assert;
 
-@Test( groups = { "agent" } )
+@Test( groups = {"agent"} )
 public class BuildAgentsTest
     extends AbstractBuildAgentsTest
 {
@@ -64,29 +64,31 @@ public class BuildAgentsTest
 
     public void testViewBuildAgentInstallationXSS()
     {
-        getSelenium().open( baseUrl + "/security/viewBuildAgent.action?buildAgent.url=test%3Cscript%3Ealert%28%27xss%27%29%3C/script%3E" );
+        getSelenium().open( baseUrl +
+                                "/security/viewBuildAgent.action?buildAgent.url=test%3Cscript%3Ealert%28%27xss%27%29%3C/script%3E" );
         Assert.assertFalse( getSelenium().isAlertPresent() );
         assertTextPresent( "<script>alert('xss')</script>" );
     }
 
     public void testEditBuildAgentXSS()
     {
-        getSelenium().open( baseUrl + "/security/editBuildAgent.action?buildAgent.url=test%3Cscript%3Ealert%28%27xss%27%29%3C/script%3E" );
+        getSelenium().open( baseUrl +
+                                "/security/editBuildAgent.action?buildAgent.url=test%3Cscript%3Ealert%28%27xss%27%29%3C/script%3E" );
         Assert.assertFalse( getSelenium().isAlertPresent() );
     }
 
-    @Test( dependsOnMethods = { "testEditBuildAgent" } )
+    @Test( dependsOnMethods = {"testEditBuildAgent"} )
     public void testAddAnExistingBuildAgent()
     {
         String BUILD_AGENT_NAME = getBuildAgentUrl();
         String BUILD_AGENT_DESCRIPTION = getProperty( "BUILD_AGENT_DESCRIPTION" );
 
         goToAddBuildAgent();
-        addBuildAgent( BUILD_AGENT_NAME, BUILD_AGENT_DESCRIPTION, false, false, true ) ;
+        addBuildAgent( BUILD_AGENT_NAME, BUILD_AGENT_DESCRIPTION, false, false, true );
         assertTextPresent( "Build agent already exists" );
     }
 
-    @Test( dependsOnMethods = { "testAddBuildAgent" } )
+    @Test( dependsOnMethods = {"testAddBuildAgent"} )
     public void testEditBuildAgent()
     {
         String BUILD_AGENT_DESCRIPTION = getProperty( "BUILD_AGENT_DESCRIPTION" );
@@ -98,11 +100,11 @@ public class BuildAgentsTest
 
         goToEditBuildAgent( BUILD_AGENT_NAME, BUILD_AGENT_DESCRIPTION );
         addEditBuildAgent( BUILD_AGENT_NAME, new_agentDescription );
-        goToEditBuildAgent( BUILD_AGENT_NAME, new_agentDescription);
+        goToEditBuildAgent( BUILD_AGENT_NAME, new_agentDescription );
         addEditBuildAgent( BUILD_AGENT_NAME, BUILD_AGENT_DESCRIPTION );
     }
 
-    @Test( dependsOnMethods = { "testAddAnExistingBuildAgent", "testDeleteBuildAgentGroup" } )
+    @Test( dependsOnMethods = {"testAddAnExistingBuildAgent", "testDeleteBuildAgentGroup"} )
     public void testDeleteBuildAgent()
         throws Exception
     {
@@ -112,17 +114,17 @@ public class BuildAgentsTest
         assertTextNotPresent( BUILD_AGENT_NAME );
     }
 
-	@Test( dependsOnMethods = { "testDeleteBuildAgent" } )
+    @Test( dependsOnMethods = {"testDeleteBuildAgent"} )
     public void testAddEmptyBuildAgent()
     {
-    	String BUILD_AGENT_DESCRIPTION = getProperty( "BUILD_AGENT_DESCRIPTION" );
+        String BUILD_AGENT_DESCRIPTION = getProperty( "BUILD_AGENT_DESCRIPTION" );
 
         goToAddBuildAgent();
-        addBuildAgent( "", BUILD_AGENT_DESCRIPTION, false, false, false ) ;
+        addBuildAgent( "", BUILD_AGENT_DESCRIPTION, false, false, false );
         assertTextPresent( "Build agent url is required." );
     }
 
-    @Test( dependsOnMethods = { "testDeleteBuildAgent" }, enabled=false )
+    @Test( dependsOnMethods = {"testDeleteBuildAgent"}, enabled = false )
     public void testBuildSuccessWithDistributedBuildsAfterDisableEnableOfBuildAgent()
         throws Exception
     {
@@ -158,20 +160,22 @@ public class BuildAgentsTest
 
     //TESTS FOR BUILD AGENT GROUPS
 
-    @Test( dependsOnMethods = { "testAddBuildAgent" } )
+    @Test( dependsOnMethods = {"testAddBuildAgent"} )
     public void testAddBuildAgentGroupXSS()
         throws Exception
     {
         addBuildAgent( getBuildAgentUrl() );
 
         goToAddBuildAgentGroup();
-        addEditBuildAgentGroup( "%3Cscript%3Ealert%28%27xss%27%29%3C/script%3E", new String[]{}, new String[] {}, false );
+        addEditBuildAgentGroup( "%3Cscript%3Ealert%28%27xss%27%29%3C/script%3E", new String[]{}, new String[]{},
+                                false );
         assertTextPresent( "Build agent group name contains invalid characters" );
     }
 
     public void testEditBuildAgentGroupXSS()
     {
-        getSelenium().open( baseUrl + "/security/editBuildAgentGroup.action?buildAgentGroup.name=test%3Cscript%3Ealert%28%27xss%27%29%3C/script%3E" );
+        getSelenium().open( baseUrl +
+                                "/security/editBuildAgentGroup.action?buildAgentGroup.name=test%3Cscript%3Ealert%28%27xss%27%29%3C/script%3E" );
         Assert.assertFalse( getSelenium().isAlertPresent() );
     }
 
@@ -184,10 +188,10 @@ public class BuildAgentsTest
         String BUILD_AGENT_GROUPNAME = getProperty( "BUILD_AGENT_GROUPNAME" );
 
         goToAddBuildAgentGroup();
-        addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { BUILD_AGENT_NAME }, new String[] {}, true );
+        addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[]{BUILD_AGENT_NAME}, new String[]{}, true );
     }
 
-    @Test( dependsOnMethods = { "testAddBuildAgentGroup" } )
+    @Test( dependsOnMethods = {"testAddBuildAgentGroup"} )
     public void testEditBuildAgentGroup()
         throws Exception
     {
@@ -195,15 +199,13 @@ public class BuildAgentsTest
         String BUILD_AGENT_GROUPNAME = getProperty( "BUILD_AGENT_GROUPNAME" );
 
         String newName = "new_agentgroupname";
-        goToEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { BUILD_AGENT_NAME } );
-        addEditBuildAgentGroup( newName, new String[] {},
-                         new String[] { BUILD_AGENT_NAME }, true );
-        goToEditBuildAgentGroup( newName, new String[] {  } );
-        addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { BUILD_AGENT_NAME },
-                         new String[] {}, true );
+        goToEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[]{BUILD_AGENT_NAME} );
+        addEditBuildAgentGroup( newName, new String[]{}, new String[]{BUILD_AGENT_NAME}, true );
+        goToEditBuildAgentGroup( newName, new String[]{} );
+        addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[]{BUILD_AGENT_NAME}, new String[]{}, true );
     }
 
-    @Test( dependsOnMethods = { "testEditBuildAgentGroup" } )
+    @Test( dependsOnMethods = {"testEditBuildAgentGroup"} )
     public void testAddAnExistingBuildAgentGroup()
         throws Exception
     {
@@ -211,20 +213,20 @@ public class BuildAgentsTest
         String BUILD_AGENT_GROUPNAME = getProperty( "BUILD_AGENT_GROUPNAME" );
 
         goToAddBuildAgentGroup();
-        addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { BUILD_AGENT_NAME }, new String[] {}, false );
+        addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[]{BUILD_AGENT_NAME}, new String[]{}, false );
         assertTextPresent( "Build agent group already exists." );
     }
 
-    @Test( dependsOnMethods = { "testAddAnExistingBuildAgentGroup" } )
+    @Test( dependsOnMethods = {"testAddAnExistingBuildAgentGroup"} )
     public void testAddEmptyBuildAgentGroupName()
         throws Exception
     {
         goToAddBuildAgentGroup();
-        addEditBuildAgentGroup( "", new String[] {}, new String[] {}, false );
+        addEditBuildAgentGroup( "", new String[]{}, new String[]{}, false );
         assertTextPresent( "Build agent group name is required." );
     }
 
-    @Test( dependsOnMethods = { "testAddEmptyBuildAgentGroupName" } )
+    @Test( dependsOnMethods = {"testAddEmptyBuildAgentGroupName"} )
     public void testDeleteBuildAgentGroup()
     {
         String BUILD_AGENT_GROUPNAME = getProperty( "BUILD_AGENT_GROUPNAME" );
@@ -232,13 +234,13 @@ public class BuildAgentsTest
         removeBuildAgentGroup( BUILD_AGENT_GROUPNAME );
     }
 
-    @Test( dependsOnMethods = { "testDeleteBuildAgentGroup" } )
+    @Test( dependsOnMethods = {"testDeleteBuildAgentGroup"} )
     public void testAddBuildAgentGroupWithEmptyBuildAgent()
         throws Exception
     {
         String BUILD_AGENT_GROUPNAME = getProperty( "BUILD_AGENT_GROUPNAME" );
 
         goToAddBuildAgentGroup();
-        addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] {}, new String[] {}, true );
+        addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[]{}, new String[]{}, true );
     }
 }



Mime
View raw message