/hg/icedtea-web: Add unit tests for the parser
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Thu Mar 31 08:04:57 PDT 2011
changeset 72b614b0eed0 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=72b614b0eed0
author: Omair Majid <omajid at redhat.com>
date: Thu Mar 31 11:04:37 2011 -0400
Add unit tests for the parser
This changeset adds support for JUnit4 tests to icedtea-web. It also
adds some parser tests that check that the parser works. make check
will now run these tests if JUnit is available.
2011-03-31 Omair Majid <omajid at redhat.com>
Add unit tests for the parser
* Makefile.am: Add TESTS_DIR,TESTS_SRCDIR, NETX_UNIT_TEST_DIR, and
NETX_UNIT_TEST_SRCDIR, JUNIT_RUNNER_DIR, JUNIT_RUNNER_SRCDIR, and
JUNIT_RUNNER_JAR. Conditionally define RHINO_TESTS and UNIT_TESTS.
(clean-local): Use RHINO_TESTS and UNIT_TESTS. (clean-tests):
Depend on clean-netx-tests. Delete directory. (junit-runner-
source-files.txt, $(JUNIT_RUNNER_JAR)), (next-unit-tests-
sources-files.txt stamps/netx-unit-tests-compile.stamp), (run-
netx-unit-tests, clean-netx-tests, clean-junit-runner) (clean-
netx-unit-tests): New targets.
* configure.ac: Add new optional dependency on junit.
* tests/junit-runner/CommandLine.java,
* tests/junit-runner/LessVerboseTextListener.java,
* tests/junit-runner/README,
* tests/netx/unit/net/sourceforge/jnlp/ParserBasicTests.java,
* tests/netx/unit/net/sourceforge/jnlp/ParserCornerCaseTests.java,
* tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXmlTests.java,
* tests/netx/unit/net/sourceforge/jnlp/basic.jnlp: New files.
diffstat:
ChangeLog | 21 +
Makefile.am | 87 +++-
configure.ac | 2 +
tests/junit-runner/CommandLine.java | 51 +
tests/junit-runner/LessVerboseTextListener.java | 51 +
tests/junit-runner/README | 3 +
tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java | 282 +++++++++++
tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java | 91 +++
tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java | 94 +++
tests/netx/unit/net/sourceforge/jnlp/basic.jnlp | 47 +
10 files changed, 726 insertions(+), 3 deletions(-)
diffs (truncated from 816 to 500 lines):
diff -r b68e805d7d67 -r 72b614b0eed0 ChangeLog
--- a/ChangeLog Wed Mar 30 17:53:38 2011 -0400
+++ b/ChangeLog Thu Mar 31 11:04:37 2011 -0400
@@ -1,3 +1,24 @@
+2011-03-31 Omair Majid <omajid at redhat.com>
+
+ Add unit tests for the parser
+ * Makefile.am: Add TESTS_DIR,TESTS_SRCDIR, NETX_UNIT_TEST_DIR,
+ and NETX_UNIT_TEST_SRCDIR, JUNIT_RUNNER_DIR, JUNIT_RUNNER_SRCDIR, and
+ JUNIT_RUNNER_JAR. Conditionally define RHINO_TESTS and UNIT_TESTS.
+ (clean-local): Use RHINO_TESTS and UNIT_TESTS.
+ (clean-tests): Depend on clean-netx-tests. Delete directory.
+ (junit-runner-source-files.txt, $(JUNIT_RUNNER_JAR)),
+ (next-unit-tests-sources-files.txt stamps/netx-unit-tests-compile.stamp),
+ (run-netx-unit-tests, clean-netx-tests, clean-junit-runner)
+ (clean-netx-unit-tests): New targets.
+ * configure.ac: Add new optional dependency on junit.
+ * tests/junit-runner/CommandLine.java,
+ * tests/junit-runner/LessVerboseTextListener.java,
+ * tests/junit-runner/README,
+ * tests/netx/unit/net/sourceforge/jnlp/ParserBasicTests.java,
+ * tests/netx/unit/net/sourceforge/jnlp/ParserCornerCaseTests.java,
+ * tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXmlTests.java,
+ * tests/netx/unit/net/sourceforge/jnlp/basic.jnlp: New files.
+
2011-03-30 Omair Majid <omajid at redhat.com>
* Makefile.am: Fix comment explaining reasons for setting
diff -r b68e805d7d67 -r 72b614b0eed0 Makefile.am
--- a/Makefile.am Wed Mar 30 17:53:38 2011 -0400
+++ b/Makefile.am Thu Mar 31 11:04:37 2011 -0400
@@ -6,6 +6,17 @@
NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
+TESTS_SRCDIR=$(abs_top_srcdir)/tests
+TESTS_DIR=$(abs_top_builddir)/tests.build
+
+NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
+NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit
+
+JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner
+JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner
+
+JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
+
# Build directories
BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
@@ -80,6 +91,19 @@
endif
endif
+if WITH_RHINO
+ RHINO_TESTS=check-pac-functions
+else
+ RHINO_TESTS=
+endif
+
+if WITH_JUNIT
+ JUNIT_TESTS=run-netx-unit-tests
+else
+ JUNIT_TESTS=
+endif
+
+
PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
@@ -99,7 +123,7 @@
all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/javaws \
javaws.desktop stamps/docs.stamp launcher.build/itweb-settings itweb-settings.desktop
-check-local: check-pac-functions
+check-local: $(RHINO_TESTS) $(JUNIT_TESTS)
clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \
clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-tests
@@ -109,7 +133,8 @@
.PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs \
- clean-tests check-local clean-launchers
+ clean-tests check-local clean-launchers check-pac-functions run-netx-unit-tests clean-netx-tests \
+ clean-junit-runner clean-netx-unit-tests
install-exec-local:
${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir)
@@ -397,11 +422,67 @@
# check
# ==========================
+clean-tests: clean-netx-tests
+ if [ -e $(TESTS_DIR) ]; then \
+ rmdir $(TESTS_DIR) ; \
+ fi
+
check-pac-functions: stamps/bootstrap-directory.stamp
./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
$$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js)
-clean-tests:
+junit-runner-source-files.txt:
+ find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@
+
+$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt
+ mkdir -p $(JUNIT_RUNNER_DIR) && \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ -d $(JUNIT_RUNNER_DIR) \
+ -classpath $(JUNIT_JAR) \
+ @junit-runner-source-files.txt && \
+ $(BOOT_DIR)/bin/jar cf $@ -C $(JUNIT_RUNNER_DIR) .
+
+netx-unit-tests-source-files.txt:
+ find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort > $@
+
+stamps/netx-unit-tests-compile.stamp: stamps/netx.stamp \
+ netx-unit-tests-source-files.txt
+ mkdir -p $(NETX_UNIT_TEST_DIR) && \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ -d $(NETX_UNIT_TEST_DIR) \
+ -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar \
+ @netx-unit-tests-source-files.txt && \
+ mkdir -p stamps && \
+ touch $@
+
+run-netx-unit-tests: stamps/netx-unit-tests-compile.stamp \
+ $(JUNIT_RUNNER_JAR)
+ cp {$(NETX_UNIT_TEST_SRCDIR),$(NETX_UNIT_TEST_DIR)}/net/sourceforge/jnlp/basic.jnlp
+ cd $(NETX_UNIT_TEST_DIR) ; \
+ class_names= ; \
+ for test in `find -type f` ; do \
+ class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
+ class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
+ class_names="$$class_names $$class_name" ; \
+ done ; \
+ echo $$class_names ; \
+ CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \
+ $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
+
+clean-netx-tests: clean-netx-unit-tests clean-junit-runner
+ if [ -e $(TESTS_DIR)/netx ]; then \
+ rmdir $(TESTS_DIR)/netx ; \
+ fi
+
+clean-junit-runner:
+ rm -f junit-runner-source-files.txt
+ rm -rf $(JUNIT_RUNNER_DIR)
+ rm -f $(JUNIT_RUNNER_JAR)
+
+clean-netx-unit-tests:
+ rm -f netx-unit-tests-source-files.txt
+ rm -rf $(NETX_UNIT_TEST_DIR)
+ rm -f stamps/netx-unit-tests-compile.stamp
# plugin tests
diff -r b68e805d7d67 -r 72b614b0eed0 configure.ac
--- a/configure.ac Wed Mar 30 17:53:38 2011 -0400
+++ b/configure.ac Thu Mar 31 11:04:37 2011 -0400
@@ -85,6 +85,8 @@
IT_FIND_OPTIONAL_JAR([rhino], RHINO,
[/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar])
+IT_FIND_OPTIONAL_JAR([junit], JUNIT,
+ [/usr/share/java/junit4.jar])
AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript])
AC_CONFIG_FILES([build.properties])
diff -r b68e805d7d67 -r 72b614b0eed0 tests/junit-runner/CommandLine.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/junit-runner/CommandLine.java Thu Mar 31 11:04:37 2011 -0400
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2011 Red Hat, Inc.
+ * Based on code from JUnit
+ *
+ * This file is made available under the terms of the Common Public License
+ * v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.internal.JUnitSystem;
+import org.junit.internal.RealSystem;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+public class CommandLine extends JUnitCore {
+
+ public static void main(String... args) {
+ runMainAndExit(new RealSystem(), args);
+ }
+
+ public static void runMainAndExit(JUnitSystem system, String... args) {
+ new CommandLine().runMain(system, args);
+ system.exit(0);
+ }
+
+ @Override
+ public Result runMain(JUnitSystem system, String... args) {
+ List<Class<?>> classes = new ArrayList<Class<?>>();
+ List<Failure> missingClasses = new ArrayList<Failure>();
+ for (String each : args) {
+ try {
+ classes.add(Class.forName(each));
+ } catch (ClassNotFoundException e) {
+ system.out().println("ERROR: Could not find class: " + each);
+ }
+ }
+ RunListener listener = new LessVerboseTextListener(system);
+ addListener(listener);
+ Result result = run(classes.toArray(new Class[0]));
+ for (Failure each : missingClasses) {
+ result.getFailures().add(each);
+ }
+ return result;
+ }
+
+}
diff -r b68e805d7d67 -r 72b614b0eed0 tests/junit-runner/LessVerboseTextListener.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/junit-runner/LessVerboseTextListener.java Thu Mar 31 11:04:37 2011 -0400
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2011 Red Hat, Inc.
+ *
+ * This file is made available under the terms of the Common Public License
+ * v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+import java.io.PrintStream;
+
+import org.junit.internal.JUnitSystem;
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+public class LessVerboseTextListener extends RunListener {
+
+ private PrintStream writer;
+ private boolean testFailed = false;
+
+ public LessVerboseTextListener(JUnitSystem system) {
+ writer= system.out();
+ }
+
+ @Override
+ public void testStarted(Description description) throws Exception {
+ testFailed = false;
+ }
+
+ @Override
+ public void testFailure(Failure failure) {
+ testFailed = true;
+ writer.println("FAILED: " + failure.getTestHeader() + " " + failure.getMessage());
+ }
+
+ @Override
+ public void testFinished(org.junit.runner.Description description) throws Exception {
+ if (!testFailed) {
+ writer.println("Passed: " + description.getClassName() + "." + description.getMethodName());
+ }
+ }
+
+ @Override
+ public void testRunFinished(Result result) throws Exception {
+ int passed = result.getRunCount() - result.getFailureCount() - result.getIgnoreCount();
+ int failed = result.getFailureCount();
+ int ignored = result.getIgnoreCount();
+ writer.println("Test results: passed: " + passed + "; failed: " + failed + "; ignored: " + ignored);
+ }
+
+}
diff -r b68e805d7d67 -r 72b614b0eed0 tests/junit-runner/README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/junit-runner/README Thu Mar 31 11:04:37 2011 -0400
@@ -0,0 +1,3 @@
+junit-runner is used to run tests instead of the standard runner
+org.junit.runner.JUnitCore. It provides output similar to that used by JTreg,
+which is useful for automated comparison.
diff -r b68e805d7d67 -r 72b614b0eed0 tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java Thu Mar 31 11:04:37 2011 -0400
@@ -0,0 +1,282 @@
+/* ParserBasic.java
+ Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Test that the parser works with basic jnlp files */
+public class ParserBasic {
+
+ private static Node root;
+ private static Parser parser;
+
+ @BeforeClass
+ public static void setUp() throws ParseException {
+ ClassLoader cl = ParserBasic.class.getClassLoader();
+ if (cl == null) {
+ cl = ClassLoader.getSystemClassLoader();
+ }
+ InputStream jnlpStream = cl.getResourceAsStream("net/sourceforge/jnlp/basic.jnlp");
+ root = Parser.getRootNode(jnlpStream);
+ parser = new Parser(null, null, root, false, false);
+ }
+
+ @Test
+ public void testJNLP() {
+ Assert.assertEquals("1.0", parser.getSpecVersion().toString());
+ Assert.assertEquals("http://localhost/", parser.getCodeBase().toString());
+ Assert.assertEquals("http://localhost/jnlp.jnlp", parser.getFileLocation().toString());
+ }
+
+ @Test
+ public void testInformation() throws ParseException {
+ List<InformationDesc> infos = parser.getInfo(root);
+ Assert.assertNotNull(infos);
+ Assert.assertEquals(1, infos.size());
+ InformationDesc info = infos.get(0);
+ Assert.assertNotNull(info);
+ }
+
+ @Test
+ public void testInformationTitle() throws ParseException {
+ InformationDesc info = parser.getInfo(root).get(0);
+ Assert.assertEquals("Large JNLP", info.getTitle());
+ }
+
+ @Test
+ public void testInformationVendor() throws ParseException {
+ InformationDesc info = parser.getInfo(root).get(0);
+ Assert.assertEquals("The IcedTea Project", info.getVendor());
+ }
+
+ @Test
+ public void testInformationHomePage() throws ParseException {
+ InformationDesc info = parser.getInfo(root).get(0);
+ Assert.assertEquals("http://homepage/", info.getHomepage().toString());
+ }
+
+ @Test
+ public void testInformationDescription() throws ParseException {
+ InformationDesc info = parser.getInfo(root).get(0);
+ Assert.assertEquals("one-line", info.getDescription("one-line"));
+ Assert.assertEquals("short", info.getDescription("short"));
+ Assert.assertEquals("tooltip", info.getDescription("tooltip"));
+ }
+
+ @Test
+ public void testInformationOfflineAllowed() throws ParseException {
+ InformationDesc info = parser.getInfo(root).get(0);
+ Assert.assertEquals(true, info.isOfflineAllowed());
+
+ }
+
+ @Test
+ public void testInformationIcon() throws ParseException {
+ InformationDesc info = parser.getInfo(root).get(0);
+
+ IconDesc[] icons = info.getIcons(IconDesc.DEFAULT);
+ Assert.assertNotNull(icons);
+ Assert.assertEquals(1, icons.length);
+ IconDesc icon = icons[0];
+ Assert.assertNotNull(icon);
+ Assert.assertEquals("http://localhost/icon.png", icon.getLocation().toString());
+ icons = info.getIcons(IconDesc.SPLASH);
+ Assert.assertNotNull(icons);
+ Assert.assertEquals(1, icons.length);
+ icon = icons[0];
+ Assert.assertNotNull(icon);
+ Assert.assertEquals("http://localhost/splash.png", icon.getLocation().toString());
+
+ }
+
+ @Test
+ public void testInformationShortcut() throws ParseException {
+ InformationDesc info = parser.getInfo(root).get(0);
+
+ ShortcutDesc shortcut = info.getShortcut();
+ Assert.assertNotNull(shortcut);
+ Assert.assertTrue(shortcut.isOnline());
+ Assert.assertTrue(shortcut.onDesktop());
+ MenuDesc menu = shortcut.getMenu();
+ Assert.assertNotNull(menu);
+ Assert.assertEquals("submenu", menu.getSubMenu());
+ }
+
+ @Test
+ public void testInformationAssociation() throws ParseException {
+ InformationDesc info = parser.getInfo(root).get(0);
+ AssociationDesc[] associations = info.getAssociations();
+ Assert.assertNotNull(associations);
+ Assert.assertEquals(1, associations.length);
+ AssociationDesc association = associations[0];
+ Assert.assertNotNull(association);
+ String[] extensions = association.getExtensions();
+ Assert.assertNotNull(extensions);
+ Assert.assertEquals(1, extensions.length);
+ String extension = extensions[0];
+ Assert.assertNotNull(extension);
+ Assert.assertEquals("*.foo", extension);
+ String mimeType = association.getMimeType();
+ Assert.assertNotNull(mimeType);
+ Assert.assertEquals("foo/bar", mimeType);
+ }
+
+ @Test
+ public void testInformationRelatedContent() throws ParseException {
+ InformationDesc info = parser.getInfo(root).get(0);
+
+ RelatedContentDesc[] relatedContents = info.getRelatedContents();
+ Assert.assertNotNull(relatedContents);
+ Assert.assertEquals(1, relatedContents.length);
+ RelatedContentDesc relatedContent = relatedContents[0];
+ Assert.assertNotNull(relatedContent);
+ Assert.assertEquals("related-content title", relatedContent.getTitle());
+ Assert.assertNotNull(relatedContent.getLocation());
+ Assert.assertEquals("http://related-content/", relatedContent.getLocation().toString());
+ Assert.assertEquals("decription of related-content", relatedContent.getDescription());
+ IconDesc relatedIcon = relatedContent.getIcon();
+ Assert.assertNotNull(relatedIcon.getLocation());
+ Assert.assertEquals("http://localhost/related-content-icon.png", relatedIcon.getLocation().toString());
+
+ }
+
+ @Test
+ public void testSecurity() throws ParseException {
+ SecurityDesc security = parser.getSecurity(root);
+ Assert.assertNotNull(security);
+ Assert.assertEquals(SecurityDesc.ALL_PERMISSIONS, security.getSecurityType());
+ }
+
+ @Test
+ public void testResources() throws ParseException {
+ List<ResourcesDesc> allResources = parser.getResources(root, false);
+ Assert.assertNotNull(allResources);
+ Assert.assertEquals(1, allResources.size());
+ ResourcesDesc resources = allResources.get(0);
+ Assert.assertNotNull(resources);
+ }
+
+ @Test
+ public void testResourcesJava() throws ParseException {
+ ResourcesDesc resources = parser.getResources(root, false).get(0);
+ JREDesc[] jres = resources.getJREs();
+ Assert.assertNotNull(jres);
+ Assert.assertEquals(1, jres.length);
+ JREDesc jre = jres[0];
+ Assert.assertNotNull(jre);
+ Assert.assertEquals("1.3+", jre.getVersion().toString());
More information about the distro-pkg-dev
mailing list