Updated selenium and tweaked tests

psiinon · Jun 1, 2012 · 6e62579 · 6e62579
1 parent efd9bc2
commit 6e62579
Show file tree

Hide file tree

Showing 43 changed files with 38 additions and 6 deletions.
diff --git a/build.xml b/build.xml
@@ -76,12 +76,16 @@
 		<!-- Your servlet engine must be running when you start this test -->
 
 		<!-- Start ZAP with UI -->
-		<!--
 		<ant antfile="zap-build.xml" target="startZap" inheritAll="false"/>
-		-->
 
 		<!-- OR Start ZAP in background -->
+		<!-- 
+			IMPORTANT - there is a bug in ZAP 1.4.0 which means ZAP running in daemon mode will exit 
+			when you save the session 
+		-->
+		<!--
 		<ant antfile="zap-build.xml" target="startZapDaemon" inheritAll="false"/>
+		-->
 
 		<!-- Run the standard tests -->
         <junit printsummary="yes" fork="yes">

diff --git a/lib/ant.jar b/lib/ant.jar
diff --git a/lib/apache-mime4j-0.6.jar b/lib/apache-mime4j-0.6.jar
diff --git a/lib/bsh-1.3.0.jar b/lib/bsh-1.3.0.jar
diff --git a/lib/cglib-nodep-2.1_3.jar b/lib/cglib-nodep-2.1_3.jar
diff --git a/lib/commons-codec-1.6.jar b/lib/commons-codec-1.6.jar
diff --git a/lib/commons-collections-3.2.1.jar b/lib/commons-collections-3.2.1.jar
diff --git a/lib/commons-exec-1.1.jar b/lib/commons-exec-1.1.jar
diff --git a/lib/commons-io-2.0.1.jar b/lib/commons-io-2.0.1.jar
diff --git a/lib/commons-jxpath-1.3.jar b/lib/commons-jxpath-1.3.jar
diff --git a/lib/commons-logging-1.1.1.jar b/lib/commons-logging-1.1.1.jar
diff --git a/lib/cssparser-0.9.5.jar b/lib/cssparser-0.9.5.jar
diff --git a/lib/guava-11.0.1.jar b/lib/guava-11.0.1.jar
diff --git a/lib/hamcrest-core-1.1.jar b/lib/hamcrest-core-1.1.jar
diff --git a/lib/hamcrest-library-1.1.jar b/lib/hamcrest-library-1.1.jar
diff --git a/lib/htmlunit-2.9.jar b/lib/htmlunit-2.9.jar
diff --git a/lib/htmlunit-core-js-2.9.jar b/lib/htmlunit-core-js-2.9.jar
diff --git a/lib/httpclient-4.1.3.jar b/lib/httpclient-4.1.3.jar
diff --git a/lib/httpcore-4.1.3.jar b/lib/httpcore-4.1.3.jar
diff --git a/lib/httpmime-4.1.3.jar b/lib/httpmime-4.1.3.jar
diff --git a/lib/ini4j-0.5.2.jar b/lib/ini4j-0.5.2.jar
diff --git a/lib/jcommander-1.13.jar b/lib/jcommander-1.13.jar
diff --git a/lib/jna-3.4.0.jar b/lib/jna-3.4.0.jar
diff --git a/lib/jna-platform-3.4.0.jar b/lib/jna-platform-3.4.0.jar
diff --git a/lib/json-20080701.jar b/lib/json-20080701.jar
diff --git a/lib/junit-4.10.jar b/lib/junit-4.10.jar
diff --git a/lib/junit-dep-4.10.jar b/lib/junit-dep-4.10.jar
diff --git a/lib/nekohtml-1.9.15.jar b/lib/nekohtml-1.9.15.jar
diff --git a/lib/operadriver-v0.11.jar b/lib/operadriver-v0.11.jar
diff --git a/lib/protobuf-java-2.4.1.jar b/lib/protobuf-java-2.4.1.jar
diff --git a/lib/sac-1.3.jar b/lib/sac-1.3.jar
diff --git a/lib/selenium-java-2.21.0.jar b/lib/selenium-java-2.21.0.jar
diff --git a/lib/selenium-java-client-driver.jar b/lib/selenium-java-client-driver.jar
diff --git a/lib/selenium-server-standalone-2.5.0.jar b/lib/selenium-server-standalone-2.5.0.jar
diff --git a/lib/serializer-2.7.1.jar b/lib/serializer-2.7.1.jar
diff --git a/lib/testng-6.0.1-nobsh-noguice.jar b/lib/testng-6.0.1-nobsh-noguice.jar
diff --git a/lib/webbit-0.4.6-full.jar b/lib/webbit-0.4.6-full.jar
diff --git a/lib/xalan-2.7.1.jar b/lib/xalan-2.7.1.jar
diff --git a/lib/xercesImpl-2.9.1.jar b/lib/xercesImpl-2.9.1.jar
diff --git a/lib/xml-apis-1.3.04.jar b/lib/xml-apis-1.3.04.jar
diff --git a/local.properties b/local.properties
@@ -2,7 +2,7 @@
 
 # Directory to deploy to
 # /opt/tomcat/webapps
