svn commit: r1172553 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test: ArtifactManagementTest.java parent/AbstractArtifactManagementTest.java parent/AbstractSeleniumTest.java

[olamy]

Author: olamy
Date: Mon Sep 19 10:09:53 2011
New Revision: 1172553

URL: http://svn.apache.org/viewvc?rev=1172553&view=rev
Log:
fix some test : with struts we cannot have both client and server side 
validation

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java?rev=1172553&r1=1172552&r2=1172553&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
 Mon Sep 19 10:09:53 2011
@@ -51,7 +51,6 @@ public class ArtifactManagementTest
     @Test( dependsOnMethods = { "testAddArtifactNoGroupId" }, alwaysRun = true 
)
     public void testAddArtifactNoArtifactId()
     {
-
         addArtifact( getGroupId(), " ", getVersion(), getPackaging(), 
getArtifactFilePath(), getRepositoryId(), false );
         assertTextPresent( "You must enter an artifactId." );
     }
@@ -164,15 +163,14 @@ public class ArtifactManagementTest
     @Test( alwaysRun = true, dependsOnMethods = { "testAddArtifactNullValues" 
} )
     public void testDeleteArtifactNoVersion()
     {
-        deleteArtifact( "delete", "delete", " ", "internal" );
-        assertTextPresent( "Invalid version." );
+        deleteArtifact( "delete", "delete", " ", "internal", true );
         assertTextPresent( "You must enter a version." );
     }
 
     @Test( alwaysRun = true, dependsOnMethods = { "testAddArtifactNullValues" 
} )
     public void testDeleteArtifactInvalidVersion()
     {
-        deleteArtifact( "delete", "delete", "asdf", "internal" );
+        deleteArtifact( "delete", "delete", "asdf", "internal", true );
         assertTextPresent( "Invalid version." );
     }
 

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java?rev=1172553&r1=1172552&r2=1172553&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
 Mon Sep 19 10:09:53 2011
@@ -67,6 +67,11 @@ public abstract class AbstractArtifactMa
 
     public void deleteArtifact( String groupId, String artifactId, String 
version, String repositoryId )
     {
+        deleteArtifact( groupId, artifactId, version, repositoryId, false );
+    }
+
+    public void deleteArtifact( String groupId, String artifactId, String 
version, String repositoryId, boolean wait )
+    {
         goToDeleteArtifactPage();
         setFieldValue( "groupId", groupId );
         setFieldValue( "artifactId", artifactId );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java?rev=1172553&r1=1172552&r2=1172553&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
 Mon Sep 19 10:09:53 2011
@@ -236,6 +236,7 @@ public abstract class AbstractSeleniumTe
 
     public void waitPage()
     {
+        // TODO define a smaller maxWaitTimeJsInMs for wait javascript 
response for browser side validation
         getSelenium().waitForPageToLoad( maxWaitTimeInMs );
     }