Author: scottbw
Date: Sat Mar 1 21:46:12 2014
New Revision: 1573231
URL: http://svn.apache.org/r1573231
Log:
Fixed paths in parser tests; these had become broken when re-organizing the
project structure.
Modified:
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java
Modified:
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java?rev=1573231&r1=1573230&r2=1573231&view=diff
==============================================================================
---
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
(original)
+++
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
Sat Mar 1 21:46:12 2014
@@ -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/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")));
+ assertEquals("image/bmp", ContentTypeUtils.sniffContentType(new
File("src/test/resources/icons/icon_bmp")));
+ assertEquals("image/gif", ContentTypeUtils.sniffContentType(new
File("src/test/resources/icons/icon_gif")));
+ assertEquals("image/jpeg",
ContentTypeUtils.sniffContentType(new
File("src/test/resources/icons/icon_jpg")));
+ assertEquals("image/png", ContentTypeUtils.sniffContentType(new
File("src/test/resources/icons/icon_png")));
+ assertEquals("image/vnd.microsoft.icon",
ContentTypeUtils.sniffContentType(new
File("src/test/resources/icons/icon_ico")));
+ assertEquals(null, ContentTypeUtils.sniffContentType(new
File("src/test/resources/icons/icon_exr")));
- 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")));
+ assertFalse(ContentTypeUtils.isSupportedImageType(new
File("src/test/resources/icons/icon_bmp")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("src/test/resources/icons/icon_ico")));
+ assertFalse(ContentTypeUtils.isSupportedImageType(new
File("src/test/resources/icons/icon_exr")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("src/test/resources/icons/icon_gif")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("src/test/resources/icons/icon_jpg")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("src/test/resources/icons/icon_png")));
}
}
Modified:
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java?rev=1573231&r1=1573230&r2=1573231&view=diff
==============================================================================
---
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
(original)
+++
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
Sat Mar 1 21:46:12 2014
@@ -28,10 +28,10 @@ import org.junit.Test;
public class W3CWidgetFactoryTest {
- final static File wgt = new
File("parser/java/src/test/resources/test.wgt");
+ final static File wgt = new File("src/test/resources/test.wgt");
final static String widgetGuid =
"http://www.getwookie.org/widgets/test";;
- final static File testfolder = new File("parser/java/test");
- final static File testfolderreadonly = new File("parser/java/testr");
+ final static File testfolder = new File("test");
+ final static File testfolderreadonly = new File("testr");
@BeforeClass
public static void setup(){
@@ -151,7 +151,7 @@ public class W3CWidgetFactoryTest {
fac.setOutputDirectory(testfolder.getPath());
fac.parse(wgt);
File file = fac.getUnzippedWidgetDirectory();
- assertEquals("parser/java/test/www.getwookie.org/widgets/test",
file.getPath());
+ assertEquals("test/www.getwookie.org/widgets/test", file.getPath());
assertTrue(file.isDirectory());
}
}
Modified:
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java?rev=1573231&r1=1573230&r2=1573231&view=diff
==============================================================================
---
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java
(original)
+++
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetOutputterTest.java
Sat Mar 1 21:46:12 2014
@@ -37,7 +37,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("src/test/resources/bubbles.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -47,7 +47,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("src/test/resources/natter.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -58,7 +58,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("src/test/resources/weather.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -68,7 +68,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("src/test/resources/localetest.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -78,7 +78,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("src/test/resources/localetest.wgt");
W3CWidget widget = load(testWidget);
widget.getIcons().add(new IconEntity("icon.png",100,100));
widget.getNames().get(0).setShort("shortName");
@@ -94,7 +94,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("src/test/resources/geo.wgt");
W3CWidget widget = load(testWidget);
WidgetOutputter outputter = new WidgetOutputter();
outputter.setWidgetFolder("/widgets");
@@ -108,7 +108,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("src/test/resources/bubbles.wgt");
W3CWidget widget = load(testWidget);
IName name = widget.getNames().get(0);
name.setName("Modified Widget");
Modified:
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java?rev=1573231&r1=1573230&r2=1573231&view=diff
==============================================================================
---
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java
(original)
+++
wookie/trunk/wookie-parser/java/src/test/java/org/apache/wookie/w3c/test/WidgetPackageUtilsTest.java
Sat Mar 1 21:46:12 2014
@@ -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("src/test/resources/localetest.wgt");
assert widget.exists();
ZipFile zipFile = new ZipFile(widget);
String[] localesFromZip =
WidgetPackageUtils.getLocalesFromZipFile(zipFile);
