Author: scottbw
Date: Fri Jun 21 08:26:50 2013
New Revision: 1495323
URL: http://svn.apache.org/r1495323
Log:
moved test resources to resources folder and updated test source
Added:
wookie/trunk/parser/java/src/test/resources/
- copied from r1495308, wookie/trunk/parser/java/src/test/java/resources/
wookie/trunk/parser/java/src/test/resources/icons/
- copied from r1495308, wookie/trunk/parser/java/src/test/java/icons/
Removed:
wookie/trunk/parser/java/src/test/java/icons/
wookie/trunk/parser/java/src/test/java/resources/
Modified:
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java
Modified:
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java?rev=1495323&r1=1495322&r2=1495323&view=diff
==============================================================================
---
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
(original)
+++
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
Fri Jun 21 08:26:50 2013
@@ -133,18 +133,18 @@ public class ContentTypeUtilsTest extend
@Test
public void sniff() throws IOException{
- assertEquals("image/bmp", ContentTypeUtils.sniffContentType(new
File("parser/java/src-test/icons/icon_bmp")));
- assertEquals("image/gif", ContentTypeUtils.sniffContentType(new
File("parser/java/src-test/icons/icon_gif")));
- assertEquals("image/jpeg",
ContentTypeUtils.sniffContentType(new
File("parser/java/src-test/icons/icon_jpg")));
- assertEquals("image/png", ContentTypeUtils.sniffContentType(new
File("parser/java/src-test/icons/icon_png")));
- assertEquals("image/vnd.microsoft.icon",
ContentTypeUtils.sniffContentType(new
File("parser/java/src-test/icons/icon_ico")));
- assertEquals(null, ContentTypeUtils.sniffContentType(new
File("parser/java/src-test/icons/icon_exr")));
+ assertEquals("image/bmp", ContentTypeUtils.sniffContentType(new
File("parser/java/src/test/resources/icons/icon_bmp")));
+ assertEquals("image/gif", ContentTypeUtils.sniffContentType(new
File("parser/java/src/test/resources/icons/icon_gif")));
+ assertEquals("image/jpeg",
ContentTypeUtils.sniffContentType(new
File("parser/java/src/test/resources/icons/icon_jpg")));
+ assertEquals("image/png", ContentTypeUtils.sniffContentType(new
File("parser/java/src/test/resources/icons/icon_png")));
+ assertEquals("image/vnd.microsoft.icon",
ContentTypeUtils.sniffContentType(new
File("parser/java/src/test/resources/icons/icon_ico")));
+ assertEquals(null, ContentTypeUtils.sniffContentType(new
File("parser/java/src/test/resources/icons/icon_exr")));
- assertFalse(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src-test/icons/icon_bmp")));
- assertTrue(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src-test/icons/icon_ico")));
- assertFalse(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src-test/icons/icon_exr")));
- assertTrue(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src-test/icons/icon_gif")));
- assertTrue(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src-test/icons/icon_jpg")));
- assertTrue(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src-test/icons/icon_png")));
+ assertFalse(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src/test/resources/icons/icon_bmp")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src/test/resources/icons/icon_ico")));
+ assertFalse(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src/test/resources/icons/icon_exr")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src/test/resources/icons/icon_gif")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src/test/resources/icons/icon_jpg")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("parser/java/src/test/resources/icons/icon_png")));
}
}
Modified:
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java?rev=1495323&r1=1495322&r2=1495323&view=diff
==============================================================================
---
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java
(original)
+++
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java
Fri Jun 21 08:26:50 2013
@@ -38,7 +38,7 @@ public class WidgetOutputterTest extends
@Test
public void outputString() throws Exception{
- File testWidget = new
File("parser/java/src-test/resources/bubbles.wgt");
+ File testWidget = new
File("parser/java/src/test/resources/bubbles.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -48,7 +48,7 @@ public class WidgetOutputterTest extends
}
@Test
public void outputString2() throws Exception{
- File testWidget = new
File("parser/java/src-test/resources/natter.wgt");
+ File testWidget = new
File("parser/java/src/test/resources/natter.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -59,7 +59,7 @@ public class WidgetOutputterTest extends
}
@Test
public void outputString3() throws Exception{
- File testWidget = new
File("parser/java/src-test/resources/weather.wgt");
+ File testWidget = new
File("parser/java/src/test/resources/weather.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -69,7 +69,7 @@ public class WidgetOutputterTest extends
}
@Test
public void outputString4() throws Exception{
- File testWidget = new
File("parser/java/src-test/resources/localetest.wgt");
+ File testWidget = new
File("parser/java/src/test/resources/localetest.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -79,7 +79,7 @@ public class WidgetOutputterTest extends
}
@Test
public void outputString5() throws Exception{
- File testWidget = new
File("parser/java/src-test/resources/localetest.wgt");
+ File testWidget = new
File("parser/java/src/test/resources/localetest.wgt");
W3CWidget widget = load(testWidget);
widget.getIcons().add(new IconEntity("icon.png",100,100));
widget.getNames().get(0).setShort("shortName");
@@ -95,7 +95,7 @@ public class WidgetOutputterTest extends
@Test
public void outputStream() throws Exception{
- File testWidget = new
File("parser/java/src-test/resources/geo.wgt");
+ File testWidget = new
File("parser/java/src/test/resources/geo.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -109,7 +109,7 @@ public class WidgetOutputterTest extends
@Test
public void loadModifySave() throws Exception{
- File testWidget = new
File("parser/java/src-test/resources/bubbles.wgt");
+ File testWidget = new
File("parser/java/src/test/resources/bubbles.wgt");
W3CWidget widget = load(testWidget);
IName name = widget.getNames().get(0);
name.setName("Modified Widget");
Modified:
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java?rev=1495323&r1=1495322&r2=1495323&view=diff
==============================================================================
---
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java
(original)
+++
wookie/trunk/parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java
Fri Jun 21 08:26:50 2013
@@ -88,7 +88,7 @@ public class WidgetPackageUtilsTest {
*/
@Test
public void getLocalesForPackage() throws IOException{
- File widget = new
File("parser/java/src-test/resources/localetest.wgt");
+ File widget = new
File("parser/java/src/test/resources/localetest.wgt");
assert widget.exists();
ZipFile zipFile = new ZipFile(widget);
String[] localesFromZip =
WidgetPackageUtils.getLocalesFromZipFile(zipFile);
