You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2009/04/22 02:31:03 UTC
svn commit: r767336 - in
/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web:
aux/test/ test/ test/parent/
Author: jmorales
Date: Wed Apr 22 00:31:02 2009
New Revision: 767336
URL: http://svn.apache.org/viewvc?rev=767336&view=rev
Log:
Related to issue [CONTINUUM-2073]
Changed package name org.apache.continuum.web.aux.test -> org.apache.continuum.web.test.parent.
Note: 'aux' is a reserved word used for DOS devices.
Added:
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/
- copied from r766453, continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/aux/test/
Removed:
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/aux/test/
Modified:
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ConfigurationTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.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/MyAccountTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractLocalRepositoryTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractNotifierTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java
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=767336&r1=767335&r2=767336&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 Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractContinuumTest;
+import org.apache.continuum.web.test.parent.AbstractContinuumTest;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeSuite;
@@ -50,7 +50,7 @@
String username = p.getProperty( "ADMIN_USERNAME" );
String mail = p.getProperty( "ADMIN_MAIL" );
String password = p.getProperty( "ADMIN_PASSWORD" );
- submitAdminData( fullname, mail, password );
+ submitAdminData( fullname, mail, password );
assertLoginPage();
submitUserData( username, password, false, true );
assertAutenticatedPage( username );
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=767336&r1=767335&r2=767336&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 Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractContinuumTest;
+import org.apache.continuum.web.test.parent.AbstractContinuumTest;
import org.testng.annotations.Test;
/**
@@ -32,7 +32,7 @@
public class AntProjectTest
extends AbstractContinuumTest
{
- @Test(dependsOnMethods = {"testAddProjectGroup"})
+ @Test( dependsOnMethods = { "testAddProjectGroup" } )
public void testAddAntProject()
throws Exception
{
@@ -62,7 +62,7 @@
assertTextPresent( "SCM Url is required and cannot contain null or spaces only" );
}
- @Test(dependsOnMethods = {"testAddAntProject"})
+ @Test( dependsOnMethods = { "testAddAntProject" } )
public void testAddDupliedAntProject()
throws Exception
{
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractBuildDefinitionTemplateTest;
+import org.apache.continuum.web.test.parent.AbstractBuildDefinitionTemplateTest;
import org.testng.annotations.Test;
/**
@@ -57,8 +57,8 @@
"Default Maven 1 Build Definition" } );
addEditTemplate( newName, new String[] { "Default Shell Build Definition" },
new String[] { "Default Maven 2 Build Definition" }, true );
- goToEditTemplate( newName, new String[] { "Default Maven 1 Build Definition",
- "Default Shell Build Definition" } );
+ goToEditTemplate( newName,
+ new String[] { "Default Maven 1 Build Definition", "Default Shell Build Definition" } );
addEditTemplate( TEMPLATE_NAME, new String[] { "Default Maven 2 Build Definition" },
new String[] { "Default Shell Build Definition" }, true );
}
@@ -99,7 +99,7 @@
String TEMPLATE_BUILD_GOALS = p.getProperty( "TEMPLATE_BUILD_GOALS" );
String TEMPLATE_BUILD_ARGUMENTS = p.getProperty( "TEMPLATE_BUILD_ARGUMENTS" );
String TEMPLATE_BUILD_DESCRIPTION = p.getProperty( "TEMPLATE_BUILD_DESCRIPTION" );
- goToEditBuildDefinitionTemplate(TEMPLATE_BUILD_DESCRIPTION);
+ goToEditBuildDefinitionTemplate( TEMPLATE_BUILD_DESCRIPTION );
addEditBuildDefinitionTemplate( TEMPLATE_BUILD_POM_NAME, TEMPLATE_BUILD_GOALS, TEMPLATE_BUILD_ARGUMENTS,
TEMPLATE_BUILD_DESCRIPTION, false, false, false, true );
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractContinuumTest;
+import org.apache.continuum.web.test.parent.AbstractContinuumTest;
import org.testng.annotations.Test;
/**
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractBuildEnvironmentTest;
+import org.apache.continuum.web.test.parent.AbstractBuildEnvironmentTest;
import org.testng.annotations.Test;
/**
@@ -69,7 +69,7 @@
String newName = "new_name";
goToEditBuildEnvironment( BUIL_ENV_NAME );
editBuildEnvironment( newName, new String[] {}, true );
- //TODO: ADD INSTALLATIONS TO ENVIROTMENT
+ // TODO: ADD INSTALLATIONS TO ENVIROTMENT
goToEditBuildEnvironment( newName );
editBuildEnvironment( BUIL_ENV_NAME, new String[] {}, true );
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ConfigurationTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ConfigurationTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ConfigurationTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractConfigurationTest;
+import org.apache.continuum.web.test.parent.AbstractConfigurationTest;
import org.testng.annotations.Test;
/**
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractInstallationTest;
+import org.apache.continuum.web.test.parent.AbstractInstallationTest;
import org.testng.annotations.Test;
/**
@@ -44,7 +44,7 @@
String INTALLA_TOOL_MAVEN_PATH = p.getProperty( "INTALLA_TOOL_MAVEN_PATH" );
goToAddInstallationTool();
addInstallation( INTALLA_TOOL_MAVEN_NAME, "Maven 2", INTALLA_TOOL_MAVEN_PATH, true, true, true );
- //TODO: Validate build envirotment
+ // TODO: Validate build envirotment
}
public void testAddInstallationVariableWithBuildEnvirotment()
@@ -54,7 +54,7 @@
String INSTALL_VAR_PATH = p.getProperty( "INSTALL_VAR_PATH" );
goToAddInstallationVariable();
addInstallation( INSTALL_VAR_NAME, INSTALL_VAR_VARIABLE_NAME, INSTALL_VAR_PATH, true, false, true );
- //TODO: Validate build envirotment
+ // TODO: Validate build envirotment
}
public void testAddInstallationVariableWithoutBuildEnvirotment()
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractLocalRepositoryTest;
+import org.apache.continuum.web.test.parent.AbstractLocalRepositoryTest;
import org.testng.annotations.Test;
/**
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractContinuumTest;
+import org.apache.continuum.web.test.parent.AbstractContinuumTest;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@@ -31,7 +31,7 @@
*/
/**
* Based on LoginTest of Emmanuel Venisse test.
- *
+ *
* @author José Morales MartÃnez
* @version $Id$
*/
@@ -93,7 +93,6 @@
assertTextPresent( p.getProperty( "ADMIN_USERNAME" ) );
}
-
@BeforeTest
public void open()
throws Exception
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractContinuumTest;
+import org.apache.continuum.web.test.parent.AbstractContinuumTest;
import org.testng.annotations.Test;
/**
@@ -28,7 +28,7 @@
* @author José Morales MartÃnez
* @version $Id$
*/
-@Test( groups = { "mavenOneProject" }, dependsOnMethods = { "testWithCorrectUsernamePassword" })
+@Test( groups = { "mavenOneProject" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public class MavenOneProjectTest
extends AbstractContinuumTest
{
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=767336&r1=767335&r2=767336&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 Apr 22 00:31:02 2009
@@ -19,16 +19,16 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractContinuumTest;
+import org.apache.continuum.web.test.parent.AbstractContinuumTest;
import org.testng.annotations.Test;
/**
* Based on AddMavenTwoProjectTest of Emmanuel Venisse test.
- *
+ *
* @author José Morales MartÃnez
* @version $Id$
*/
-@Test( groups = { "mavenTwoProject" }, dependsOnMethods = { "testWithCorrectUsernamePassword" })
+@Test( groups = { "mavenTwoProject" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public class MavenTwoProjectTest
extends AbstractContinuumTest
{
@@ -39,7 +39,7 @@
String M2_POM_URL = p.getProperty( "M2_POM_URL" );
String M2_POM_USERNAME = p.getProperty( "M2_POM_USERNAME" );
String M2_POM_PASSWORD = p.getProperty( "M2_POM_PASSWORD" );
-
+
String M2_PROJ_GRP_NAME = p.getProperty( "M2_PROJ_GRP_NAME" );
String M2_PROJ_GRP_ID = p.getProperty( "M2_PROJ_GRP_ID" );
String M2_PROJ_GRP_DESCRIPTION = p.getProperty( "M2_PROJ_GRP_DESCRIPTION" );
@@ -49,7 +49,7 @@
assertProjectGroupSummaryPage( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION );
}
- @Test( dependsOnMethods = { "testAddProjectGroup" })
+ @Test( dependsOnMethods = { "testAddProjectGroup" } )
public void testAddMavenTwoProjectFromRemoteSourceToNonDefaultProjectGroup()
throws Exception
{
@@ -93,7 +93,7 @@
throws Exception
{
String pomUrl = "aaa";
- submitAddMavenTwoProjectPage( pomUrl, false);
+ submitAddMavenTwoProjectPage( pomUrl, false );
assertTextPresent( "The specified resource cannot be accessed. Please try again later or contact your administrator." );
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MyAccountTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MyAccountTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MyAccountTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MyAccountTest.java Wed Apr 22 00:31:02 2009
@@ -19,17 +19,17 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractSeleniumTest;
+import org.apache.continuum.web.test.parent.AbstractSeleniumTest;
import org.testng.Assert;
import org.testng.annotations.Test;
/**
* Based on MyAccountTest of Emmanuel Venisse test.
- *
+ *
* @author José Morales MartÃnez
* @version $Id$
*/
-@Test( groups = { "myAccount" }, dependsOnMethods = {"testWithCorrectUsernamePassword"} )
+@Test( groups = { "myAccount" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public class MyAccountTest
extends AbstractSeleniumTest
{
@@ -41,20 +41,20 @@
public void testMyAccountEdit()
throws Exception
{
- clickLinkWithText( "Edit Details");
+ clickLinkWithText( "Edit Details" );
String email = getFieldValue( "user.email" );
setFieldValue( "user.fullName", newFullName );
setFieldValue( "user.email", newEmail );
submit();
getSelenium().waitForPageToLoad( maxWaitTimeInMs );
Assert.assertEquals( "Continuum - Group Summary", getTitle() );
- clickLinkWithText( "Edit Details");
+ clickLinkWithText( "Edit Details" );
assertFieldValue( newFullName, "user.fullName" );
assertFieldValue( newEmail, "user.email" );
setFieldValue( "user.fullName", p.getProperty( "ADMIN_USERNAME" ) );
setFieldValue( "user.email", email );
submit();
- clickLinkWithText( "Edit Details");
+ clickLinkWithText( "Edit Details" );
assertFieldValue( p.getProperty( "ADMIN_USERNAME" ), "user.fullName" );
assertFieldValue( email, "user.email" );
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractNotifierTest;
+import org.apache.continuum.web.test.parent.AbstractNotifierTest;
import org.testng.annotations.Test;
/**
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=767336&r1=767335&r2=767336&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 Apr 22 00:31:02 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractContinuumTest;
+import org.apache.continuum.web.test.parent.AbstractContinuumTest;
import org.testng.annotations.Test;
/**
* Based on ProjectGroupTest of Emmanuel Venisse test.
- *
+ *
* @author José Morales MartÃnez
* @version $Id$
*/
@@ -40,7 +40,7 @@
String TEST_PROJ_GRP_ID = p.getProperty( "TEST_PROJ_GRP_ID" );
String TEST_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST_PROJ_GRP_DESCRIPTION" );
- addProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION, true);
+ addProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION, true );
showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION );
}
@@ -51,8 +51,8 @@
String TEST2_PROJ_GRP_ID = p.getProperty( "TEST2_PROJ_GRP_ID" );
String TEST2_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
- addProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, true);
- showProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION);
+ addProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, true );
+ showProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION );
}
@Test( dependsOnMethods = { "testAddMavenTwoProjectFromRemoteSourceToNonDefaultProjectGroup" } )
@@ -66,11 +66,10 @@
String DEFAULT_PROJ_GRP_ID = p.getProperty( "DEFAULT_PROJ_GRP_NAME" );
String DEFAULT_PROJ_GRP_DESCRIPTION = p.getProperty( "DEFAULT_PROJ_GRP_NAME" );
String M2_PROJ_GRP_NAME = p.getProperty( "M2_PROJ_GRP_NAME" );
-
// 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 );
+ 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
@@ -83,7 +82,7 @@
public void testAddProjectGroupWithEmptyString()
throws Exception
{
- addProjectGroup( "", "", "", false);
+ addProjectGroup( "", "", "", false );
assertTextPresent( "Project Group Name is required." );
assertTextPresent( "Project Group ID is required." );
}
@@ -91,7 +90,7 @@
public void testAddProjectGroupWithWhitespaceString()
throws Exception
{
- addProjectGroup( " ", " ", " ", false);
+ addProjectGroup( " ", " ", " ", false );
assertTextPresent( "Project Group Name cannot contain spaces only." );
assertTextPresent( "Project Group ID cannot contain spaces only." );
}
@@ -111,7 +110,8 @@
sNewProjectDescription );
assertProjectGroupSummaryPage( sNewProjectName, TEST2_PROJ_GRP_ID, sNewProjectDescription );
- editProjectGroup( sNewProjectName, TEST2_PROJ_GRP_ID, sNewProjectDescription, TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_DESCRIPTION);
+ editProjectGroup( sNewProjectName, TEST2_PROJ_GRP_ID, sNewProjectDescription, TEST2_PROJ_GRP_NAME,
+ TEST2_PROJ_GRP_DESCRIPTION );
assertProjectGroupSummaryPage( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION );
}
@@ -124,14 +124,14 @@
String TEST2_PROJ_GRP_ID = p.getProperty( "TEST2_PROJ_GRP_ID" );
String TEST2_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST2_PROJ_GRP_DESCRIPTION" );
editProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, " ",
- TEST2_PROJ_GRP_DESCRIPTION);
+ TEST2_PROJ_GRP_DESCRIPTION );
assertTextPresent( "Project Group Name cannot contain spaces only" );
}
@Test( dependsOnMethods = { "testAddMavenTwoProject" } )
public void testProjectGroupAllBuildSuccess()
throws Exception
- {
+ {
String M2_PROJ_GRP_NAME = p.getProperty( "M2_PROJ_GRP_NAME" );
String M2_PROJ_GRP_ID = p.getProperty( "M2_PROJ_GRP_ID" );
String M2_PROJ_GRP_DESCRIPTION = p.getProperty( "M2_PROJ_GRP_DESCRIPTION" );
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractPurgeTest;
+import org.apache.continuum.web.test.parent.AbstractPurgeTest;
import org.testng.annotations.Test;
/**
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractBuildQueueTest;
+import org.apache.continuum.web.test.parent.AbstractBuildQueueTest;
import org.testng.annotations.Test;
/**
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractScheduleTest;
+import org.apache.continuum.web.test.parent.AbstractScheduleTest;
import org.testng.annotations.Test;
/**
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java?rev=767336&r1=767335&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java Wed Apr 22 00:31:02 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.continuum.web.aux.test.AbstractContinuumTest;
+import org.apache.continuum.web.test.parent.AbstractContinuumTest;
import org.testng.annotations.Test;
/**
@@ -61,7 +61,7 @@
assertTextPresent( "SCM Url is required and cannot contain null or spaces only" );
}
- @Test(dependsOnMethods = {"testAddShellProject"})
+ @Test( dependsOnMethods = { "testAddShellProject" } )
public void testAddDupliedShellProject()
throws Exception
{
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
* under the License.
*/
-
/**
* @author José Morales MartÃnez
* @version $Id$
@@ -49,7 +48,7 @@
String[] options =
new String[] { "--- Available Build Definitions ---", "Default Ant Build Definition",
"Default Maven 1 Build Definition", "Default Maven 2 Build Definition",
- "Default Shell Build Definition"};
+ "Default Shell Build Definition" };
assertAddEditTemplatePage( options, null );
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
* under the License.
*/
-
/**
* @author José Morales MartÃnez
* @version $Id$
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
* under the License.
*/
-
/**
* @author José Morales MartÃnez
* @version $Id$
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
* under the License.
*/
-
/**
* @author José Morales MartÃnez
* @version $Id$
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -227,7 +227,7 @@
assertTextPresent( "Group Actions" );
assertElementPresent( "build" );
assertElementPresent( "edit" );
- //assertElementPresent( "remove" );
+ // assertElementPresent( "remove" );
assertTextPresent( "Project Group Scm Root" );
@@ -320,7 +320,7 @@
assertElementPresent( "Cancel" );
}
- public void buildProjectGroup( String projectGroupName, String groupId, String description, String projectName)
+ public void buildProjectGroup( String projectGroupName, String groupId, String description, String projectName )
throws Exception
{
int currentIt = 1;
@@ -354,7 +354,7 @@
assertElementPresent( "goal" );
assertElementPresent( "preparedReleaseId" );
assertButtonWithValuePresent( "Submit" );
- }
+ }
public void addValidM2ProjectFromProjectGroup( String projectGroupName, String groupId, String description,
String m2PomUrl )
@@ -518,14 +518,15 @@
assertTextPresent( "Developers" );
}
- public void moveProjectToProjectGroup( String groupName, String groupId, String groupDescription, String projectName, String newProjectGroup )
+ public void moveProjectToProjectGroup( String groupName, String groupId, String groupDescription,
+ String projectName, String newProjectGroup )
throws Exception
{
showProjectGroup( groupName, groupId, groupDescription );
clickButtonWithValue( "Edit" );
assertTextPresent( "Move to Group" );
- String xPath = "//preceding::th/label[contains(text(),'"+ projectName+"')]//following::select";
+ String xPath = "//preceding::th/label[contains(text(),'" + projectName + "')]//following::select";
selectValue( xPath, newProjectGroup );
clickButtonWithValue( "Save" );
assertProjectGroupSummaryPage( groupName, groupId, groupDescription );
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
* under the License.
*/
-
/**
* @author José Morales MartÃnez
* @version $Id$
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractLocalRepositoryTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractLocalRepositoryTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractLocalRepositoryTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractLocalRepositoryTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
* under the License.
*/
-
/**
* @author José Morales MartÃnez
* @version $Id$
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractNotifierTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractNotifierTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractNotifierTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractNotifierTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
* under the License.
*/
-
/**
* @author José Morales MartÃnez
* @version $Id$
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
* under the License.
*/
-
/**
* @author José Morales MartÃnez
* @version $Id$
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
* under the License.
*/
-
/**
* @author José Morales MartÃnez
* @version $Id$
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java?rev=767336&r1=766453&r2=767336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java Wed Apr 22 00:31:02 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.aux.test;
+package org.apache.continuum.web.test.parent;
/*
* Licensed to the Apache Software Foundation (ASF) under one