Author: scottbw
Date: Fri Nov 11 17:03:29 2011
New Revision: 1200952
URL: http://svn.apache.org/viewvc?rev=1200952&view=rev
Log:
Added a few more parser tests to improve coverage
Added:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/UpdateUtilsTest.java
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java?rev=1200952&r1=1200951&r2=1200952&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java
Fri Nov 11 17:03:29 2011
@@ -15,6 +15,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -35,6 +36,10 @@ import org.apache.wookie.w3c.impl.NameEn
import org.apache.wookie.w3c.impl.ParamEntity;
import org.apache.wookie.w3c.impl.PreferenceEntity;
import org.apache.wookie.w3c.impl.WidgetManifestModel;
+import org.apache.wookie.w3c.util.FormattingUtils;
+import org.apache.wookie.w3c.util.LocalizationUtils;
+import org.apache.wookie.w3c.util.UnicodeUtils;
+import org.apache.wookie.w3c.util.WidgetPackageUtils;
import org.jdom.JDOMException;
import org.junit.Test;
@@ -158,5 +163,17 @@ public class EntityTest {
assertEquals(IW3CXMLConfiguration.UNKNOWN,widget.getLocalName("en"));
assertEquals("fullscreen",widget.getViewModes());
}
+
+ @Test
+ public void utils(){
+ UnicodeUtils utils = new UnicodeUtils();
+ LocalizationUtils lutils = new LocalizationUtils();
+ FormattingUtils futils = new FormattingUtils();
+ WidgetPackageUtils wputils = new WidgetPackageUtils();
+ assertNotNull(utils);
+ assertNotNull(futils);
+ assertNotNull(lutils);
+ assertNotNull(wputils);
+ }
}
Added:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/UpdateUtilsTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/UpdateUtilsTest.java?rev=1200952&view=auto
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/UpdateUtilsTest.java
(added)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/UpdateUtilsTest.java
Fri Nov 11 17:03:29 2011
@@ -0,0 +1,47 @@
+/*
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.wookie.w3c.test;
+
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+
+import org.apache.wookie.w3c.W3CWidget;
+import org.apache.wookie.w3c.W3CWidgetFactory;
+import org.apache.wookie.w3c.exceptions.BadManifestException;
+import org.apache.wookie.w3c.exceptions.BadWidgetZipFileException;
+import org.apache.wookie.w3c.exceptions.InvalidContentTypeException;
+import org.apache.wookie.w3c.updates.UpdateUtils;
+import org.junit.Test;
+
+/**
+ * Additional tests for UpdateUtils
+ */
+public class UpdateUtilsTest {
+
+
+ //
+ // Test that a request to get an update over HTTP fails when HTTPSOnly = true
+ //
+ @Test
+ public void testHttpsOnly() throws InvalidContentTypeException,
BadWidgetZipFileException, BadManifestException, IOException, Exception{
+ W3CWidget updatedWidget = UpdateUtils.getUpdate(new W3CWidgetFactory(),
"test", "http://people.opera.com/harig/wupdres/resources/out.php?udd-pass";,
"1.0", true);
+ assertNull(updatedWidget);
+ }
+}
+
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java?rev=1200952&r1=1200951&r2=1200952&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
Fri Nov 11 17:03:29 2011
@@ -13,13 +13,18 @@
*/
package org.apache.wookie.w3c.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.wookie.w3c.W3CWidget;
import org.apache.wookie.w3c.W3CWidgetFactory;
+import org.apache.wookie.w3c.exceptions.BadManifestException;
+import org.apache.wookie.w3c.exceptions.BadWidgetZipFileException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -131,7 +136,7 @@ public class W3CWidgetFactoryTest {
W3CWidgetFactory fac = new W3CWidgetFactory();
fac.setLocales(new String[]{"en"});
fac.setOutputDirectory(testfolder.getPath());
- fac.parse(wgt);
+ W3CWidget widget = fac.parse(wgt);
}
@Test
@@ -141,4 +146,17 @@ public class W3CWidgetFactoryTest {
fac.setOutputDirectory(testfolder.getPath());
fac.parse(wgt);
}
+
+ @Test
+ public void testGetUnzipped() throws Exception{
+ W3CWidgetFactory fac = new W3CWidgetFactory();
+ fac.setStartPageProcessor(null);
+ fac.setOutputDirectory(testfolder.getPath());
+ fac.parse(wgt);
+ File file = fac.getUnzippedWidgetDirectory();
+ assertEquals("parser/java/test/www.getwookie.org/widgets/test",
file.getPath());
+ assertTrue(file.isDirectory());
+ }
}
+
+
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java?rev=1200952&r1=1200951&r2=1200952&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/WidgetOutputterTest.java
Fri Nov 11 17:03:29 2011
@@ -26,6 +26,7 @@ import org.apache.wookie.w3c.W3CWidget;
import org.apache.wookie.w3c.W3CWidgetFactory;
import org.apache.wookie.w3c.exceptions.BadManifestException;
import org.apache.wookie.w3c.exceptions.BadWidgetZipFileException;
+import org.apache.wookie.w3c.impl.IconEntity;
import org.apache.wookie.w3c.util.WidgetOutputter;
import org.apache.wookie.w3c.util.WidgetPackageUtils;
import org.junit.Test;
@@ -76,6 +77,21 @@ public class WidgetOutputterTest extends
assertTrue(manifest.contains("id=\"http://www.getwookie.org/widgets/localetest\"";));
assertTrue(manifest.contains("xml:lang=\"fr\">tester les
paramètres régionaux</name>"));
}
+ @Test
+ public void outputString5() throws Exception{
+ File testWidget = new File("build/widgets/localetest.wgt");
+ W3CWidget widget = load(testWidget);
+ widget.getIconsList().add(new IconEntity("icon.png",100,100));
+ widget.getNames().get(0).setShort("shortName");
+ WidgetOutputter outputter = new WidgetOutputter();
+ outputter.setWidgetFolder("/widgets");
+ String manifest = outputter.outputXMLString(widget);
+ System.out.println(manifest);
+
assertTrue(manifest.contains("id=\"http://www.getwookie.org/widgets/localetest\"";));
+ assertTrue(manifest.contains("xml:lang=\"fr\">tester les paramètres
régionaux</name>"));
+ assertTrue(manifest.contains("<icon src=\"icon.png\" height=\"100\"
width=\"100\" />"));
+ assertTrue(manifest.contains("name short=\"shortName\""));
+ }
@Test
public void outputStream() throws Exception{
