You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2013/03/08 12:30:53 UTC

svn commit: r1454325 - in /wookie/trunk/parser/java/src-test: org/apache/wookie/w3c/test/WidgetOutputterTest.java resources/ resources/bubbles.wgt resources/geo.wgt resources/localetest.wgt resources/natter.wgt resources/weather.wgt

Author: scottbw
Date: Fri Mar  8 11:30:52 2013
New Revision: 1454325

URL: http://svn.apache.org/r1454325
Log:
Added widgets used in unit testing to parser package, so they can be run independently, and fixed paths

Added:
    wookie/trunk/parser/java/src-test/resources/
    wookie/trunk/parser/java/src-test/resources/bubbles.wgt   (with props)
    wookie/trunk/parser/java/src-test/resources/geo.wgt   (with props)
    wookie/trunk/parser/java/src-test/resources/localetest.wgt   (with props)
    wookie/trunk/parser/java/src-test/resources/natter.wgt   (with props)
    wookie/trunk/parser/java/src-test/resources/weather.wgt   (with props)
Modified:
    wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java

Modified: wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java
URL: http://svn.apache.org/viewvc/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java?rev=1454325&r1=1454324&r2=1454325&view=diff
==============================================================================
--- wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java (original)
+++ wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java Fri Mar  8 11:30:52 2013
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertTru
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.net.URL;
 
+import org.apache.wookie.tests.helpers.WidgetUploader;
 import org.apache.wookie.w3c.IName;
 import org.apache.wookie.w3c.W3CWidgetFactory;
 import org.apache.wookie.w3c.exceptions.BadManifestException;
@@ -38,7 +38,7 @@ public class WidgetOutputterTest extends
 	
 	@Test
 	public void outputString() throws Exception{
-		File testWidget = new File("build/widgets/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("build/widgets/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("build/widgets/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("build/widgets/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("build/widgets/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("build/widgets/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("build/widgets/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");
@@ -132,7 +132,8 @@ public class WidgetOutputterTest extends
 		if (output.exists()) output.delete();
 		output.mkdir();
 		fac.setOutputDirectory(output.getAbsolutePath());
-		W3CWidget widget = fac.parse(new URL("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-RRZxvvTFHx/001/b6.wgt"));
+		File widgetFile = WidgetUploader.downloadWidget("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-RRZxvvTFHx/001/b6.wgt");
+		W3CWidget widget = fac.parse(widgetFile);
 		
 		IName name = widget.getNames().get(0);
 		name.setName("Re-Modified Widget");

Added: wookie/trunk/parser/java/src-test/resources/bubbles.wgt
URL: http://svn.apache.org/viewvc/wookie/trunk/parser/java/src-test/resources/bubbles.wgt?rev=1454325&view=auto
==============================================================================
Binary file - no diff available.

Propchange: wookie/trunk/parser/java/src-test/resources/bubbles.wgt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: wookie/trunk/parser/java/src-test/resources/geo.wgt
URL: http://svn.apache.org/viewvc/wookie/trunk/parser/java/src-test/resources/geo.wgt?rev=1454325&view=auto
==============================================================================
Binary file - no diff available.

Propchange: wookie/trunk/parser/java/src-test/resources/geo.wgt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: wookie/trunk/parser/java/src-test/resources/localetest.wgt
URL: http://svn.apache.org/viewvc/wookie/trunk/parser/java/src-test/resources/localetest.wgt?rev=1454325&view=auto
==============================================================================
Binary file - no diff available.

Propchange: wookie/trunk/parser/java/src-test/resources/localetest.wgt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: wookie/trunk/parser/java/src-test/resources/natter.wgt
URL: http://svn.apache.org/viewvc/wookie/trunk/parser/java/src-test/resources/natter.wgt?rev=1454325&view=auto
==============================================================================
Binary file - no diff available.

Propchange: wookie/trunk/parser/java/src-test/resources/natter.wgt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: wookie/trunk/parser/java/src-test/resources/weather.wgt
URL: http://svn.apache.org/viewvc/wookie/trunk/parser/java/src-test/resources/weather.wgt?rev=1454325&view=auto
==============================================================================
Binary file - no diff available.

Propchange: wookie/trunk/parser/java/src-test/resources/weather.wgt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream