Author: scottbw
Date: Wed Dec 1 13:37:39 2010
New Revision: 1041005
URL: http://svn.apache.org/viewvc?rev=1041005&view=rev
Log:
Updated the WARP and Viewmodes tests - again some deprecations and errors in
the tests, which I've marked @ignore and reported to W3C
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/Access.java
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ViewModesTest.java
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/Access.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/Access.java?rev=1041005&r1=1041004&r2=1041005&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/Access.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/Access.java
Wed Dec 1 13:37:39 2010
@@ -26,6 +26,7 @@ import org.apache.wookie.w3c.exceptions.
import org.apache.wookie.w3c.exceptions.InvalidContentTypeException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -77,7 +78,6 @@ public class Access {
}
}
-
@Test
public void da(){
W3CWidget widget =
processWidgetNoErrors(prefix+"ta-4/000/da.wgt");
@@ -111,6 +111,11 @@ public class Access {
W3CWidget widget =
processWidgetNoErrors(prefix+"ta-5/003/ed.wgt");
assertEquals(0, widget.getAccessList().size());
}
+ @Test
+ public void ee(){
+ W3CWidget widget =
processWidgetNoErrors(prefix+"ta-5/004/ee.wgt");
+ assertEquals(0, widget.getAccessList().size());
+ }
@Test
public void fa(){
@@ -144,6 +149,15 @@ public class Access {
}
@Test
+ public void gd(){
+ W3CWidget widget =
processWidgetNoErrors(prefix+"ta-7/003/gd.wgt");
+ assertEquals(2, widget.getAccessList().size());
+ assertEquals("*", widget.getAccessList().get(0).getOrigin());
+ assertEquals("http://w3.org:80";,
widget.getAccessList().get(1).getOrigin());
+ assertEquals(false,
widget.getAccessList().get(1).hasSubDomains());
+ }
+
+ @Test
public void ha(){
W3CWidget widget =
processWidgetNoErrors(prefix+"ta-8/000/ha.wgt");
assertEquals(0, widget.getAccessList().size());
@@ -184,6 +198,7 @@ public class Access {
}
@Test
+ @Ignore // test widget isn't valid
public void hg(){
W3CWidget widget =
processWidgetNoErrors(prefix+"ta-8/006/hg.wgt");
assertEquals(1, widget.getAccessList().size());
@@ -216,6 +231,19 @@ public class Access {
}
@Test
+ public void hl(){
+ W3CWidget widget =
processWidgetNoErrors(prefix+"ta-8/011/hl.wgt");
+ assertEquals(0, widget.getAccessList().size());
+ }
+
+ @Test
+ public void hm(){
+ W3CWidget widget =
processWidgetNoErrors(prefix+"ta-8/012/hm.wgt");
+ assertEquals(0, widget.getAccessList().size());
+ }
+
+
+ @Test
public void ia(){
W3CWidget widget =
processWidgetNoErrors(prefix+"ta-9/000/ia.wgt");
assertEquals(1, widget.getAccessList().size());
@@ -260,6 +288,7 @@ public class Access {
}
@Test
+ @Ignore // test widget isn't correct
public void la(){
W3CWidget widget =
processWidgetNoErrors(prefix+"ta-12/000/la.wgt");
assertEquals(1, widget.getAccessList().size());
@@ -268,6 +297,7 @@ public class Access {
}
@Test
+ @Ignore // test widget isn't correct
public void ma(){
W3CWidget widget =
processWidgetNoErrors(prefix+"ta-13/000/ma.wgt");
assertEquals(2, widget.getAccessList().size());
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ViewModesTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ViewModesTest.java?rev=1041005&r1=1041004&r2=1041005&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ViewModesTest.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ViewModesTest.java
Wed Dec 1 13:37:39 2010
@@ -17,6 +17,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
import org.apache.wookie.w3c.W3CWidget;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -25,6 +26,7 @@ import org.junit.Test;
public class ViewModesTest extends ConformanceTest{
@Test
+ @Ignore // deprecated
public void viewa(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-viewmodes/000/viewa.wgt";);
assertEquals("windowed",widget.getViewModes());
@@ -35,16 +37,19 @@ public class ViewModesTest extends Confo
assertTrue(widget.getViewModes().equals("floating"));
}
@Test
+ @Ignore // deprecated
public void viewc(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-viewmodes/002/viewc.wgt";);
assertTrue(widget.getViewModes().equals("fullscreen"));
}
@Test
+ @Ignore // deprecated
public void viewd(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-viewmodes/003/viewd.wgt";);
assertTrue(widget.getViewModes().equals("maximized"));
}
@Test
+ @Ignore // deprecated
public void viewe(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-viewmodes/004/viewe.wgt";);
assertTrue(widget.getViewModes().equals("minimized"));
@@ -60,6 +65,7 @@ public class ViewModesTest extends Confo
assertTrue(widget.getViewModes().equals("windowed floating
maximized"));
}
@Test
+ @Ignore // Test is wrong
public void viewh(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-viewmodes/007/viewh.wgt";);
assertEquals("windowed maximized",widget.getViewModes());
