svn commit: r918745 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test: ./ src/test/it-resources/appserver-base/conf/ src/test/testng/org/apache/archiva/web/test/ src/test/testng/org/apache/archiva/web/test/parent/

[brett]

Author: brett
Date: Wed Mar  3 22:42:46 2010
New Revision: 918745

URL: http://svn.apache.org/viewvc?rev=918745&view=rev
Log:
[MRM-1323] run tests with applet disabled to avoid warnings popping up

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/conf/archiva.xml
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt?rev=918745&r1=918744&r2=918745&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt 
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt 
Wed Mar  3 22:42:46 2010
@@ -13,10 +13,5 @@
 To remove the Cargo installations and re-download them next run, use:
   - mvn -Pclean-cargo clean
 
-The scripts cannot be run totally unattended. The following will fail if the 
dialog box that appears
-when the applet is run is not approved:
-  testFindArtifactNullValues(org.apache.archiva.web.test.FindArtifactTest)
-  testFindArtifactUsingChecksum(org.apache.archiva.web.test.FindArtifactTest)
-
 Run Selenium tests in src/test/it with Maven and JUnit
   - mvn clean install -f junit-pom.xml

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/conf/archiva.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/conf/archiva.xml?rev=918745&r1=918744&r2=918745&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/conf/archiva.xml
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/conf/archiva.xml
 Wed Mar  3 22:42:46 2010
@@ -1,3 +1,8 @@
 <configuration>
   <localRepository></localRepository>
+  <webapp>
+    <ui>
+      <appletFindEnabled>false</appletFindEnabled>
+    </ui>
+  </webapp>
 </configuration>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java?rev=918745&r1=918744&r2=918745&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java
 Wed Mar  3 22:42:46 2010
@@ -40,4 +40,6 @@
                clickButtonWithValue( "Search" );
                assertTextPresent( "No results found" );
        }
+
+    // TODO: test using file upload on Firefox versions that support 
getAsBinary (ie, no applet)
 }

Modified: 
archiva/trunk/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/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=918745&r1=918744&r2=918745&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
 Wed Mar  3 22:42:46 2010
@@ -418,11 +418,9 @@
                assertPage( "Apache Archiva \\ Find Artifact" );
                assertTextPresent( "Find Artifact" );
                assertTextPresent( "Search for:" );
-               assertElementPresent( "f" );
                assertTextPresent( "Checksum:" );
                assertElementPresent( "q" );
                assertButtonWithValuePresent( "Search" );
-               assertTextPresent( "This allows you to search the repository 
using the checksum of an artifact that you are trying to identify. You can 
either specify the checksum to look for directly, or scan a local artifact 
file." );
        }
        
        //Appearance