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/18 03:14:19 UTC
svn commit: r795293 - in
/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test:
BuildAgentsTest.java parent/AbstractBuildAgentsTest.java
Author: carlos
Date: Sat Jul 18 01:14:18 2009
New Revision: 795293
URL: http://svn.apache.org/viewvc?rev=795293&view=rev
Log:
Use properties for the build agent names
Modified:
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/parent/AbstractBuildAgentsTest.java
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=795293&r1=795292&r2=795293&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 Sat Jul 18 01:14:18 2009
@@ -83,7 +83,7 @@
{
enableDistributedBuilds();
goToBuildAgentPage();
- String BUILD_AGENT_NAME3 = getProperty( "BUILD_AGENT_NAME3" );
+ String BUILD_AGENT_NAME3 = getProperty( "BUILD_AGENT_NAME3" + getTestId() );
removeBuildAgent( BUILD_AGENT_NAME3 );
assertTextNotPresent( BUILD_AGENT_NAME3 );
disableDistributedBuilds();
@@ -110,7 +110,7 @@
String BUILD_AGENT_GROUPNAME = getProperty( "BUILD_AGENT_GROUPNAME" );
enableDistributedBuilds();
goToAddBuildAgentGroup();
- addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { "Agent_url_name", "Second_Agent" }, new String[] {}, true );
+ addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { getProperty( "BUILD_AGENT_NAME" ) + getTestId(), getProperty( "BUILD_AGENT_NAME2" ) + getTestId() }, new String[] {}, true );
disableDistributedBuilds();
}
@@ -121,11 +121,11 @@
String BUILD_AGENT_GROUPNAME = getProperty( "BUILD_AGENT_GROUPNAME" );
String newName = "new_agentgroupname";
enableDistributedBuilds();
- goToEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { "Agent_url_name", "Second_Agent" } );
+ goToEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { getProperty( "BUILD_AGENT_NAME" ) + getTestId(), getProperty( "BUILD_AGENT_NAME2" ) + getTestId() } );
addEditBuildAgentGroup( newName, new String[] {},
- new String[] { "Second_Agent" }, true );
- goToEditBuildAgentGroup( newName, new String[] { "Agent_url_name" } );
- addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { "Second_Agent" },
+ new String[] { getProperty( "BUILD_AGENT_NAME2" ) + getTestId() }, true );
+ goToEditBuildAgentGroup( newName, new String[] { getProperty( "BUILD_AGENT_NAME" ) + getTestId() } );
+ addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { getProperty( "BUILD_AGENT_NAME2" ) + getTestId() },
new String[] {}, true );
disableDistributedBuilds();
}
@@ -138,7 +138,7 @@
enableDistributedBuilds();
goToAddBuildAgentGroup();
- addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { "Agent_url_name", "Second_Agent" }, new String[] {}, false );
+ addEditBuildAgentGroup( BUILD_AGENT_GROUPNAME, new String[] { getProperty( "BUILD_AGENT_NAME" ) + getTestId(), getProperty( "BUILD_AGENT_NAME2" ) + getTestId() }, new String[] {}, false );
assertTextPresent( "Build agent group already exists." );
disableDistributedBuilds();
}
Modified: continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java?rev=795293&r1=795292&r2=795293&view=diff
==============================================================================
--- continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java (original)
+++ continuum/branches/continuum-selenium-parallel-carlos/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java Sat Jul 18 01:14:18 2009
@@ -147,7 +147,7 @@
goToBuildAgentPage();
clickAndWait("editBuildAgentGroup_0"); //add button
String[] options =
- new String[] { "--- Available Build Agents ---", "Agent_url_name", "Second_Agent" };
+ new String[] { "--- Available Build Agents ---", getProperty( "BUILD_AGENT_NAME" ) + getTestId(), getProperty( "BUILD_AGENT_NAME2" ) + getTestId() };
assertAddEditBuildAgentGroupPage( options, null );
}