Author: scottbw
Date: Fri Jun 21 08:30:32 2013
New Revision: 1495324
URL: http://svn.apache.org/r1495324
Log:
moved testdata to src/test/resources and updated tests
Removed:
wookie/trunk/src/test/java/testdata/
Modified:
wookie/trunk/src/test/java/org/apache/wookie/tests/features/FeaturesTest.java
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/FolderLocalizationTest.java
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/ValidatorControllerTest.java
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java
wookie/trunk/src/test/java/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java
Modified:
wookie/trunk/src/test/java/org/apache/wookie/tests/features/FeaturesTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/test/java/org/apache/wookie/tests/features/FeaturesTest.java?rev=1495324&r1=1495323&r2=1495324&view=diff
==============================================================================
---
wookie/trunk/src/test/java/org/apache/wookie/tests/features/FeaturesTest.java
(original)
+++
wookie/trunk/src/test/java/org/apache/wookie/tests/features/FeaturesTest.java
Fri Jun 21 08:30:32 2013
@@ -36,7 +36,7 @@ public class FeaturesTest {
/**
* The location of the test data folder
*/
- private static final String testDataFolder =
"src-tests/org/apache/wookie/tests/features/";
+ private static final String testDataFolder =
"src/test/org/apache/wookie/tests/features/";
/**
* Base path for feature resources
Modified:
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/FolderLocalizationTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/test/java/org/apache/wookie/tests/functional/FolderLocalizationTest.java?rev=1495324&r1=1495323&r2=1495324&view=diff
==============================================================================
---
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/FolderLocalizationTest.java
(original)
+++
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/FolderLocalizationTest.java
Fri Jun 21 08:30:32 2013
@@ -71,7 +71,7 @@ public class FolderLocalizationTest exte
//
// Get the locale test widget
//
- File file = new File("src-tests/testdata/localetest.wgt");
+ File file = new File("src/test/resources/localetest.wgt");
assertTrue(file.exists());
//
Modified:
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/ValidatorControllerTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/test/java/org/apache/wookie/tests/functional/ValidatorControllerTest.java?rev=1495324&r1=1495323&r2=1495324&view=diff
==============================================================================
---
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/ValidatorControllerTest.java
(original)
+++
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/ValidatorControllerTest.java
Fri Jun 21 08:30:32 2013
@@ -52,7 +52,7 @@ public class ValidatorControllerTest ext
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/upload-test-2.wgt");
+ File file = new File("src/test/resources/upload-test-2.wgt");
assertTrue(file.exists());
//
@@ -88,7 +88,7 @@ public class ValidatorControllerTest ext
PostMethod post = new PostMethod(TEST_VALIDATOR_SERVICE_URL_VALID);
- File file = new File("src-tests/testdata/missing-start-page.wgt");
+ File file = new File("src/test/resources/missing-start-page.wgt");
assertTrue(file.exists());
//
@@ -125,7 +125,7 @@ public class ValidatorControllerTest ext
PostMethod post = new PostMethod(TEST_VALIDATOR_SERVICE_URL_VALID);
- File file = new File("src-tests/testdata/missing-config.wgt");
+ File file = new File("src/test/resources/missing-config.wgt");
assertTrue(file.exists());
//
@@ -162,7 +162,7 @@ public class ValidatorControllerTest ext
PostMethod post = new PostMethod(TEST_VALIDATOR_SERVICE_URL_VALID);
- File file = new File("src-tests/testdata/invalid-xml.wgt");
+ File file = new File("src/test/resources/invalid-xml.wgt");
assertTrue(file.exists());
//
Modified:
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java?rev=1495324&r1=1495323&r2=1495324&view=diff
==============================================================================
---
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
(original)
+++
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
Fri Jun 21 08:30:32 2013
@@ -60,7 +60,7 @@ public class WidgetInstancesControllerTe
//
// Get the locale test widget
//
- File file = new File("src-tests/testdata/localetest.wgt");
+ File file = new File("src/test/resources/localetest.wgt");
assertTrue(file.exists());
//
Modified:
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java?rev=1495324&r1=1495323&r2=1495324&view=diff
==============================================================================
---
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java
(original)
+++
wookie/trunk/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java
Fri Jun 21 08:30:32 2013
@@ -201,7 +201,7 @@ public class WidgetsControllerTest exten
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/upload-test.wgt");
+ File file = new File("src/test/resources/testdata/upload-test.wgt");
assertTrue(file.exists());
//
@@ -248,7 +248,7 @@ public class WidgetsControllerTest exten
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/upload-policies-test.wgt");
+ File file = new File("src/test/resources/upload-policies-test.wgt");
assertTrue(file.exists());
//
@@ -303,7 +303,7 @@ public class WidgetsControllerTest exten
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/upload-test-2.wgt");
+ File file = new File("src/test/resources/upload-test-2.wgt");
assertTrue(file.exists());
//
@@ -371,7 +371,7 @@ public class WidgetsControllerTest exten
//
// We'll use a copy of the unsupported widget widget for testing
//
- File file = new File("src-tests/testdata/not_a_widget.zip");
+ File file = new File("src/test/resources/not_a_widget.zip");
assertTrue(file.exists());
//
@@ -412,7 +412,7 @@ public class WidgetsControllerTest exten
//
// Use upload test widget
//
- File uploadFile = new File("src-tests/testdata/upload-test.wgt");
+ File uploadFile = new File("src/test/resources/upload-test.wgt");
assertTrue(uploadFile.exists());
//
@@ -434,7 +434,7 @@ public class WidgetsControllerTest exten
// Now, upload a new widget, with the same filename
// We'll use the WARP widget
//
- uploadFile = new
File("src-tests/testdata/upload-policies-test.wgt");
+ uploadFile = new
File("src/test/resources/upload-policies-test.wgt");
assertTrue(uploadFile.exists());
File tempFolder = createTempDirectory();
File newFile = new
File(tempFolder+File.separator+"upload-test.wgt");
@@ -491,9 +491,9 @@ public class WidgetsControllerTest exten
//
W3CWidgetFactory fac = new W3CWidgetFactory();
fac.setStartPageProcessor(null);
- File outputDir = new File("src-tests" + File.separatorChar +
"testdata" + File.separatorChar + "widgets");
+ File outputDir = new File("src/test" + File.separatorChar +
"resources" + File.separatorChar + "widgets");
outputDir.mkdirs();
- fac.setOutputDirectory("src-tests" + File.separatorChar +
"testdata" + File.separatorChar + "widgets");
+ fac.setOutputDirectory("src/test" + File.separatorChar +
"resources" + File.separatorChar + "widgets");
W3CWidget widget = fac.parse(downloadedFile);
//
@@ -550,7 +550,7 @@ public class WidgetsControllerTest exten
//
// Upload widget we'll test deleting next
//
- File file = new File("src-tests/testdata/delete-test.wgt");
+ File file = new File("src/test/resources/delete-test.wgt");
assertTrue(file.exists());
PostMethod post = new PostMethod(TEST_WIDGETS_SERVICE_URL_VALID);
Part[] parts = { new FilePart(file.getName(), file) };
@@ -593,7 +593,7 @@ public class WidgetsControllerTest exten
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/upload-test.wgt");
+ File file = new File("src/test/resources/upload-test.wgt");
assertTrue(file.exists());
//
@@ -620,7 +620,7 @@ public class WidgetsControllerTest exten
//
// Use upload test widget
//
- file = new File("src-tests/testdata/upload-test.wgt");
+ file = new File("src/test/resources/upload-test.wgt");
assertTrue(file.exists());
//
@@ -653,7 +653,7 @@ public class WidgetsControllerTest exten
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/upload-test.wgt");
+ File file = new File("src/test/resources/upload-test.wgt");
assertTrue(file.exists());
//
@@ -682,7 +682,7 @@ public class WidgetsControllerTest exten
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/upload-test.wgt");
+ File file = new File("src/test/resources/upload-test.wgt");
assertTrue(file.exists());
//
@@ -714,7 +714,7 @@ public class WidgetsControllerTest exten
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/upload-test.wgt");
+ File file = new File("src/test/resources/upload-test.wgt");
assertTrue(file.exists());
//
@@ -761,7 +761,7 @@ public class WidgetsControllerTest exten
// Add the access test widget. This just has a single access request
// for the origin "http://accesstest.incubator.apache.org";
//
- File file = new File("src-tests/testdata/access-test.wgt");
+ File file = new File("src/test/resources/access-test.wgt");
assertTrue(file.exists());
//
@@ -805,7 +805,7 @@ public class WidgetsControllerTest exten
// Add the access test widget. This just has a single access request
// for the origin "http://accesstest.incubator.apache.org";
//
- File file = new File("src-tests/testdata/upload-test-noid.wgt");
+ File file = new File("src/test/resources/upload-test-noid.wgt");
assertTrue(file.exists());
//
@@ -866,7 +866,7 @@ public class WidgetsControllerTest exten
assertEquals(200,code);
InputStream inputStream = get.getResponseBodyAsStream();
- File downloadedFile = new File("src-tests" + File.separatorChar +
"testdata" + File.separatorChar + "downloadedWeatherWidget.zip");
+ File downloadedFile = new File("src"+ File.separatorChar + "test" +
File.separatorChar + "resources" + File.separatorChar +
"downloadedWeatherWidget.zip");
OutputStream out = new FileOutputStream(downloadedFile);
int read = 0;
@@ -883,12 +883,12 @@ public class WidgetsControllerTest exten
// check the downloaded file
W3CWidgetFactory fac = new W3CWidgetFactory();
fac.setStartPageProcessor(null);
- File outputDir = new File("src-tests" + File.separatorChar + "testdata" +
File.separatorChar + "widgets");
+ File outputDir = new File("src"+File.separatorChar+"test" +
File.separatorChar + "resources" + File.separatorChar + "widgets");
outputDir.mkdirs();
- fac.setOutputDirectory("src-tests" + File.separatorChar + "testdata" +
File.separatorChar + "widgets");
+ fac.setOutputDirectory("src" + File.separatorChar + "test" +
File.separatorChar + "resources" + File.separatorChar + "widgets");
W3CWidget widget = fac.parse(downloadedFile);
File file = fac.getUnzippedWidgetDirectory();
- assertEquals("src-tests" + File.separatorChar + "testdata"
+ assertEquals("src" + File.separatorChar + "test" + File.separatorChar +
"testdata"
+ File.separatorChar + "widgets" + File.separatorChar
+ "www.getwookie.org" + File.separatorChar + "widgets"
+ File.separatorChar + "weather", file.getPath());
Modified:
wookie/trunk/src/test/java/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/test/java/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java?rev=1495324&r1=1495323&r2=1495324&view=diff
==============================================================================
---
wookie/trunk/src/test/java/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java
(original)
+++
wookie/trunk/src/test/java/org/apache/wookie/tests/server/security/MaliciousContentUploadTest.java
Fri Jun 21 08:30:32 2013
@@ -51,7 +51,7 @@ public class MaliciousContentUploadTest
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/security-tests/binary.exe");
+ File file = new File("src/test/resources/security-tests/binary.exe");
assertTrue(file.exists());
//
@@ -89,7 +89,7 @@ public class MaliciousContentUploadTest
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/security-tests/jsp.jsp");
+ File file = new File("src/test/resources/security-tests/jsp.jsp");
assertTrue(file.exists());
//
@@ -127,7 +127,7 @@ public class MaliciousContentUploadTest
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/security-tests/script.bat");
+ File file = new File("src/test/resources/security-tests/script.bat");
assertTrue(file.exists());
//
@@ -166,7 +166,7 @@ public class MaliciousContentUploadTest
//
// Use upload test widget
//
- File file = new File("src-tests/testdata/security-tests/script.sh");
+ File file = new File("src/test/resources/security-tests/script.sh");
assertTrue(file.exists());
//
@@ -204,7 +204,7 @@ public class MaliciousContentUploadTest
//
// Use upload test widget
//
- File file = new
File("src-tests/testdata/security-tests/widget-with-malicious-code-no-manifest.wgt");
+ File file = new
File("src/test/resources/security-tests/widget-with-malicious-code-no-manifest.wgt");
assertTrue(file.exists());
//
@@ -242,7 +242,7 @@ public class MaliciousContentUploadTest
//
// Use upload test widget
//
- File file = new
File("src-tests/testdata/security-tests/widget-with-malicious-code-with-manifest.wgt");
+ File file = new
File("src/test/resources/security-tests/widget-with-malicious-code-with-manifest.wgt");
assertTrue(file.exists());
//
