You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/07/31 13:56:11 UTC
svn commit: r1367507 - in
/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test:
MavenTwoProjectTest.java ProjectGroupTest.java
Author: brett
Date: Tue Jul 31 11:56:10 2012
New Revision: 1367507
URL: http://svn.apache.org/viewvc?rev=1367507&view=rev
Log:
make project group tests work, move those depending on Maven2 into the Maven2 tests
Modified:
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java?rev=1367507&r1=1367506&r2=1367507&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java Tue Jul 31 11:56:10 2012
@@ -124,6 +124,32 @@ public class MavenTwoProjectTest
assertTextPresent( TEST_PROJ_GRP_SCM_ROOT_URL );
}
+ @Test( dependsOnMethods = { "testAddMavenTwoProjectFromRemoteSourceToNonDefaultProjectGroup" } )
+ public void testMoveProject()
+ throws Exception
+ {
+ String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_ID = getProperty( "TEST_PROJ_GRP_ID" );
+ String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
+ String DEFAULT_PROJ_GRP_NAME = getProperty( "DEFAULT_PROJ_GRP_NAME" );
+ String DEFAULT_PROJ_GRP_ID = getProperty( "DEFAULT_PROJ_GRP_NAME" );
+ String DEFAULT_PROJ_GRP_DESCRIPTION = getProperty( "DEFAULT_PROJ_GRP_NAME" );
+ String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
+
+ // TODO: need to wait for checkout to complete. Can we add a special IT type of project that doesn't require checkout?
+ // currently we get away with it due to the usualy duration between the dependant test and this test
+ // move the project of the test project group to the default project group
+ moveProjectToProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME,
+ DEFAULT_PROJ_GRP_NAME );
+ showProjectGroup( DEFAULT_PROJ_GRP_NAME, DEFAULT_PROJ_GRP_ID, DEFAULT_PROJ_GRP_DESCRIPTION );
+ assertTextPresent( "Member Projects" );
+ // Restore project to test project group
+ moveProjectToProjectGroup( DEFAULT_PROJ_GRP_NAME, DEFAULT_PROJ_GRP_ID, DEFAULT_PROJ_GRP_DESCRIPTION,
+ M2_PROJ_GRP_NAME, TEST_PROJ_GRP_NAME );
+ showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
+ assertTextPresent( "Member Projects" );
+ }
+
/**
* Test invalid pom url
*/
@@ -417,6 +443,18 @@ public class MavenTwoProjectTest
}
}
+ @Test( dependsOnMethods = { "testAddMavenTwoProject" } )
+ public void testProjectGroupAllBuildSuccess()
+ throws Exception
+ {
+ String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
+ String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_GRP_ID" );
+ String M2_PROJ_GRP_DESCRIPTION = getProperty( "M2_PROJ_GRP_DESCRIPTION" );
+ buildProjectGroup( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME, true );
+ clickButtonWithValue( "Release" );
+ assertReleaseSuccess();
+ }
+
private void addMaven2Project( String groupName )
throws Exception
{
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java?rev=1367507&r1=1367506&r2=1367507&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java Tue Jul 31 11:56:10 2012
@@ -67,49 +67,22 @@ public class ProjectGroupTest
addProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, false );
assertTextPresent( "Name contains invalid characters." );
assertTextPresent( "Id contains invalid characters." );
- assertTextPresent( "Description contains invalid characters." );
- }
-
- @Test( dependsOnMethods = { "testAddMavenTwoProjectFromRemoteSourceToNonDefaultProjectGroup" } )
- public void testMoveProject()
- throws Exception
- {
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
- String TEST_PROJ_GRP_ID = getProperty( "TEST_PROJ_GRP_ID" );
- String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
- String DEFAULT_PROJ_GRP_NAME = getProperty( "DEFAULT_PROJ_GRP_NAME" );
- String DEFAULT_PROJ_GRP_ID = getProperty( "DEFAULT_PROJ_GRP_NAME" );
- String DEFAULT_PROJ_GRP_DESCRIPTION = getProperty( "DEFAULT_PROJ_GRP_NAME" );
- String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
-
- // TODO: need to wait for checkout to complete. Can we add a special IT type of project that doesn't require checkout?
- // currently we get away with it due to the usualy duration between the dependant test and this test
- // move the project of the test project group to the default project group
- moveProjectToProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME,
- DEFAULT_PROJ_GRP_NAME );
- showProjectGroup( DEFAULT_PROJ_GRP_NAME, DEFAULT_PROJ_GRP_ID, DEFAULT_PROJ_GRP_DESCRIPTION );
- assertTextPresent( "Member Projects" );
- // Restore project to test project group
- moveProjectToProjectGroup( DEFAULT_PROJ_GRP_NAME, DEFAULT_PROJ_GRP_ID, DEFAULT_PROJ_GRP_DESCRIPTION,
- M2_PROJ_GRP_NAME, TEST_PROJ_GRP_NAME );
- showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
- assertTextPresent( "Member Projects" );
}
public void testAddProjectGroupWithEmptyString()
throws Exception
{
addProjectGroup( "", "", "", false );
- assertTextPresent( "Project Group Name is required." );
- assertTextPresent( "Project Group ID is required." );
+ assertTextPresent( "Project Group Name is required" );
+ assertTextPresent( "Project Group ID is required" );
}
public void testAddProjectGroupWithWhitespaceString()
throws Exception
{
addProjectGroup( " ", " ", " ", false );
- assertTextPresent( "Project Group Name cannot contain spaces only." );
- assertTextPresent( "Project Group ID cannot contain spaces only." );
+ assertTextPresent( "Project Group Name is required" );
+ assertTextPresent( "Project Group ID is required" );
}
@Test( dependsOnMethods = { "testAddProjectGroup2" } )
@@ -142,7 +115,7 @@ public class ProjectGroupTest
String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
editProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, " ",
TEST2_PROJ_GRP_DESCRIPTION );
- assertTextPresent( "Project Group Name cannot contain spaces only" );
+ assertTextPresent( "Project Group Name is required" );
}
@Test( dependsOnMethods = { "testAddProjectGroup2" } )
@@ -157,22 +130,8 @@ public class ProjectGroupTest
editProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, NEW_PROJ_GRP_NAME,
NEW_PROJ_GRP_DESCRIPTION );
assertTextPresent( "Name contains invalid characters." );
- assertTextPresent( "Description contains invalid characters." );
- }
-
- @Test( dependsOnMethods = { "testAddMavenTwoProject" } )
- public void testProjectGroupAllBuildSuccess()
- throws Exception
- {
- String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
- String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_GRP_ID" );
- String M2_PROJ_GRP_DESCRIPTION = getProperty( "M2_PROJ_GRP_DESCRIPTION" );
- buildProjectGroup( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME, true );
- clickButtonWithValue( "Release" );
- assertReleaseSuccess();
}
- @Test( dependsOnMethods = { "testAddProjectGroup" } )
public void testDeleteProjectGroup()
throws Exception
{