You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2009/07/14 08:50:28 UTC
svn commit: r793802 - in
/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test:
./ parent/
Author: carlos
Date: Tue Jul 14 06:50:27 2009
New Revision: 793802
URL: http://svn.apache.org/viewvc?rev=793802&view=rev
Log:
Use different names for different test runs to avoid collisions
Modified:
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/NotifierTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/QueueTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java Tue Jul 14 06:50:27 2009
@@ -43,8 +43,8 @@
String ANT_SCM_URL = getProperty( "ANT_SCM_URL" );
String ANT_SCM_USERNAME = getProperty( "ANT_SCM_USERNAME" );
String ANT_SCM_PASSWORD = getProperty( "ANT_SCM_PASSWORD" );
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
- String TEST_PROJ_GRP_ID = getProperty( "TEST_PROJ_GRP_ID" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
goToAddAntProjectPage();
addProject( ANT_NAME, ANT_DESCRIPTION, ANT_VERSION, ANT_SCM_URL, ANT_SCM_USERNAME, ANT_SCM_PASSWORD, ANT_TAG,
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildAgentsTest.java Tue Jul 14 06:50:27 2009
@@ -31,11 +31,11 @@
public void testAddBuildAgent()
{
- String BUILD_AGENT_NAME = getProperty( "BUILD_AGENT_NAME" );
+ String BUILD_AGENT_NAME = getProperty( "BUILD_AGENT_NAME" ) + getTestId();
String BUILD_AGENT_DESCRIPTION = getProperty( "BUILD_AGENT_DESCRIPTION" );
- String BUILD_AGENT_NAME2 = getProperty( "BUILD_AGENT_NAME2" );
+ String BUILD_AGENT_NAME2 = getProperty( "BUILD_AGENT_NAME2" ) + getTestId();
String BUILD_AGENT_DESCRIPTION2 = getProperty( "BUILD_AGENT_DESCRIPTION2" );
- String BUILD_AGENT_NAME3 = getProperty( "BUILD_AGENT_NAME3" );
+ String BUILD_AGENT_NAME3 = getProperty( "BUILD_AGENT_NAME3" ) + getTestId();
String BUILD_AGENT_DESCRIPTION3 = getProperty( "BUILD_AGENT_DESCRIPTION3" );
enableDistributedBuilds();
@@ -51,7 +51,7 @@
@Test( dependsOnMethods = { "testEditBuildAgent" } )
public void testAddAnExistingBuildAgent()
{
- String BUILD_AGENT_NAME = getProperty( "BUILD_AGENT_NAME" );
+ String BUILD_AGENT_NAME = getProperty( "BUILD_AGENT_NAME" ) + getTestId();
String BUILD_AGENT_DESCRIPTION = getProperty( "BUILD_AGENT_DESCRIPTION" );
enableDistributedBuilds();
@@ -65,7 +65,7 @@
public void testEditBuildAgent()
{
- String BUILD_AGENT_NAME = getProperty( "BUILD_AGENT_NAME" );
+ String BUILD_AGENT_NAME = getProperty( "BUILD_AGENT_NAME" ) + getTestId();
String BUILD_AGENT_DESCRIPTION = getProperty( "BUILD_AGENT_DESCRIPTION" );
String new_agentDescription = "new_agentDescription";
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java Tue Jul 14 06:50:27 2009
@@ -70,8 +70,8 @@
public void testAddInvalidGroupBuildDefinition()
throws Exception
{
- String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" );
- String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" );
+ String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ) + getTestId();
+ String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ) + getTestId();
String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
goToGroupBuildDefinitionPage( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION );
clickButtonWithValue( "Add" );
@@ -84,8 +84,8 @@
public void testBuildFromGroupBuildDefinition()
throws Exception
{
- String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" );
- String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" );
+ String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ) + getTestId();
+ String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ) + getTestId();
String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
goToGroupBuildDefinitionPage( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION );
clickImgWithAlt( "Build" );
@@ -96,8 +96,8 @@
public void testAddDefautltGroupBuildDefinition()
throws Exception
{
- String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" );
- String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" );
+ String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ) + getTestId();
+ String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ) + getTestId();
String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
String BUILD_POM_NAME = getProperty( "BUILD_POM_NAME" );
String BUILD_GOALS = getProperty( "BUILD_GOALS" );
@@ -113,8 +113,8 @@
public void testAddNotDefautltGroupBuildDefinition()
throws Exception
{
- String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" );
- String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" );
+ String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ) + getTestId();
+ String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ) + getTestId();
String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
String BUILD_POM_NAME = getProperty( "BUILD_POM_NAME" );
String BUILD_GOALS = getProperty( "BUILD_GOALS" );
@@ -130,8 +130,8 @@
public void testEditGroupBuildDefinition()
throws Exception
{
- String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" );
- String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" );
+ String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ) + getTestId();
+ String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ) + getTestId();
String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
String BUILD_POM_NAME = getProperty( "BUILD_POM_NAME" );
String BUILD_GOALS = getProperty( "BUILD_GOALS" );
@@ -154,8 +154,8 @@
public void testDeleteGroupBuildDefinition()
throws Exception
{
- String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" );
- String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" );
+ String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ) + getTestId();
+ String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ) + getTestId();
String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
String BUILD_GOALS = getProperty( "BUILD_GOALS" );
String BUILD_DESCRIPTION = getProperty( "BUILD_DESCRIPTION" );
@@ -171,7 +171,7 @@
public void testAddNotDefautltProjectBuildDefinition()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String BUILD_POM_NAME = getProperty( "BUILD_POM_NAME" );
String BUILD_GOALS = getProperty( "BUILD_GOALS" );
@@ -187,7 +187,7 @@
public void testDeleteProjectBuildDefinition()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String BUILD_GOALS = getProperty( "BUILD_GOALS" );
String BUILD_DESCRIPTION = getProperty( "BUILD_DESCRIPTION" );
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java Tue Jul 14 06:50:27 2009
@@ -35,6 +35,7 @@
/**
* test with valid pom url
*/
+ @Test( dependsOnMethods = { "testAddProjectGroup" } )
public void testValidPomUrl()
throws Exception
{
@@ -42,11 +43,11 @@
String M1_POM_USERNAME = getProperty( "M1_POM_USERNAME" );
String M1_POM_PASSWORD = getProperty( "M1_POM_PASSWORD" );
String M1_PROJ_GRP_NAME = getProperty( "M1_PROJ_GRP_NAME" );
- String M1_PROJ_GRP_ID = getProperty( "M1_PROJ_GRP_ID" );
+ String M1_PROJ_GRP_ID = getProperty( "M1_PROJ_GRP_ID" ) + getTestId();
String M1_PROJ_GRP_DESCRIPTION = getProperty( "M1_PROJ_GRP_DESCRIPTION" );
- // Enter values into Add Maven Two Project fields, and submit
+ // Enter values into Add Maven One Project fields, and submit
goToAddMavenOneProjectPage();
- addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, null, true );
+ addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, M1_PROJ_GRP_NAME, null, true );
assertProjectGroupSummaryPage( M1_PROJ_GRP_NAME, M1_PROJ_GRP_ID, M1_PROJ_GRP_DESCRIPTION );
}
@@ -54,8 +55,8 @@
public void testAddMavenOneProjectFromRemoteSourceToNonDefaultProjectGroup()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String M1_POM_URL = getProperty( "M1_POM_URL" );
String M1_POM_USERNAME = getProperty( "M1_POM_USERNAME" );
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java Tue Jul 14 06:50:27 2009
@@ -33,6 +33,7 @@
extends AbstractContinuumTest
{
+ @Test( dependsOnMethods = { "testAddProjectGroup" } )
public void testAddMavenTwoProject()
throws Exception
{
@@ -41,10 +42,10 @@
String M2_POM_PASSWORD = getProperty( "M2_POM_PASSWORD" );
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
- String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_GRP_ID" );
+ String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_GRP_ID" ) + getTestId();
String M2_PROJ_GRP_DESCRIPTION = getProperty( "M2_PROJ_GRP_DESCRIPTION" );
// Enter values into Add Maven Two Project fields, and submit
- addMavenTwoProject( M2_POM_URL, M2_POM_USERNAME, M2_POM_PASSWORD, null, true );
+ addMavenTwoProject( M2_POM_URL, M2_POM_USERNAME, M2_POM_PASSWORD, M2_PROJ_GRP_NAME, true );
// Wait Struct Listener
assertProjectGroupSummaryPage( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION );
}
@@ -53,8 +54,8 @@
public void testAddMavenTwoProjectFromRemoteSourceToNonDefaultProjectGroup()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String M2_POM_URL = getProperty( "M2_POM_URL" );
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/NotifierTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/NotifierTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/NotifierTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/NotifierTest.java Tue Jul 14 06:50:27 2009
@@ -33,7 +33,7 @@
public void testAddValidMailProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" );
goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME );
@@ -44,7 +44,7 @@
public void testEditValidMailProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" );
String newMail = "newmail@mail.com";
@@ -57,7 +57,7 @@
public void testEditInvalidMailProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" );
goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME );
@@ -67,7 +67,7 @@
public void testAddInvalidMailProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME );
addMailNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "invalid_email_add", false );
@@ -76,8 +76,8 @@
public void testAddValidMailGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" );
goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
@@ -88,8 +88,8 @@
public void testEditValidMailGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" );
String newMail = "newmail@mail.com";
@@ -104,8 +104,8 @@
public void testEditInvalidMailGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" );
showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
@@ -117,8 +117,8 @@
public void testAddInvalidMailGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
addMailNotifier( TEST_PROJ_GRP_NAME, null, "invalid_email_add", false );
@@ -127,7 +127,7 @@
public void testAddValidIrcProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" );
String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" );
@@ -139,7 +139,7 @@
public void testEditValidIrcProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" );
String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" );
@@ -156,7 +156,7 @@
public void testEditInvalidIrcProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" );
String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" );
@@ -167,7 +167,7 @@
public void testAddInvalidIrcProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME );
addIrcNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "", "", false );
@@ -176,8 +176,8 @@
public void testAddValidIrcGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" );
String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" );
@@ -189,8 +189,8 @@
public void testEditValidIrcGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" );
String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" );
@@ -207,8 +207,8 @@
public void testEditInvalidIrcGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" );
String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" );
@@ -221,8 +221,8 @@
public void testAddInvalidIrcGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
addIrcNotifier( TEST_PROJ_GRP_NAME, null, "", "", false );
@@ -231,7 +231,7 @@
public void testAddValidJabberProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" );
String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" );
String JABBER_NOTIFIER_PASSWORD = getProperty( "JABBER_NOTIFIER_PASSWORD" );
@@ -246,7 +246,7 @@
public void testEditValidJabberProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" );
String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" );
@@ -267,7 +267,7 @@
public void testEditInvalidJabberProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" );
String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" );
@@ -280,7 +280,7 @@
public void testAddInvalidJabberProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME );
addJabberNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "", "", "", "", false );
@@ -289,8 +289,8 @@
public void testAddValidJabberGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" );
String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" );
@@ -305,8 +305,8 @@
public void testEditValidJabberGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" );
String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" );
@@ -329,8 +329,8 @@
public void testEditInvalidJabberGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" );
String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" );
@@ -345,8 +345,8 @@
public void testAddInvalidJabberGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
addJabberNotifier( TEST_PROJ_GRP_NAME, null, "", "", "", "", false );
@@ -355,7 +355,7 @@
public void testAddValidMsnProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" );
String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" );
@@ -369,7 +369,7 @@
public void testEditValidMsnProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" );
String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" );
@@ -388,7 +388,7 @@
public void testEditInvalidMsnProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" );
String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" );
@@ -400,7 +400,7 @@
public void testAddInvalidMsnProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME );
addMsnNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "", "", "", false );
@@ -409,8 +409,8 @@
public void testAddValidMsnGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" );
String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" );
@@ -423,8 +423,8 @@
public void testEditValidMsnGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" );
String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" );
@@ -445,8 +445,8 @@
public void testEditInvalidMsnGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" );
String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" );
@@ -459,8 +459,8 @@
public void testAddInvalidMsnGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
addMsnNotifier( TEST_PROJ_GRP_NAME, null, "", "", "", false );
@@ -469,7 +469,7 @@
public void testAddValidWagonProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" );
String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" );
@@ -481,7 +481,7 @@
public void testEditValidWagonProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" );
String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" );
@@ -498,7 +498,7 @@
public void testEditInvalidWagonProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" );
String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" );
@@ -509,7 +509,7 @@
public void testAddInvalidWagonProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME );
addWagonNotifierPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "", "", false );
@@ -518,8 +518,8 @@
public void testAddValidWagonGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" );
String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" );
@@ -531,8 +531,8 @@
public void testEditValidWagonGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" );
String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" );
@@ -549,8 +549,8 @@
public void testEditInvalidWagonGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" );
String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" );
@@ -563,8 +563,8 @@
public void testAddInvalidWagonGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
addWagonNotifierPage( TEST_PROJ_GRP_NAME, null, "", "", false );
@@ -574,8 +574,8 @@
public void testDeleteGroupNotifier()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
clickLinkWithText( "Notifiers" );
@@ -591,7 +591,7 @@
public void testDeleteProjectNotifier()
throws Exception
{
- String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" );
+ String TEST_PROJ_GRP_NAME = getTestGroupName();
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME );
// Delete
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java Tue Jul 14 06:50:27 2009
@@ -36,8 +36,8 @@
public void testAddProjectGroup()
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
addProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION, true );
@@ -47,8 +47,8 @@
public void testAddProjectGroup2()
throws Exception
{
- String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" );
- String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" );
+ String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ) + getTestId();
+ String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ) + getTestId();
String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
addProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, true );
@@ -59,8 +59,8 @@
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_NAME = getTestGroupName();
+ String TEST_PROJ_GRP_ID = getTestGroupId();
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" );
@@ -102,8 +102,8 @@
final String sNewProjectName = "New Project Group Name";
final String sNewProjectDescription = "New Project Group Description";
- String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" );
- String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" );
+ String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ) + getTestId();
+ String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ) + getTestId();
String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
editProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, sNewProjectName,
@@ -120,8 +120,8 @@
throws Exception
{
- String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" );
- String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" );
+ String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ) + getTestId();
+ String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ) + getTestId();
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 );
@@ -133,7 +133,7 @@
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_ID = getProperty( "M2_PROJ_GRP_ID" ) + getTestId();
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 );
clickButtonWithValue( "Release" );
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/QueueTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/QueueTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/QueueTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/QueueTest.java Tue Jul 14 06:50:27 2009
@@ -38,7 +38,7 @@
public void testAddBuildQueue()
{
setMaxBuildQueue( 2 );
- String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" );
+ String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" ) + getTestId();
addBuildQueue( BUILD_QUEUE_NAME, true );
}
@@ -74,7 +74,7 @@
String SCHEDULE_MAX_TIME = getProperty( "SCHEDULE_MAX_TIME" );
String SCHEDULE_PERIOD = getProperty( "SCHEDULE_PERIOD" );
- String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" );
+ String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" ) + getTestId();
sched.goToEditSchedule( SCHEDULE_NAME, SCHEDULE_DESCRIPTION, SCHEDULE_EXPR_SECOND, SCHEDULE_EXPR_MINUTE,
@@ -100,7 +100,7 @@
public void testAddAlreadyExistBuildQueue()
{
setMaxBuildQueue( 3 );
- String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" );
+ String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" ) + getTestId();
addBuildQueue( BUILD_QUEUE_NAME, false );
assertTextPresent( "Build queue name already exists." );
}
@@ -117,7 +117,7 @@
public void testDeleteBuildQueue()
{
goToBuildQueuePage();
- String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" );
+ String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" ) + getTestId();
removeBuildQueue( BUILD_QUEUE_NAME );
assertTextNotPresent( BUILD_QUEUE_NAME );
}
@@ -129,7 +129,7 @@
{
//build a project
String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" );
- String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_GRP_ID" );
+ String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_GRP_ID" ) + getTestId();
String M2_PROJ_GRP_DESCRIPTION = getProperty( "M2_PROJ_GRP_DESCRIPTION" );
buildProjectForQueuePageTest( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME );
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java Tue Jul 14 06:50:27 2009
@@ -32,6 +32,7 @@
public class ShellProjectTest
extends AbstractContinuumTest
{
+ @Test( dependsOnMethods = { "testAddProjectGroup" } )
public void testAddShellProject()
throws Exception
{
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java Tue Jul 14 06:50:27 2009
@@ -556,8 +556,8 @@
assertElementPresent( "selectedProjectGroup" );
}
- public void addMavenTwoProject(String pomUrl,String username,String password,String projectGroup,
- boolean success )
+ public void addMavenTwoProject( String pomUrl, String username, String password, String projectGroupName,
+ boolean success )
throws Exception
{
goToAddMavenTwoProjectPage();
@@ -567,9 +567,9 @@
setFieldValue( "scmUsername", username );
setFieldValue( "scmPassword", password );
- if ( projectGroup != null )
+ if ( projectGroupName != null )
{
- selectValue( "addMavenTwoProject_selectedProjectGroup", projectGroup );
+ selectValue( "addMavenTwoProject_selectedProjectGroup", projectGroupName );
}
submit();
String title;
@@ -634,8 +634,8 @@
assertButtonWithValuePresent( "Cancel" );
}
- public void addMavenOneProject(String pomUrl,String username,String password,String projectGroup,
- String buildTemplate,boolean success )
+ public void addMavenOneProject( String pomUrl, String username, String password, String projectGroupName,
+ String buildTemplate, boolean success )
throws Exception
{
setFieldValue( "m1PomUrl", pomUrl );
@@ -646,9 +646,9 @@
{
selectValue( "buildDefinitionTemplateId", buildTemplate );
}
- if ( projectGroup != null )
+ if ( projectGroupName != null )
{
- selectValue( "selectedProjectGroup", projectGroup );
+ selectValue( "selectedProjectGroup", projectGroupName );
}
submit();
String title;
@@ -712,9 +712,9 @@
assertButtonWithValuePresent( "Cancel" );
}
- public void addProject(String name,String description,String version,String scmUrl,String scmUser,
- String scmPassword,String scmTag,boolean useCache,String projectGroup,
- String buildTemplate,boolean success )
+ public void addProject( String name, String description, String version, String scmUrl, String scmUser,
+ String scmPassword, String scmTag, boolean useCache, String projectGroupName,
+ String buildTemplate, boolean success )
throws Exception
{
setFieldValue( "projectName", name );
@@ -732,9 +732,9 @@
{
selectValue( "buildDefinitionTemplateId", buildTemplate );
}
- if ( projectGroup != null )
+ if ( projectGroupName != null )
{
- selectValue( "selectedProjectGroup", projectGroup );
+ selectValue( "selectedProjectGroup", projectGroupName );
}
submit();
String title;
@@ -758,6 +758,16 @@
getSelenium().waitForCondition( condition, maxWaitTimeInMs );
Thread.sleep( 1000 );
String t = getTitle();
- Assert.assertTrue( t.contains( title ) );
+ Assert.assertTrue( t.contains( title ), "Title '" + title + "' not found in page, instead got '" + t + "'" );
+ }
+
+ protected String getTestGroupId()
+ {
+ return getProperty( "TEST_PROJ_GRP_ID" ) + getTestId();
+ }
+
+ protected String getTestGroupName()
+ {
+ return getProperty( "TEST_PROJ_GRP_NAME" ) + getTestId();
}
}
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java?rev=793802&r1=793801&r2=793802&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java Tue Jul 14 06:50:27 2009
@@ -76,8 +76,9 @@
if ( getSelenium() == null )
{
- selenium.set( new DefaultSelenium( seleniumHost, seleniumPort, browser, baseUrl ) );
- getSelenium().start();
+ DefaultSelenium s = new DefaultSelenium( seleniumHost, seleniumPort, browser, baseUrl );
+ s.start();
+ selenium.set( s );
}
}
@@ -86,6 +87,17 @@
return selenium == null ? null : selenium.get();
}
+ /**
+ * Returns an unique identifier that can be used to allow rerunning the tests against the same server without status
+ * collision
+ *
+ * @return
+ */
+ public static long getTestId()
+ {
+ return Thread.currentThread().hashCode();
+ }
+
protected String getProperty( String key )
{
return p.getProperty( key );