[MRM-1323] run tests with applet disabled to avoid warnings popping up

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@918745 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt b/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
index 2a835e1239551097178f41390e0d58c09ddcd849..34652b89cf6ae50a62fd69d4e5e9d91be702f99f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
+++ b/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
@@ -13,10 +13,5 @@ The Cargo installations are stored outside of target to avoid multiple downloads
 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

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/conf/archiva.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/conf/archiva.xml
index 4208167ece3229f4ee01a66c5d81fa003c6816fc..a95ad86e21ed7bdc4a55e08a2c6a3f0f2b3e9020 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/conf/archiva.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/conf/archiva.xml
@@ -1,3 +1,8 @@
 <configuration>
   <localRepository></localRepository>
+  <webapp>
+    <ui>
+      <appletFindEnabled>false</appletFindEnabled>
+    </ui>
+  </webapp>
 </configuration>

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java
index 3431ebf9eb9f748f2a5ab16644952e4eb64c1528..f0db8bea310f8caa185213bf6764d52c445b8edc 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java
@@ -40,4 +40,6 @@ public class FindArtifactTest
                clickButtonWithValue( "Search" );
                assertTextPresent( "No results found" );
        }
+
+    // TODO: test using file upload on Firefox versions that support getAsBinary (ie, no applet)
 }

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
index f9612d79553627aba2c3e7d91a2100fde94fc045..b22264af8e024399b1e4150635fd332f9e485798 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
@@ -418,11 +418,9 @@ public abstract class AbstractArchivaTest
                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