-deploy.dir=C:\\Program Files\\Apache Software Foundation\\Tomcat 5.5\\webapps
+deploy.dir=C:\\Program Files\\Apache Software Foundation\\Tomcat 7.0\\webapps
 
 # The application being tested
 zap.target=http://localhost:8080/
@@ -12,6 +12,7 @@ zap.addr=localhost
 # The ZAP port
 zap.port=8090
 # The ZAP home directory
-zap.dir=C:\\Program Files\\OWASP\\Zed Attack Proxy
+# zap.dir=C:\\Program Files\\OWASP\\Zed Attack Proxy
+zap.dir=C:\\Program Files (x86)\\OWASP\\Zed Attack Proxy
 # The default ZAP session name
 zap.session=zap.session
diff --git a/src/com/thebodgeitstore/selenium/tests/FunctionalTest.java b/src/com/thebodgeitstore/selenium/tests/FunctionalTest.java
@@ -19,7 +19,7 @@
  */
 package com.thebodgeitstore.selenium.tests;
 
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -49,6 +49,7 @@ public void checkMenu(String linkText, String page) {
 	}
 
 	public void checkMenuLinks(String page) {
+
 		driver.get(site + page);
 		checkMenu("Home", "home.jsp");
 
@@ -64,6 +65,9 @@ public void checkMenuLinks(String page) {
 		driver.get(site + page);
 		checkMenu("Your Basket", "basket.jsp");
 
+		driver.get(site + page);
+		checkMenu("Search", "search.jsp");
+
 	}
 
 	public void tstMenuLinks() {
@@ -72,6 +76,7 @@ public void tstMenuLinks() {
 		checkMenuLinks("contact.jsp");
 		checkMenuLinks("login.jsp");
 		checkMenuLinks("basket.jsp");
+		checkMenuLinks("search.jsp");
 	}
 
 	public void registerUser(String user, String password) {
@@ -154,11 +159,21 @@ public void tstAddProductsToBasket() {
 		driver.findElement(By.id("submit")).click();
 	}
 
+	public void tstSearch() {
+		driver.get(site + "search.jsp?q=doo");
+
+		// TODO check the results!
+		//driver.findElement(By.name("q")).sendKeys("doo");
+
+	}
+
 	public void testAll() {
 		tstMenuLinks();
 		tstRegisterUser();
 		tstRegisterAndLoginUser();
 		tstAddProductsToBasket();
+		tstSearch();
+
 	}
 
 	public void tearDown() throws Exception {
@@ -181,4 +196,12 @@ protected void setSite(String site) {
 		this.site = site;
 	}
 
+	public static void main(String[] args) throws Exception {
+		FunctionalTest test = new FunctionalTest();
+		test.setUp();
+		test.testAll();
+		test.tearDown();
+
+	}
+
 }
diff --git a/zap-build.xml b/zap-build.xml
@@ -78,8 +78,12 @@
 			    	<ignoreAlert risk="Low" reliability="Warning"/>
 			    will ignore all alerts with a Low risk and Warning reliability
 			    The url, param and other fields are all regexs 
-	    	 -->
+	    	-->
+
+			<ignoreAlert alert="X-Content-Type-Options header missing" risk="Low" reliability="Warning"/> 
+	    	<ignoreAlert alert="Cross Site Request Forgery" risk="Medium" reliability="Warning"/> 
 	    	<ignoreAlert alert="Cookie set without HttpOnly flag" risk="Low" reliability="Warning"/>
+	    	<ignoreAlert alert="X-Frame-Options header not set" risk="Informational" reliability="Warning"/> 
 	    </alertCheckTask>
 	</target>