From: Brett Porter <brett@apache.org>
Date: Wed, 3 Mar 2010 22:42:46 +0000 (+0000)
Subject: [MRM-1323] run tests with applet disabled to avoid warnings popping up
X-Git-Tag: archiva-1.4-M1~1009
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3b18981b51f4017b777cf2c34b855da533b79bf8;p=archiva.git

[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 2a835e123..34652b89c 100644
--- 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 4208167ec..a95ad86e2 100644
--- 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 3431ebf9e..f0db8bea3 100644
--- 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 f9612d795..b22264af8 100644
--- 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