svn commit: r1176820 - /incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java

[scottbw]

Author: scottbw
Date: Wed Sep 28 11:01:37 2011
New Revision: 1176820

URL: http://svn.apache.org/viewvc?rev=1176820&view=rev
Log:
Updated a test that had been fixed on W3C test suite (also dealt with some type 
param warnings etc)

Modified:
    
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java

Modified: 
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java?rev=1176820&r1=1176819&r2=1176820&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
 Wed Sep 28 11:01:37 2011
@@ -56,6 +56,7 @@ public class PackagingAndConfiguration e
   // Default Locale tests
   @Test
   public void de000(){
+    @SuppressWarnings("unused")
     W3CWidget widget = 
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-defaultlocale-ignore/000/ta-de-000.wgt";);
   }
   
@@ -72,6 +73,7 @@ public class PackagingAndConfiguration e
   
   @Test
   public void de003(){
+    @SuppressWarnings("unused")
     W3CWidget widget = 
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-defaultlocale-ignore/003/ta-de-003.wgt";);
   }
   
@@ -1193,7 +1195,7 @@ public class PackagingAndConfiguration e
        @Test
        public void bl(){
                W3CWidget widget = 
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/002/bl.wgt";);
-               List icons = widget.getIconsList();
+               List<IIconEntity> icons = widget.getIconsList();
                assertTrue(icons.size() == 2);
                String icon1 = getLocalIconPath(widget,0);
                String icon2 = getLocalIconPath(widget,1); 
@@ -1203,7 +1205,7 @@ public class PackagingAndConfiguration e
        @Test
        public void bm(){
                W3CWidget widget = 
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/003/bm.wgt";);
-               List icons = widget.getIconsList();
+               List<IIconEntity> icons = widget.getIconsList();
                assertEquals(2,icons.size());
                String icon1 = getLocalIconPath(widget,0);
                String icon2 = getLocalIconPath(widget,1); 
@@ -1214,7 +1216,7 @@ public class PackagingAndConfiguration e
        @Test
        public void bn(){
                W3CWidget widget = 
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/004/bn.wgt";);
-               List icons = widget.getIconsList();
+               List<IIconEntity> icons = widget.getIconsList();
                assertTrue(icons.size() == 2);
                String icon1 = getLocalIconPath(widget,0);
                String icon2 = getLocalIconPath(widget,1);
@@ -1224,7 +1226,7 @@ public class PackagingAndConfiguration e
        @Test
        public void bo(){
                W3CWidget widget = 
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/005/bo.wgt";);
-               List icons = widget.getIconsList();
+               List<IIconEntity> icons = widget.getIconsList();
                assertTrue(icons.size() == 2);
                String icon1 = getLocalIconPath(widget,0);
                String icon2 = getLocalIconPath(widget,1);
@@ -1233,13 +1235,13 @@ public class PackagingAndConfiguration e
        
        @Test
        public void bp(){
-               // Note the original test case is in error here
                W3CWidget widget = 
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/006/bp.wgt";);
-               List icons = widget.getIconsList();
-               assertTrue(icons.size() == 2);
-               assertEquals("icon.png",getLocalIconPath(widget,0));
-               assertEquals("locales/en/icon.jpg",getLocalIconPath(widget,1));
+               List<IIconEntity> iconList = widget.getIconsList();
+               assertTrue(iconList.size() == 2);
+               String icons = getLocalIconPath(widget,0) + " " + 
getLocalIconPath(widget,1);
+               assertTrue(icons.equals("icon.png 
locales/en/icon.png")||icons.equals("locales/en/icon.png icon.png"));
        }
+       
        @Test
        public void ad(){
                W3CWidget widget = 
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/007/ad.wgt";);