Mercurial > hg > release > icedtea-web-1.6
changeset 264:4267bb156f08
Added algorithm that compares signed JNLP application/template file with launching JNLP file (with test case and its resources)
line wrap: on
line diff
--- a/ChangeLog Thu Jun 23 15:29:45 2011 +0200 +++ b/ChangeLog Tue Jul 19 12:14:35 2011 -0400 @@ -1,3 +1,76 @@ +2011-07-19 Saad Mohammad <smohammad@redhat.com> + + * netx/net/sourceforge/jnlp/JNLPMatcher.java: + Created this class to compare signed JNLP file with the launching + JNLP file. When comparing, it has support for both method of signing + of a JNLP file: APPLICATION_TEMPLATE.JNLP and APPLICATION.JNLP. + * netx/net/sourceforge/jnlp/JNLPMatcherException.java: + Added a custom exception: JNLPMatcherException. Thrown if verifying + signed JNLP files fails. + * netx/net/sourceforge/jnlp/Node.java: + Created a method that retrieves the attribute names of the Node and + stores it in private string [] member. The method returns the + attribute names. + * tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java: + This is a test case that tests the functionality of JNLPMatcher. + It tests the algorithm with a variety of template and application + JNLP files. + * tests/netx/unit/net/sourceforge/jnlp/launchApp.jnlp: + Launching JNLP file: This is the launching JNLP file used to compare + with templates and application JNLP files in JNLPMatcherTest.java + * tests/netx/unit/net/sourceforge/jnlp/templates/template0.jnlp: + Test Template JNLP file: Contains CDATA. + * tests/netx/unit/net/sourceforge/jnlp/templates/template1.jnlp: + Test Template JNLP file: An exact duplicate of the launching + JNLP file. + * tests/netx/unit/net/sourceforge/jnlp/templates/template2.jnlp: + Test Template JNLP file: Contains wildchars as attribute/element + values. + * tests/netx/unit/net/sourceforge/jnlp/templates/template3.jnlp: + Test Template JNLP file: Different order of elements/attributes + (same value) + * tests/netx/unit/net/sourceforge/jnlp/templates/template4.jnlp: + Test Template JNLP file: Contains wildchars as values of ALL elements + and attribute. + * tests/netx/unit/net/sourceforge/jnlp/templates/template5.jnlp: + Test Template JNLP file: Contains comments. + * tests/netx/unit/net/sourceforge/jnlp/templates/template6.jnlp: + Test Template JNLP file: Contains different attribute and element + values. + * tests/netx/unit/net/sourceforge/jnlp/templates/template7.jnlp: + Test Template JNLP file: Contains additional children in element. + * tests/netx/unit/net/sourceforge/jnlp/templates/template8.jnlp: + Test Template JNLP file: Contains fewer children in element. + * tests/netx/unit/net/sourceforge/jnlp/templates/template9.jnlp: + Test Template JNLP file: All values are different from the launching + JNLP file. + * tests/netx/unit/net/sourceforge/jnlp/application/application0.jnlp: + Test Application JNLP file: Contains CDATA. + * tests/netx/unit/net/sourceforge/jnlp/application/application1.jnlp: + Test Application JNLP file: An exact duplicate of the launching + JNLP file. + * tests/netx/unit/net/sourceforge/jnlp/application/application2.jnlp: + Test Application JNLP file: Different order of element/attributes + (same value). + * tests/netx/unit/net/sourceforge/jnlp/application/application3.jnlp: + Test Application JNLP file: Contains comments. + * tests/netx/unit/net/sourceforge/jnlp/application/application4.jnlp: + Test Application JNLP file: Contains wildchars as attribute/element + values. + * tests/netx/unit/net/sourceforge/jnlp/application/application5.jnlp: + Test Application JNLP file: Contains a different attribute (codebase) + value. + * tests/netx/unit/net/sourceforge/jnlp/application/application6.jnlp: + Test Application JNLP file: Contains additional children in element. + * tests/netx/unit/net/sourceforge/jnlp/application/application7.jnlp: + Test Application JNLP file: Contains fewer children in element. + * tests/netx/unit/net/sourceforge/jnlp/application/application8.jnlp: + Test Application JNLP file: All values are different from the + launching JNLP file. + * Makefile.am: + (run-netx-unit-tests): Copies resources(non java files) to test.build + before running the unit tests. + 2011-06-22 Jiri Vanek <jvanek@redhat.com> * tests/report-styles/jreport.xsl: part with classes statistics is now collapsable
--- a/Makefile.am Thu Jun 23 15:29:45 2011 +0200 +++ b/Makefile.am Tue Jul 19 12:14:35 2011 -0400 @@ -538,7 +538,12 @@ run-netx-unit-tests: stamps/netx-unit-tests-compile.stamp \ $(JUNIT_RUNNER_JAR) $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) - cp {$(NETX_UNIT_TEST_SRCDIR),$(NETX_UNIT_TEST_DIR)}/net/sourceforge/jnlp/basic.jnlp + filename=" " ; \ + cd $(NETX_UNIT_TEST_SRCDIR) ; \ + for file in `find . -type f \! -iname "*.java"`; do\ + filename=`echo $$file `; \ + cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \ + done ; \ cd $(NETX_UNIT_TEST_DIR) ; \ class_names= ; \ for test in `find -type f` ; do \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/JNLPMatcher.java Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,272 @@ +/* JNLPMatcher.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.util.List; +import java.io.InputStreamReader; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedList; +import net.sourceforge.nanoxml.XMLElement; + +/** + * To compare launching JNLP file with signed APPLICATION.JNLP or + * APPLICATION_TEMPLATE.jnlp. + * + * Used by net.sourceforge.jnlp.runtime.JNLPCLassLoader + */ + +public final class JNLPMatcher { + + private final Node appTemplateNode; + private final Node launchJNLPNode; + private final boolean isTemplate; + private Boolean match; + + /** + * Public constructor + * + * @param appTemplate + * the reader stream of the signed APPLICATION.jnlp or + * APPLICATION_TEMPLATE.jnlp + * @param launchJNLP + * the reader stream of the launching JNLP file + * @param isTemplate + * a boolean that specifies if appTemplateFile is a template + * @throws JNLPMatcherException + * if IOException, XMLParseException is thrown during parsing; + * Or launchJNLP/appTemplate is null + */ + public JNLPMatcher(InputStreamReader appTemplate, InputStreamReader launchJNLP, + boolean isTemplate) throws JNLPMatcherException { + + try { + + if (appTemplate == null && launchJNLP == null) + throw new NullPointerException( + "Template JNLP file and Launching JNLP file are both null."); + else if (appTemplate == null) + throw new NullPointerException("Template JNLP file is null."); + else if (launchJNLP == null) + throw new NullPointerException("Launching JNLP file is null."); + + XMLElement appTemplateXML = new XMLElement(); + XMLElement launchJNLPXML = new XMLElement(); + + // Remove the comments and CDATA from the JNLP file + final PipedInputStream pinTemplate = new PipedInputStream(); + final PipedOutputStream poutTemplate = new PipedOutputStream(pinTemplate); + appTemplateXML.sanitizeInput(appTemplate, poutTemplate); + + final PipedInputStream pinJNLPFile = new PipedInputStream(); + final PipedOutputStream poutJNLPFile = new PipedOutputStream(pinJNLPFile); + launchJNLPXML.sanitizeInput(launchJNLP, poutJNLPFile); + + // Parse both files + appTemplateXML.parseFromReader(new InputStreamReader(pinTemplate)); + launchJNLPXML.parseFromReader(new InputStreamReader(pinJNLPFile)); + + // Initialize parent nodes + this.appTemplateNode = new Node(appTemplateXML); + this.launchJNLPNode = new Node(launchJNLPXML); + this.isTemplate = isTemplate; + + } catch (Exception e) { + throw new JNLPMatcherException( + "Failed to create an instance of JNLPVerify with specified InputStreamReader", + e); + } + } + + /** + * Compares both JNLP files + * + * @return true if both JNLP files are 'matched', otherwise false + */ + public boolean isMatch() { + + if (match == null) + match = matchNodes(appTemplateNode, launchJNLPNode); + + return match; + } + + /** + * Compares two Nodes regardless of the order of their children/attributes + * + * @param appTemplate + * signed application or template's Node + * @param launchJNLP + * launching JNLP file's Node + * + * @return true if both Nodes are 'matched', otherwise false + */ + private boolean matchNodes(Node appTemplate, Node launchJNLP) { + + if (appTemplate != null && launchJNLP != null) { + + Node templateNode = appTemplate; + Node launchNode = launchJNLP; + // Store children of Node + List<Node> appTemplateChild = new LinkedList<Node>(Arrays.asList(templateNode + .getChildNodes())); + List<Node> launchJNLPChild = new LinkedList<Node>(Arrays.asList(launchNode + .getChildNodes())); + + // Compare only if both Nodes have the same name, else return false + if (templateNode.getNodeName().equals(launchNode.getNodeName())) { + + if (appTemplateChild.size() == launchJNLPChild.size()) { // Compare + // children + + int childLength = appTemplateChild.size(); + + for (int i = 0; i < childLength;) { + for (int j = 0; j < childLength; j++) { + boolean isSame = matchNodes(appTemplateChild.get(i), + launchJNLPChild.get(j)); + + if (!isSame && j == childLength - 1) + return false; + else if (isSame) { // If both child matches, remove them from the list of children + appTemplateChild.remove(i); + launchJNLPChild.remove(j); + --childLength; + break; + } + } + } + + if (!templateNode.getNodeValue().equals(launchNode.getNodeValue())) { + + // If it's a template and the template's value is NOT '*' + if (isTemplate && !templateNode.getNodeValue().equals("*")) + return false; + // Else if it's not a template, then return false + else if (!isTemplate) + return false; + } + // Compare attributes of both Nodes + return matchAttributes(templateNode, launchNode); + } + + } + } + return false; + } + + /** + * Compares attributes of two Nodes regardless of order + * + * @param appTemplateNode + * signed application or template's Node with attributes + * @param launchJNLPNode + * launching JNLP file's Node with attributes + * + * @return true if both Nodes have 'matched' attributes, otherwise false + */ + private boolean matchAttributes(Node templateNode, Node launchNode) { + + if (templateNode != null && launchNode != null) { + + List<String> appTemplateAttributes = templateNode.getAttributeNames(); + List<String> launchJNLPAttributes = launchNode.getAttributeNames(); + + Collections.sort(appTemplateAttributes); + Collections.sort(launchJNLPAttributes); + + if (appTemplateAttributes.size() == launchJNLPAttributes.size()) { + + int size = appTemplateAttributes.size(); // Number of attributes + + for (int i = 0; i < size; i++) { + + if (launchJNLPAttributes.get(i).equals(appTemplateAttributes.get(i))) { // If both Node's attribute name are the + // same then compare the values + + String attribute = launchJNLPAttributes.get(i); + boolean isSame = templateNode.getAttribute(attribute).equals( // Check if the Attribute values match + launchNode.getAttribute(attribute)); + + if (!isTemplate && !isSame) + return false; + else if (isTemplate && !isSame + && !templateNode.getAttribute(attribute).equals("*")) + return false; + + } else + // If attributes names do not match, return false + return false; + } + return true; + } + } + return false; + } + + /** + * Getter for application/template Node + * + * @return the Node of the signed application/template file + */ + public Node getAppTemplateNode() { + return appTemplateNode; + } + + /** + * Getter for launching application Node + * + * @return the Node of the launching JNLP file + */ + public Node getLaunchJNLPNode() { + return launchJNLPNode; + } + + /** + * Getter for isTemplate + * + * @return true if a signed template is being used for matching; otherwise + * false. + */ + public boolean isTemplate() { + return isTemplate; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/JNLPMatcherException.java Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,16 @@ +package net.sourceforge.jnlp; + +public class JNLPMatcherException extends Exception +{ + private static final long serialVersionUID = 1L; + + public JNLPMatcherException(String message) + { + super(message); + } + + public JNLPMatcherException(String message, Throwable cause) + { + super(message, cause); + } +}
--- a/netx/net/sourceforge/jnlp/Node.java Thu Jun 23 15:29:45 2011 +0200 +++ b/netx/net/sourceforge/jnlp/Node.java Tue Jul 19 12:14:35 2011 -0400 @@ -19,6 +19,7 @@ private XMLElement xml; private Node next; private Node children[]; + private List <String> attributeNames= null; Node(XMLElement xml) { this.xml = xml; @@ -60,6 +61,21 @@ return children; } + + /** + * To retrieve all attribute names + * @return all attribute names of the Node in ArrayList<String> + */ + List<String> getAttributeNames() { + if (attributeNames == null) { + attributeNames= new ArrayList<String>(); + + for (Enumeration e = xml.enumerateAttributeNames(); e.hasMoreElements();) + attributeNames.add(new String((String) e.nextElement())); + } + + return attributeNames; + } String getAttribute(String name) { return (String) xml.getAttribute(name); @@ -86,6 +102,7 @@ private ParsedXML tinyNode; private Node next; private Node children[]; + private String attributeNames[]; Node(ParsedXML tinyNode) { this.tinyNode = tinyNode; @@ -127,6 +144,19 @@ return children; } + + String[] getAttributeNames() { + if (attributeNames == null) { + List<String> list = new ArrayList<String>(); + + for (Enumeration e = xml.enumerateAttributeNames(); e.hasMoreElements();) + list.add(new String((String) e.nextElement())); + + attributeNames = list.toArray(new String[list.size()]); + + } + return attributeNames; + } String getAttribute(String name) { return tinyNode.getAttribute(name);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,464 @@ +/* JNLPMatcherTest.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 static org.junit.Assert.fail; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import junit.framework.Assert; +import org.junit.Test; + +public class JNLPMatcherTest { + + final String tests[] = { + "Testing template with CDATA", + "Testing template with an exact duplicate of the launching JNLP file", + "Testing template with wildchars as attribute/element values", + "Testing template with attributes/elements in different order", + "Testing template with wildchars as ALL element/attribute values", + "Testing template with comments", + "Testing template with different attribute/element values", + "Testing template by adding an additional children to element", + "Testing template by removing children from element", + "Testing template with a complete different JNLP template file ", + "Testing application with CDATA", + "Testing application with an exact duplicate of the launching JNLP file", + "Testing application with the same element/attribute name and value pair in different orders", + "Testing application with comments", + "Testing application with wildchars as attribute/element values", + "Testing application with a different codebase attribute value", + "Testing application by adding additional children to element", + "Testing application by removing children from element", + "Testing application with a complete different JNLP application file", + "Testing by calling JNLPMatcher.match() multiple times. Checking to see if the returns value is consistent" }; + + final ClassLoader cl = JNLPMatcherTest.class.getClassLoader(); + + private InputStreamReader getLaunchReader() { + InputStream launchStream = cl + .getResourceAsStream("net/sourceforge/jnlp/launchApp.jnlp"); + return new InputStreamReader(launchStream); + } + + @Test + public void testTemplateCDATA() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template0.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[0], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testTemplateDuplicate() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template1.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[1], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testTemplateWildCharsRandom() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template2.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[2], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testTemplateDifferentOrder() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template3.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[3], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testTemplateWildCharsAsAllValues() throws JNLPMatcherException, + IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template4.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[4], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testTemplateComments() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template5.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[5], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testTemplateDifferentValues() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template6.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[6], false, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testTemplateExtraChild() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template7.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[7], false, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testTemplateFewerChild() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template8.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[8], false, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testTemplateDifferentFile() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template9.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[9], false, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testApplicationCDATA() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application0.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[10], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testApplicationDuplicate() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application1.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[11], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testApplicationDifferentOrder() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application2.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[12], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testApplicationComments() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application3.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[13], true, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testApplicationWildCharsRandom() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application4.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[14], false, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testApplicationDifferentCodebaseValue() throws JNLPMatcherException, + IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application5.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[15], false, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testApplicationExtraChild() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application6.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[16], false, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testApplicationFewerChild() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application7.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[17], false, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @Test + public void testApplicationDifferentFile() throws JNLPMatcherException, IOException { + + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application8.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[18], false, test.isMatch()); + fileReader.close(); + launchReader.close(); + } + + @SuppressWarnings("unused") + @Test + public void testNullJNLPFiles() throws IOException { + + Exception expectedException = null; + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application8.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + try { + JNLPMatcher test = new JNLPMatcher(null, launchReader, false); + } catch (Exception e) { + expectedException = e; + } + Assert.assertEquals( + "Checking exception after trying to create an instance with null signed application/template reader", + expectedException.getClass().getName(), + "net.sourceforge.jnlp.JNLPMatcherException"); + + try { + JNLPMatcher test = new JNLPMatcher(fileReader, null, false); + } catch (Exception e) { + expectedException = e; + } + Assert.assertEquals( + "Checking exception after trying to create an instance with null launching JNLP file reader", + expectedException.getClass().getName(), + "net.sourceforge.jnlp.JNLPMatcherException"); + + try { + JNLPMatcher test = new JNLPMatcher(null, null, false); + } catch (Exception e) { + expectedException = e; + } + Assert.assertEquals( + "Checking exception after trying to create an instance with both readers being null", + expectedException.getClass().getName(), + "net.sourceforge.jnlp.JNLPMatcherException"); + + launchReader.close(); + fileReader.close(); + } + + @Test + public void testCallingMatchMultiple() throws JNLPMatcherException, IOException { + + // Check with application + InputStreamReader launchReader = this.getLaunchReader(); + + InputStream fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/application/application8.jnlp"); + InputStreamReader fileReader = new InputStreamReader(fileStream); + + JNLPMatcher test = new JNLPMatcher(fileReader, launchReader, false); + + Assert.assertEquals(tests[19], false, test.isMatch()); + Assert.assertEquals(tests[19], false, test.isMatch()); + + fileReader.close(); + launchReader.close(); + + // Check with template + launchReader = this.getLaunchReader(); + + fileStream = cl + .getResourceAsStream("net/sourceforge/jnlp/templates/template6.jnlp"); + fileReader = new InputStreamReader(fileStream); + + test = new JNLPMatcher(fileReader, launchReader, true); + + Assert.assertEquals(tests[19], false, test.isMatch()); + Assert.assertEquals(tests[19], false, test.isMatch()); + + fileReader.close(); + launchReader.close(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/application/application0.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" + codebase="file" + href="www.redhat.com" + > + + <!CDATA[ + Text you want to escape goes here... + <test> random tag test </test> + ]]> + + <information> + <title>Sample Test</title> + <vendor>RedHat</vendor> + <offline-allowed/> + + </information> + + + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + + + <application-desc main-class='Test' /> +</jnlp> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/application/application1.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="www.redhat.com"> + <information> + <title>Sample Test</title> + <vendor>RedHat</vendor> + <offline-allowed /> + </information> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/application/application2.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" href="www.redhat.com" codebase="file"> + <resources> + <jar main='true' href='myResource.jar' /> + <j2se version='1.6+' /> + </resources> + <information> + <vendor>RedHat</vendor> + <title>Sample Test</title> + <offline-allowed /> + </information> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/application/application3.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="www.redhat.com"> + <information> + <!-- This is my comment--> + <title>Sample Test</title> + <vendor>RedHat</vendor> + <offline-allowed /> + <!-- This is my comment--> + </information> + <!-- This is my comment--> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <!-- This is my comment--> + <application-desc main-class='Test' /> +</jnlp> +<!-- This is my comment-->
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/application/application4.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="*"> + <information> + <title>Sample Test</title> + <vendor>*</vendor> + <offline-allowed /> + </information> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/application/application5.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="somefile" href="www.redhat.com"> + <information> + <title>Sample Test</title> + <vendor>RedHat</vendor> + <offline-allowed /> + </information> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/application/application6.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="www.redhat.com"> + <information> + <title>Sample Test</title> + <vendor>RedHat</vendor> + <offline-allowed /> + <shortcut> + <desktop /> + </shortcut> + </information> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/application/application7.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="www.redhat.com"> + <information> + <title>Sample Test</title> + <vendor>RedHat</vendor> + </information> + <resources> + <j2se version='1.6+' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/application/application8.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.2+" codebase="file:///home/smohammad/Desktop/Test/" href="Sample2.jnlp"> + <information> + <title>Sample</title> + <vendor>RedHat</vendor> + <description>This is a sample to test a bug</description> + <offline-allowed /> + <icon href="red.gif" /> + </information> + <resources> + <jar version="1.2+" href="myResource2.jar" /> + </resources> + <application-desc main-class="test.Runner" /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/launchApp.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" + codebase="file" + href="www.redhat.com" + > + + <information> + <title>Sample Test</title> + <vendor>RedHat</vendor> + <offline-allowed/> + + </information> + + + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + + + <application-desc main-class='Test' /> +</jnlp> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template0.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" + codebase="file" + href="*" + > + + <information> + <title>Sample Test</title> + <vendor>RedHat</vendor> + <offline-allowed/> + + </information> + + + <!CDATA[ + Text you want to escape goes here... + <test> random tag test </test> + ]]> + + + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + + + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template1.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="*"> + <information> + <title>Sample Test</title> + <vendor>RedHat</vendor> + <offline-allowed /> + </information> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template2.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="*"> + <information> + <title>Sample Test</title> + <vendor>*</vendor> + <offline-allowed /> + </information> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template3.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="*"> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <information> + <vendor>RedHat</vendor> + <title>Sample Test</title> + <offline-allowed /> + </information> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template4.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,13 @@ +<?xml version="*"?> +<jnlp spec="*" codebase="*" href="*"> + <information> + <title>*</title> + <vendor>*</vendor> + <offline-allowed /> + </information> + <resources> + <j2se version='*' /> + <jar href='*' main='*' /> + </resources> + <application-desc main-class='*' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template5.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,23 @@ +<?xml version="*"?> +<jnlp spec="*" + codebase="*" + href="*" + > + + <information> +<!-- This is my comment--> + <title>*</title> + <vendor>*</vendor> + <offline-allowed/> + </information> + +<!-- This is my comment--> + + <resources> + <j2se version='*' /> + <jar href='*' main='*' /> + </resources> + + + <application-desc <!-- This is my comment--> main-class='*' /> +</jnlp> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template6.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="randomcodebase" href="*"> + <information> + <title>Test Sample</title> + <vendor>RedHat</vendor> + <offline-allowed /> + </information> + <resources> + <j2se version='22+' /> + <jar href='myResource2.jar' main='true' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template7.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="*"> + <information> + <title>Sample Test</title> + <vendor>RedHat</vendor> + <shortcut> + <desktop /> + </shortcut> + <offline-allowed /> + </information> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template8.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<jnlp spec="1.5+" codebase="file" href="www.redhat.com"> + <resources> + <j2se version='1.6+' /> + <jar href='myResource.jar' main='true' /> + </resources> + <application-desc main-class='Test' /> +</jnlp>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/templates/template9.jnlp Tue Jul 19 12:14:35 2011 -0400 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.2+" codebase="file:///home/smohammad/Desktop/Test/" href="Sample2.jnlp"> + <information> + <title>Sample</title> + <vendor>RedHat</vendor> + <description>This is a sample to test a bug</description> + <offline-allowed /> + <icon href="red.gif" /> + </information> + <resources> + <jar version="1.2+" href="myResource2.jar" /> + </resources> + <application-desc main-class="test.Runner" /> +</jnlp>