[icedtea-web] RFC: add unit tests for the jnlp parser
Dr Andrew John Hughes
ahughes at redhat.com
Wed Mar 30 17:21:16 PDT 2011
On 20:08 Wed 30 Mar , Omair Majid wrote:
snip...
> >> >
> > There does need to be something in there such as:
> >
> > // Based on code from X (C) Y
> >
>
> Sure, except I dont know the copyright owners. So I have left it as:
> // Based on code from JUnit
>
They don't have license headers?
> > You're also lacking license headers.
>
> That was a quick example I had put together. I have fixed it in the
> actual patch
>
> > snip...
> >
> >> >
> >>>>> > >> > I would like to see less things in-tree (/me is looking at NanoXML), not
> >>>>> > >> > more.
> >>>>> > >> >
> >>> > > How is the NanoXML issue progressing? It would be good to have a status update
> >>> > > on things and the progress towards the various releases of IcedTea-Web now 1.0
> >>> > > is done.
> >>> > >
> >> >
> >> > Sorry, I must have forgotten to make a note of this. Generally I try and
> >> > keephttp://icedtea.classpath.org/wiki/IcedTea-Web#Release_Plans
> >> > updated.
> > I don't check the wiki regularly anyway. I'd expect stuff to be discussed on the
> > mailing list then documented on the wiki.
> >
> >> > Anyway, it's mostly done. I wrote these parser unit tests to
> >> > test that my NanoXML changes did not break anything. I will clean up
> >> > that patch and post it after these unit tests are committed (so we can
> >> > see any regressions). Assuming Deepak is fine with it, it can go in
> >> > before 1.1 is released.
> >> >
> > Yeah I think we (mainly Deepak as maintainer) need to define clearly where we draw
> > a line under 1.1.
> >
> > snip..
> >> >
> >> > I should have elaborated more. JUnit/TestNG (and possibly others) are
> >> > just fine for developers. The problem here is that we want to generate
> >> > buildbot-readable test results. We can do that by writing a custom
> >> > junit-output formatter (like in the attached patch), by transforming
> >> > testng's xml output or by transforming junit's xml output. Unfortunately
> >> > the only way of getting junit to create xml output is through ant. Junit
> >> > itself has no option (at least nothing that I could see) that generates
> >> > output in xml format. If it is okay to use the custom junit output
> >> > formatter, than we dont need ant. Actually, if we dont care about the
> >> > buildbot, then we dont need the custom output formatter or any xml
> >> > processing at all.
> >> >
> > Ok, so whoever wrote the JUnit XML outputter introduced some odd Ant dependency
> > that's unnecessary. Got you.
> >
>
> Actually, not quite. JUnit has no xml outputter. Only ant (thought it's
> junit task) does.
>
Oh right, now that makes sense.
> >>> > > Ant massively overcomplicates things, but I have no idea of the availability
> >>> > > of the various dependencies for testng or their licenses.
> >>> > >
> >>> > > Can you provide some of this info?
> >>> > >
> >> >
> >> > Sure. TestNG is licensed under Apache 2.0. Its dependencies are QDox
> >> > (Apache 2.0) and Bean Shell (Sun Public License or LGPL).
> >> >
> >> > TestNG (and its dependencies) are available in a number of Linux
> >> > distributions, including Debian (squeeze, wheezy and sid), Fedora (>=
> >> > 13), Gentoo (java-experimental overlay), Mageia, Mandriva (, openSUSE
> >> > (>= 11.2), and Ubuntu (>= 9.10). It's not available in Arch Linux, and
> >> > Slackware (and possibly other distributions).
> >> >
> > It's in Gentoo's java-overlay tree (the same place I develop IcedTea ebuilds
> > and have commit access to),
>
> Ah, sorry. I dont have Gentoo. I did a quick search and saw that package
> in the java-experimental overlay.
>
> > and this is the hideous dependency tree it has:
>
> > [ebuild N ] dev-java/commons-logging-1.1.1 USE="-avalon-framework -avalon-logkit -doc -log4j -servletapi -source -test" 187 kB [0]
> > [ebuild N ] dev-java/ant-apache-log4j-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/ant-swing-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/ant-apache-bcel-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/ant-apache-resolver-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/ant-apache-oro-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/jdepend-2.9-r4 USE="-doc -source" 296 kB [0]
> > [ebuild N ] dev-java/jzlib-1.0.7-r1 USE="-doc -source" 50 kB [0]
> > [ebuild N ] dev-java/commons-net-1.4.1-r1 USE="-doc -examples -source" 224 kB [0]
> > [ebuild N ] dev-java/jakarta-regexp-1.4-r1 USE="-doc -source" 135 kB [0]
> > [ebuild N ] dev-java/sun-jaf-1.1.1 USE="-doc -source" 123 kB [0]
> > [ebuild N ] java-virtuals/jaf-1.1-r1 0 kB [0]
> > [ebuild N ] dev-java/ant-commons-logging-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/ant-apache-regexp-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/ant-commons-net-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/ant-jdepend-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/jsch-0.1.44 USE="zlib -doc -examples -source" 278 kB [0]
> > [ebuild N ] dev-java/bsf-2.4.0-r1 USE="javascript python -doc -examples -source -tcl" 293 kB [0]
> > [ebuild N ] dev-java/sun-javamail-1.4.3 USE="-doc -source" 1,148 kB [0]
> > [ebuild N ] dev-java/ant-apache-bsf-1.8.1 USE="javascript python -tcl" 0 kB [0]
> > [ebuild N ] dev-java/ant-jsch-1.8.1 0 kB [0]
> > [ebuild N ] java-virtuals/javamail-1.0-r1 0 kB [0]
> > [ebuild N ] dev-java/ant-javamail-1.8.1 0 kB [0]
> > [ebuild N ] dev-java/ant-1.8.1 USE="X antlr bcel bsf commonslogging commonsnet javamail jdepend jsch log4j oro regexp resolver -jai -jmf -testutil" 0 kB [0]
> > [ebuild N ] dev-java/testng-5.2 USE="-doc -source" 2,605 kB [1]
> >
> > I think most of that is due to a bad dependency on the whole of Ant though. Not sure how much
> > of Ant it actually needs.
> >
>
> I think it's a build-time dependency, not a run-time dependency. But you
> are correct - the tree is quite big.
>
Same difference on Gentoo. Everything is built from source.
snip...
> >
> > I await the new patch.
> >
>
> Updated patch attached. Any thoughts or comments?
>
Looks fine. If it passes make distcheck, it can go in.
It does need documenting in README, but I'm happy for that to be a separate patch.
> Cheers,
> Omair
> diff -r b68e805d7d67 Makefile.am
> --- a/Makefile.am Wed Mar 30 17:53:38 2011 -0400
> +++ b/Makefile.am Wed Mar 30 20:02:23 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 configure.ac
> --- a/configure.ac Wed Mar 30 17:53:38 2011 -0400
> +++ b/configure.ac Wed Mar 30 20:02:23 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 tests/junit-runner/CommandLine.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/tests/junit-runner/CommandLine.java Wed Mar 30 20:02:23 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 tests/junit-runner/LessVerboseTextListener.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/tests/junit-runner/LessVerboseTextListener.java Wed Mar 30 20:02:23 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 tests/junit-runner/README
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/tests/junit-runner/README Wed Mar 30 20:02:23 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 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 Wed Mar 30 20:02:23 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());
> + Assert.assertEquals("http://java-url/", jre.getLocation().toString());
> + Assert.assertEquals("64m", jre.getInitialHeapSize());
> + Assert.assertEquals("128m", jre.getMaximumHeapSize());
> + }
> +
> + @Test
> + public void testResourcesJar() throws ParseException {
> + ResourcesDesc resources = parser.getResources(root, false).get(0);
> +
> + boolean foundNative = false;
> + boolean foundEager = false;
> + boolean foundLazy = false;
> +
> + JARDesc[] jars = resources.getJARs();
> + Assert.assertEquals(3, jars.length);
> + for (int i = 0; i < jars.length; i++) {
> + if (jars[i].isNative()) {
> + foundNative = true;
> + Assert.assertEquals("http://localhost/native.jar", jars[i].getLocation().toString());
> + } else if (jars[i].isEager()) {
> + foundEager = true;
> + Assert.assertEquals("http://localhost/eager.jar", jars[i].getLocation().toString());
> + } else if (jars[i].isLazy()) {
> + foundLazy = true;
> + Assert.assertEquals("http://localhost/lazy.jar", jars[i].getLocation().toString());
> + } else {
> + Assert.assertFalse(true);
> + }
> + }
> +
> + Assert.assertTrue(foundNative);
> + Assert.assertTrue(foundLazy);
> + Assert.assertTrue(foundEager);
> + }
> +
> + @Test
> + public void testResourcesExtensions() throws ParseException {
> + ResourcesDesc resources = parser.getResources(root, false).get(0);
> +
> + ExtensionDesc[] extensions = resources.getExtensions();
> + Assert.assertNotNull(extensions);
> + Assert.assertEquals(1, extensions.length);
> + ExtensionDesc extension = extensions[0];
> + Assert.assertNotNull(extension);
> + Assert.assertEquals("http://extension/", extension.getLocation().toString());
> + Assert.assertEquals("extension", extension.getName());
> + Assert.assertEquals("0.1.1", extension.getVersion().toString());
> + }
> +
> + @Test
> + public void testResourcesProperty() throws ParseException {
> + ResourcesDesc resources = parser.getResources(root, false).get(0);
> +
> + PropertyDesc[] properties = resources.getProperties();
> + Assert.assertNotNull(properties);
> + Assert.assertEquals(1, properties.length);
> +
> + PropertyDesc property = properties[0];
> + Assert.assertNotNull(property);
> + Assert.assertEquals("key", property.getKey());
> + Assert.assertEquals("value", property.getValue());
> + }
> +
> + @Test
> + public void testApplication() throws ParseException {
> + ApplicationDesc app = (ApplicationDesc) parser.getLauncher(root);
> + Assert.assertNotNull(app);
> + Assert.assertEquals("MainClass", app.getMainClass());
> + Assert.assertArrayEquals(new String[] { "arg1", "arg2" }, app.getArguments());
> + }
> +
> +}
> diff -r b68e805d7d67 tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java Wed Mar 30 20:02:23 2011 -0400
> @@ -0,0 +1,91 @@
> +/* ParserCornerCases.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 org.junit.After;
> +import org.junit.Assert;
> +import org.junit.Before;
> +import org.junit.Test;
> +
> +/** Test various corner cases of the parser */
> +public class ParserCornerCases {
> + @Test
> + public void testUnsupportedSpecNumber() throws ParseException {
> + String malformedJnlp = "<?xml?><jnlp spec='11.11'></jnlp>";
> + Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
> + Parser parser = new Parser(null, null, root, false, false);
> + Assert.assertEquals("11.11", parser.getSpecVersion().toString());
> + }
> +
> + @Test
> + public void testApplicationAndComponent() throws ParseException {
> + String malformedJnlp = "<?xml?><jnlp><application-desc/><component-desc/></jnlp>";
> + Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
> + Parser parser = new Parser(null, null, root, false, false);
> + Assert.assertNotNull(parser.getLauncher(root));
> + }
> +
> + @Test
> + public void testCommentInElements() throws ParseException {
> + String malformedJnlp = "<?xml?><jnlp spec='1.0' <!-- comment -->> </jnlp>";
> + Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
> + Parser p = new Parser(null, null, root, false, false);
> + Assert.assertEquals("1.0", p.getSpecVersion().toString());
> + }
> +
> + @Test
> + public void testCommentInAttributes() throws ParseException {
> + String malformedJnlp = "<?xml?><jnlp spec='<!-- something -->'></jnlp>";
> + Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
> + Parser p = new Parser(null, null, root, false, false);
> + Assert.assertEquals("<!-- something -->", p.getSpecVersion().toString());
> + }
> +
> + @Test
> + public void testNestedComments() throws ParseException {
> + String malformedJnlp = "<?xml?>" +
> + "<jnlp><information><description>" +
> + "<!-- outer <!-- inner --> -->" +
> + "</description></information></jnlp>";
> + Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
> + Parser p = new Parser(null, null, root, false, false);
> + Assert.assertEquals(" -->", p.getInfo(root).get(0).getDescription());
> + }
> +}
> diff -r b68e805d7d67 tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java Wed Mar 30 20:02:23 2011 -0400
> @@ -0,0 +1,94 @@
> +/* ParserMalformedXml.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.BufferedReader;
> +import java.io.ByteArrayInputStream;
> +import java.io.InputStream;
> +import java.io.InputStreamReader;
> +import java.io.IOException;
> +
> +import org.junit.BeforeClass;
> +import org.junit.Test;
> +
> +/** Test how well the parser deals with malformed xml */
> +public class ParserMalformedXml {
> +
> + private static String originalJnlp = null;
> +
> + @BeforeClass
> + public static void setUp() throws IOException {
> + ClassLoader cl = ParserMalformedXml.class.getClassLoader();
> + if (cl == null) {
> + cl = ClassLoader.getSystemClassLoader();
> + }
> + InputStream is = cl.getResourceAsStream("net/sourceforge/jnlp/basic.jnlp");
> + BufferedReader reader = new BufferedReader(new InputStreamReader(is));
> + StringBuilder jnlpBuilder = new StringBuilder();
> + String line;
> + while ( (line = reader.readLine()) != null) {
> + jnlpBuilder.append(line).append("\n");
> + }
> + originalJnlp = jnlpBuilder.toString();
> + }
> +
> + @Test
> + public void testMissingXmlDecleration() throws ParseException {
> + String malformedJnlp = originalJnlp.replaceFirst("<\\?xml.*\\?>", "");
> + Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
> + }
> +
> + @Test
> + public void testMalformedArguments() throws ParseException {
> + String malformedJnlp = originalJnlp.replace("arg2</argument", "arg2<argument");
> + Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
> + }
> +
> + @Test
> + public void testTagNotClosed() throws ParseException {
> + String malformedJnlp = originalJnlp.replace("</jnlp>", "<jnlp>");
> + Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
> + }
> +
> + @Test
> + public void testUnquotedAttributes() throws ParseException {
> + String malformedJnlp = originalJnlp.replace("'jnlp.jnlp'", "jnlp.jnlp");
> + Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
> + }
> +
> +}
> diff -r b68e805d7d67 tests/netx/unit/net/sourceforge/jnlp/basic.jnlp
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/tests/netx/unit/net/sourceforge/jnlp/basic.jnlp Wed Mar 30 20:02:23 2011 -0400
> @@ -0,0 +1,47 @@
> +<?xml version='1.0' encoding='utf-8'?>
> +<!-- this is a sample jnlp file -->
> +<jnlp spec='1.0'
> + codebase='http://localhost/'
> + href='jnlp.jnlp'>
> + <information>
> + <!-- this is the information section -->
> + <title>Large JNLP</title>
> + <vendor>The IcedTea Project</vendor>
> + <homepage href='http://homepage/' />
> + <description kind='one-line'>one-line</description>
> + <description kind='short'>short</description>
> + <description kind='tooltip'>tooltip</description>
> + <icon href='icon.png' />
> + <icon href='splash.png' kind='splash' />
> + <offline-allowed />
> + <shortcut online='true'>
> + <desktop/>
> + <menu submenu='submenu'/>
> + </shortcut>
> + <association extensions='*.foo' mime-type='foo/bar'/>
> + <related-content href='http://related-content/'>
> + <title>related-content <!-- or something -->title</title>
> + <description>decription of related-content</description>
> + <icon href='related-content-icon.png' />
> + </related-content>
> + </information>
> + <security>
> + <all-permissions/>
> + </security>
> + <resources>
> + <!-- the resources section describes things needed -->
> + <java version='1.3+' href='http://java-url/'
> + initial-heap-size='64m'
> + max-heap-size='128m' />
> + <jar href='eager.jar' download='eager'/>
> + <jar href='lazy.jar' download='lazy'/>
> + <nativelib href='native.jar'/>
> + <extension name='extension' version='0.1.1' href='http://extension/'/>
> + <property name='key' value='value'/>
> + </resources>
> + <application-desc main-class='MainClass'>
> + <argument>arg1</argument>
> + <argument>arg2</argument>
> + </application-desc>
> +</jnlp>
> +
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37
More information about the distro-pkg-dev
mailing list