svn commit: r905971 - in /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test: RepositoryTest.java parent/AbstractArchivaTest.java parent/AbstractRepositoryTest.java

[oching]

Author: oching
Date: Wed Feb  3 10:20:55 2010
New Revision: 905971

URL: http://svn.apache.org/viewvc?rev=905971&view=rev
Log:
merged from trunk -r905969 (fixed failing selenium test)

Modified:
    
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
    
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
    
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java

Modified: 
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java?rev=905971&r1=905970&r2=905971&view=diff
==============================================================================
--- 
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
 (original)
+++ 
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
 Wed Feb  3 10:20:55 2010
@@ -36,6 +36,7 @@
                assertRepositoriesPage();
        }
        
+        @Test(dependsOnMethods = { "testAddManagedRepoValidValues" } )
        public void testAddManagedRepoInvalidValues()
        {                               
                goToRepositoriesPage();

Modified: 
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=905971&r1=905970&r2=905971&view=diff
==============================================================================
--- 
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
 (original)
+++ 
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
 Wed Feb  3 10:20:55 2010
@@ -503,7 +503,10 @@
 
     public void goToRepositoriesPage()
     {
-       clickLinkWithText( "Repositories" );
+        if( !getTitle().equals( "Apache Archiva \\ Administration - 
Repositories" ) )
+        {
+            clickLinkWithText( "Repositories" );
+        }
        assertRepositoriesPage();
     }
 

Modified: 
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java?rev=905971&r1=905970&r2=905971&view=diff
==============================================================================
--- 
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
 (original)
+++ 
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
 Wed Feb  3 10:20:55 2010
@@ -28,7 +28,10 @@
        // Repository Groups
        public void goToRepositoryGroupsPage()
        {
-               clickLinkWithText( "Repository Groups" );
+           if( !getTitle().equals( "Apache Archiva \\ Administration - 
Repository Groups" ) )
+           {
+               clickLinkWithText( "Repository Groups" );
+           }
                assertRepositoryGroupsPage();
        }
        
@@ -288,8 +291,8 @@
        }
        
        public void editManagedRepository( String fieldName, String value )
-       {
-               //goToRepositoriesPage();
+       {           
+               goToRepositoriesPage();
                clickLinkWithXPath( 
"//d...@id='contentArea']/div/div[5]/div[1]/a[1]/img" );
                assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" 
);
                setFieldValue(fieldName, value);