Author: psharples
Date: Thu Jul 26 12:39:44 2012
New Revision: 1365965
URL: http://svn.apache.org/viewvc?rev=1365965&view=rev
Log:
Attempt to fix buildbot problem with tests
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/AbstractControllerTest.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/ValidatorControllerTest.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/AbstractControllerTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/AbstractControllerTest.java?rev=1365965&r1=1365964&r2=1365965&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/AbstractControllerTest.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/AbstractControllerTest.java
Thu Jul 26 12:39:44 2012
@@ -14,12 +14,18 @@
package org.apache.wookie.tests.functional;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collection;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
@@ -66,10 +72,20 @@ public abstract class AbstractController
* Set credentials for accessing Wookie admin functions
* @param client
*/
- protected static void setAuthenticationCredentials(HttpClient client){
- Credentials defaultcreds = new
UsernamePasswordCredentials("java", "java");
- client.getState().setCredentials(new
AuthScope(TEST_SERVER_HOST, TEST_SERVER_PORT, AuthScope.ANY_REALM),
defaultcreds);
- }
+ protected static void setAuthenticationCredentials(HttpClient client){
+ Credentials defaultcreds = new UsernamePasswordCredentials("java",
"java");
+ client.getState().setCredentials(new AuthScope(TEST_SERVER_HOST,
TEST_SERVER_PORT, AuthScope.ANY_REALM), defaultcreds);
+ }
+
+ protected static boolean shouldValidate = false;
+
+ public static void initValidatorValue() throws ConfigurationException{
+ File file = new File("src/widgetserver.properties");
+ assertTrue(file.exists());
+ Configuration properties = new
PropertiesConfiguration("src/widgetserver.properties");
+ shouldValidate = properties.getBoolean("widget.enable.validator");
+ }
+
@AfterClass
public static void tearDown() throws HttpException, IOException{
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/ValidatorControllerTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/ValidatorControllerTest.java?rev=1365965&r1=1365964&r2=1365965&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/ValidatorControllerTest.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/ValidatorControllerTest.java
Thu Jul 26 12:39:44 2012
@@ -14,16 +14,13 @@
package org.apache.wookie.tests.functional;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.PostMethod;
@@ -36,16 +33,11 @@ import org.junit.Test;
public class ValidatorControllerTest extends AbstractControllerTest {
- private static boolean shouldValidate = false;
-
@BeforeClass
public static void setup() throws ConfigurationException{
- File file = new File("src/widgetserver.properties");
- assertTrue(file.exists());
- Configuration properties = new
PropertiesConfiguration("src/widgetserver.properties");
- shouldValidate = properties.getBoolean("widget.enable.validator");
- }
-
+ initValidatorValue();
+ }
+
@AfterClass
public static void tearDown() throws HttpException, IOException{}
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java?rev=1365965&r1=1365964&r2=1365965&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java
Thu Jul 26 12:39:44 2012
@@ -19,6 +19,7 @@ import static org.junit.Assert.assertTru
import java.io.File;
import java.io.IOException;
+import java.net.ConnectException;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
@@ -41,7 +42,7 @@ public class MaliciousContentUploadTest
public static void tearDown() throws HttpException, IOException{}
@Test
- public void testNoExecutableInUploadFolder() throws HttpException,
IOException{
+ public void testNoExecutableInUploadFolder() throws HttpException,
IOException, ConnectException{
HttpClient client = new HttpClient();
PostMethod post = new PostMethod(TEST_VALIDATOR_SERVICE_URL_VALID);
@@ -62,7 +63,11 @@ public class MaliciousContentUploadTest
client.executeMethod(post);
int code = post.getStatusCode();
// should be 400 - bad wgt package
- assertEquals(400, code);
+ if(shouldValidate){
+ assertEquals(400, code);
+ }else{
+ assertEquals(503, code);
+ }
//System.out.println(post.getResponseBodyAsString());
post.releaseConnection();
// ensure no binary.exe in temp folder
@@ -71,7 +76,7 @@ public class MaliciousContentUploadTest
}
@Test
- public void testNoJspInUploadFolder() throws HttpException, IOException{
+ public void testNoJspInUploadFolder() throws HttpException, IOException,
ConnectException{
HttpClient client = new HttpClient();
PostMethod post = new PostMethod(TEST_VALIDATOR_SERVICE_URL_VALID);
@@ -92,7 +97,11 @@ public class MaliciousContentUploadTest
client.executeMethod(post);
int code = post.getStatusCode();
// should be 400 - bad wgt package
- assertEquals(400, code);
+ if(shouldValidate){
+ assertEquals(400, code);
+ }else{
+ assertEquals(503, code);
+ }
//System.out.println(post.getResponseBodyAsString());
post.releaseConnection();
// ensure no jsp.jsp in temp folder
@@ -101,7 +110,7 @@ public class MaliciousContentUploadTest
}
@Test
- public void testNoBatchFileInUploadFolder() throws HttpException,
IOException{
+ public void testNoBatchFileInUploadFolder() throws HttpException,
IOException, ConnectException{
HttpClient client = new HttpClient();
PostMethod post = new PostMethod(TEST_VALIDATOR_SERVICE_URL_VALID);
@@ -122,7 +131,11 @@ public class MaliciousContentUploadTest
client.executeMethod(post);
int code = post.getStatusCode();
// should be 400 - bad wgt package
- assertEquals(400, code);
+ if(shouldValidate){
+ assertEquals(400, code);
+ }else{
+ assertEquals(503, code);
+ }
//System.out.println(post.getResponseBodyAsString());
post.releaseConnection();
// ensure no script.bat in temp folder
@@ -131,7 +144,7 @@ public class MaliciousContentUploadTest
}
@Test
- public void testNoScriptFileInUploadFolder() throws HttpException,
IOException{
+ public void testNoScriptFileInUploadFolder() throws HttpException,
IOException, ConnectException{
HttpClient client = new HttpClient();
PostMethod post = new PostMethod(TEST_VALIDATOR_SERVICE_URL_VALID);
@@ -152,7 +165,11 @@ public class MaliciousContentUploadTest
client.executeMethod(post);
int code = post.getStatusCode();
// should be 400 - bad wgt package
- assertEquals(400, code);
+ if(shouldValidate){
+ assertEquals(400, code);
+ }else{
+ assertEquals(503, code);
+ }
//System.out.println(post.getResponseBodyAsString());
post.releaseConnection();
// ensure no script.sh in temp folder
@@ -161,7 +178,7 @@ public class MaliciousContentUploadTest
}
@Test
- public void testUploadMaliciousWidgetNoManifest() throws HttpException,
IOException{
+ public void testUploadMaliciousWidgetNoManifest() throws HttpException,
IOException, ConnectException{
HttpClient client = new HttpClient();
PostMethod post = new PostMethod(TEST_VALIDATOR_SERVICE_URL_VALID);
@@ -182,7 +199,11 @@ public class MaliciousContentUploadTest
client.executeMethod(post);
int code = post.getStatusCode();
// should be 400 - bad wgt package
- assertEquals(400, code);
+ if(shouldValidate){
+ assertEquals(400, code);
+ }else{
+ assertEquals(503, code);
+ }
//System.out.println(post.getResponseBodyAsString());
post.releaseConnection();
// ensure resources are removed
@@ -191,7 +212,7 @@ public class MaliciousContentUploadTest
}
@Test
- public void testUploadMaliciousWidgetWithManifest() throws HttpException,
IOException{
+ public void testUploadMaliciousWidgetWithManifest() throws HttpException,
IOException, ConnectException{
HttpClient client = new HttpClient();
PostMethod post = new PostMethod(TEST_VALIDATOR_SERVICE_URL_VALID);
@@ -212,7 +233,11 @@ public class MaliciousContentUploadTest
client.executeMethod(post);
int code = post.getStatusCode();
// should be 200
- assertEquals(200, code);
+ if(shouldValidate){
+ assertEquals(200, code);
+ }else{
+ assertEquals(503, code);
+ }
//System.out.println(post.getResponseBodyAsString());
post.releaseConnection();
// ensure resources are removed
