You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2010/02/24 08:29:38 UTC
svn commit: r915708 - in /continuum/trunk/continuum-webapp-test/src/test:
resources/ testng/org/apache/continuum/web/test/
Author: ctan
Date: Wed Feb 24 07:29:38 2010
New Revision: 915708
URL: http://svn.apache.org/viewvc?rev=915708&view=rev
Log:
[CONTINUUM-2437] added selenium test
merge -r 915623:915639 from 1.3.x branch
Modified:
continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java
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/resources/testng.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties?rev=915708&r1=915707&r2=915708&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original)
+++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Wed Feb 24 07:29:38 2010
@@ -31,7 +31,7 @@
# Properties for testDeleteMavenTwoProject
M2_DELETE_POM_URL=https://svn.apache.org/repos/asf/continuum/sandbox/simple-example/pom.xml
M2_DELETE_PROJ_GRP_NAME=Continuum Simple Example Project
-M2_DELETE_PROJ_GRP_ID=org.apache.continuum.examples
+M2_DELETE_PROJ_GRP_ID=org.apache.continuum.examples.simple
M2_DELETE_PROJ_GRP_DESCRIPTION=Delete test project
M2_DELETE_PROJ_GRP_SCM_ROOT_URL=scm:svn:http://svn.apache.org/repos/asf/continuum/sandbox/simple-example
M2_DELETE_PROJ_TAGBASE=scm:svn:https://svn.apache.org/repos/asf/continuum/sandbox/tags
@@ -53,6 +53,11 @@
M2_SAME_LETTER_PROJ_GRP_DESCRIPTION=
M2_SAME_LETTER_PROJ_GRP_SCM_ROOT_URL=scm:svn:http://svn.apache.org/repos/asf/continuum/sandbox/flat-example/flat-parent
+# Properties for testBuildMaven2ProjectWithTag
+M2_PROJ_WITH_TAG_POM_URL=https://svn.apache.org/repos/asf/continuum/sandbox/examples/continuum-2437-example/pom.xml
+M2_PROJ_WITH_TAG_PROJ_GRP_NAME=Continuum 2437 Example Project
+M2_PROJ_WITH_TAG_PROJ_GRP_ID=org.apache.continuum.examples
+
########################
# mavenOneProject group
########################
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=915708&r1=915707&r2=915708&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 Wed Feb 24 07:29:38 2010
@@ -60,7 +60,7 @@
disableDistributedBuilds();
}
- @Test( dependsOnMethods = { "testAddBuildAgent", "testReleasePerformUsingProvideParamtersWithDistributedBuilds" } )
+ @Test( dependsOnMethods = { "testAddBuildAgent" } )
public void testEditBuildAgent()
{
String BUILD_AGENT_NAME = getProperty( "BUILD_AGENT_NAME" );
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=915708&r1=915707&r2=915708&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 Wed Feb 24 07:29:38 2010
@@ -271,14 +271,71 @@
// remove project group
removeProjectGroup( M2_PROJ_GRP_NAME );
assertLinkNotPresent( M2_PROJ_GRP_NAME );
+ }
+
+ @Test( dependsOnMethods = { "testDeleteMavenTwoProject", "testAddBuildAgent" } )
+ public void testProjectGroupAllBuildSuccessWithDistributedBuilds()
+ throws Exception
+ {
+ String M2_PROJ_GRP_NAME = getProperty( "M2_DELETE_PROJ_GRP_NAME" );
+ String M2_PROJ_GRP_ID = getProperty( "M2_DELETE_PROJ_GRP_ID" );
+ String BUILD_AGENT_URL = getProperty( "BUILD_AGENT_NAME2" );
+
+ enableDistributedBuilds();
- // re-add for later use
addMaven2Project( M2_PROJ_GRP_NAME );
clickLinkWithText( M2_PROJ_GRP_NAME );
assertPage( "Continuum - Project Group" );
//wait for project to finish checkout
waitForProjectCheckout();
+ buildProjectGroup( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, "", M2_PROJ_GRP_NAME );
+ disableDistributedBuilds();
+ }
+
+ public void testBuildMaven2ProjectWithTag()
+ throws Exception
+ {
+ String M2_POM_URL = getProperty( "M2_PROJ_WITH_TAG_POM_URL" );
+ String M2_POM_USERNAME = getProperty( "M2_POM_USERNAME" );
+ String M2_POM_PASSWORD = getProperty( "M2_POM_PASSWORD" );
+
+ String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_WITH_TAG_PROJ_GRP_NAME" );
+ String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_WITH_TAG_PROJ_GRP_ID" );
+ String M2_PROJ_GRP_DESCRIPTION = "";
+
+ addMavenTwoProject( M2_POM_URL, M2_POM_USERNAME, M2_POM_PASSWORD, null, true );
+ assertProjectGroupSummaryPage( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION );
+
+ buildProjectGroup( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME );
+
+ removeProjectGroup( M2_PROJ_GRP_NAME );
+ assertLinkNotPresent( M2_PROJ_GRP_NAME );
+ }
+
+ @Test( dependsOnMethods = { "testAddBuildAgent" } )
+ public void testBuildMaven2ProjectWithTagDistributedBuild()
+ throws Exception
+ {
+ String M2_POM_URL = getProperty( "M2_PROJ_WITH_TAG_POM_URL" );
+ String M2_POM_USERNAME = getProperty( "M2_POM_USERNAME" );
+ String M2_POM_PASSWORD = getProperty( "M2_POM_PASSWORD" );
+
+ String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_WITH_TAG_PROJ_GRP_NAME" );
+ String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_WITH_TAG_PROJ_GRP_ID" );
+ String M2_PROJ_GRP_DESCRIPTION = "";
+
+ enableDistributedBuilds();
+
+ addMavenTwoProject( M2_POM_URL, M2_POM_USERNAME, M2_POM_PASSWORD, null, true );
+ assertProjectGroupSummaryPage( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION );
+
+ buildProjectGroup( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME );
+
+ removeProjectGroup( M2_PROJ_GRP_NAME );
+ assertLinkNotPresent( M2_PROJ_GRP_NAME );
+
+ disableDistributedBuilds();
}
private void addMaven2Project( String groupName )
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=915708&r1=915707&r2=915708&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 Wed Feb 24 07:29:38 2010
@@ -143,25 +143,6 @@
assertReleaseSuccess();
}
- @Test( dependsOnMethods = { "testDeleteMavenTwoProject", "testAddBuildAgent" } )
- public void testProjectGroupAllBuildSuccessWithDistributedBuilds()
- throws Exception
- {
- String M2_PROJ_GRP_NAME = getProperty( "M2_DELETE_PROJ_GRP_NAME" );
- String M2_PROJ_GRP_ID = getProperty( "M2_DELETE_PROJ_GRP_ID" );
- String BUILD_AGENT_URL = getProperty( "BUILD_AGENT_NAME2" );
-
- enableDistributedBuilds();
- goToBuildAgentPage();
- clickLinkWithText( BUILD_AGENT_URL );
- assertTextPresent( "true" );
-
- buildProjectGroup( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, "", M2_PROJ_GRP_NAME );
- clickButtonWithValue( "Release" );
- assertReleaseSuccess();
- disableDistributedBuilds();
- }
-
@Test( dependsOnMethods = { "testAddProjectGroup" } )
public void testDeleteProjectGroup()
throws Exception