From 0d1f867cd941fba47fc2034c8f643cc6102fc9c0 Mon Sep 17 00:00:00 2001 From: joehw Date: Fri, 21 Dec 2012 17:29:23 -0800 Subject: [PATCH] 8005280: (props) Improve test coverage for small XML parser Summary: added a few more invalid XML files, international characters to LoadAndStore test, and a behavior compatibility test. Reviewed-by: alanb, lancea --- test/java/util/Properties/Compatibility.xml | 10 ++ .../util/Properties/CompatibilityTest.java | 107 ++++++++++++++++++ .../java/util/Properties/LoadAndStoreXML.java | 3 + ...BadDocType.xml.excluded => BadDocType.xml} | 0 .../Properties/invalidxml/DTDRootNotMatch.xml | 9 ++ .../Properties/invalidxml/IllegalComment.xml | 10 ++ .../Properties/invalidxml/IllegalEntry.xml | 9 ++ .../Properties/invalidxml/IllegalEntry1.xml | 11 ++ .../invalidxml/IllegalKeyAttribute.xml | 9 ++ .../{NoDocType.xml.excluded => NoDocType.xml} | 0 .../invalidxml/NoNamespaceSupport.xml | 11 ++ 11 files changed, 179 insertions(+) create mode 100644 test/java/util/Properties/Compatibility.xml create mode 100644 test/java/util/Properties/CompatibilityTest.java rename test/java/util/Properties/invalidxml/{BadDocType.xml.excluded => BadDocType.xml} (100%) create mode 100644 test/java/util/Properties/invalidxml/DTDRootNotMatch.xml create mode 100644 test/java/util/Properties/invalidxml/IllegalComment.xml create mode 100644 test/java/util/Properties/invalidxml/IllegalEntry.xml create mode 100644 test/java/util/Properties/invalidxml/IllegalEntry1.xml create mode 100644 test/java/util/Properties/invalidxml/IllegalKeyAttribute.xml rename test/java/util/Properties/invalidxml/{NoDocType.xml.excluded => NoDocType.xml} (100%) create mode 100644 test/java/util/Properties/invalidxml/NoNamespaceSupport.xml diff --git a/test/java/util/Properties/Compatibility.xml b/test/java/util/Properties/Compatibility.xml new file mode 100644 index 000000000..b80d2d045 --- /dev/null +++ b/test/java/util/Properties/Compatibility.xml @@ -0,0 +1,10 @@ + + ]> + + +Property With Other Encoding +value1 +]]> +&intEnt; + diff --git a/test/java/util/Properties/CompatibilityTest.java b/test/java/util/Properties/CompatibilityTest.java new file mode 100644 index 000000000..efd16c9bd --- /dev/null +++ b/test/java/util/Properties/CompatibilityTest.java @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8005280 8004371 + * @summary Compatibility test + * @run main CompatibilityTest + * @run main/othervm -Dsun.util.spi.XmlPropertiesProvider=jdk.internal.util.xml.BasicXmlPropertiesProvider CompatibilityTest + */ + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +/** + * This is a behavior compatibility test. + * Although not defined by the properties.dtd, the constructs + * in Compatibility.xml are supported by the regular JDK XML + * Provider. + * + * @author: Joe Wang + */ +public class CompatibilityTest { + + public static void main(String[] args) { + testInternalDTD(); + } + + /* + * Not in the spec, but the constructs work with the current JDK + */ + static void testInternalDTD() { + String src = System.getProperty("test.src"); + if (src == null) { + src = "."; + } + loadPropertyFile(src + "/Compatibility.xml"); + } + + /* + * 'Store' the populated 'Property' with the specified 'Encoding Type' as an + * XML file. Retrieve the same XML file and 'load' onto a new 'Property' object. + */ + static void loadPropertyFile(String filename) { + try (InputStream in = new FileInputStream(filename)) { + Properties prop = new Properties(); + prop.loadFromXML(in); + verifyProperites(prop); + } catch (IOException ex) { + fail(ex.getMessage()); + } + } + + /* + * This method verifies the first key-value with the original string. + */ + static void verifyProperites(Properties prop) { + try { + for (String key : prop.stringPropertyNames()) { + String val = prop.getProperty(key); + if (key.equals("Key1")) { + if (!val.equals("value1")) { + fail("Key:" + key + "'s value: \nExpected: value1\nFound: " + val); + } + } else if (key.equals("Key2")) { + if (!val.equals("")) { + fail("Key:" + key + "'s value: \nExpected: \nFound: " + val); + } + } else if (key.equals("Key3")) { + if (!val.equals("value3")) { + fail("Key:" + key + "'s value: \nExpected: value3\nFound: " + val); + } + } + } + } catch (Exception e) { + fail(e.getMessage()); + } + + } + + static void fail(String err) { + throw new RuntimeException(err); + } + +} diff --git a/test/java/util/Properties/LoadAndStoreXML.java b/test/java/util/Properties/LoadAndStoreXML.java index 337b3e00a..5388485e9 100644 --- a/test/java/util/Properties/LoadAndStoreXML.java +++ b/test/java/util/Properties/LoadAndStoreXML.java @@ -75,6 +75,9 @@ public class LoadAndStoreXML { Properties props = new Properties(); props.put("k1", "foo"); props.put("k2", "bar"); + props.put("k3", "\\u0020\\u0391\\u0392\\u0393\\u0394\\u0395\\u0396\\u0397"); + props.put("k4", "\u7532\u9aa8\u6587"); + props.put("k5", "/lib/jaxp.properties"); ByteArrayOutputStream out = new ByteArrayOutputStream(); props.storeToXML(out, null, encoding); diff --git a/test/java/util/Properties/invalidxml/BadDocType.xml.excluded b/test/java/util/Properties/invalidxml/BadDocType.xml similarity index 100% rename from test/java/util/Properties/invalidxml/BadDocType.xml.excluded rename to test/java/util/Properties/invalidxml/BadDocType.xml diff --git a/test/java/util/Properties/invalidxml/DTDRootNotMatch.xml b/test/java/util/Properties/invalidxml/DTDRootNotMatch.xml new file mode 100644 index 000000000..757653a4f --- /dev/null +++ b/test/java/util/Properties/invalidxml/DTDRootNotMatch.xml @@ -0,0 +1,9 @@ + + + + + + +comment +value of the first key + diff --git a/test/java/util/Properties/invalidxml/IllegalComment.xml b/test/java/util/Properties/invalidxml/IllegalComment.xml new file mode 100644 index 000000000..06350acce --- /dev/null +++ b/test/java/util/Properties/invalidxml/IllegalComment.xml @@ -0,0 +1,10 @@ + + + + + + +comment1 +comment2 +value of the first key + diff --git a/test/java/util/Properties/invalidxml/IllegalEntry.xml b/test/java/util/Properties/invalidxml/IllegalEntry.xml new file mode 100644 index 000000000..76171893e --- /dev/null +++ b/test/java/util/Properties/invalidxml/IllegalEntry.xml @@ -0,0 +1,9 @@ + + + + + + +comment +value of the first key + diff --git a/test/java/util/Properties/invalidxml/IllegalEntry1.xml b/test/java/util/Properties/invalidxml/IllegalEntry1.xml new file mode 100644 index 000000000..e51c29791 --- /dev/null +++ b/test/java/util/Properties/invalidxml/IllegalEntry1.xml @@ -0,0 +1,11 @@ + + + + + + +comment1 + +value of the first key +value of the second key + diff --git a/test/java/util/Properties/invalidxml/IllegalKeyAttribute.xml b/test/java/util/Properties/invalidxml/IllegalKeyAttribute.xml new file mode 100644 index 000000000..f8c59df5e --- /dev/null +++ b/test/java/util/Properties/invalidxml/IllegalKeyAttribute.xml @@ -0,0 +1,9 @@ + + + + + + +comment1 +value of the first key + diff --git a/test/java/util/Properties/invalidxml/NoDocType.xml.excluded b/test/java/util/Properties/invalidxml/NoDocType.xml similarity index 100% rename from test/java/util/Properties/invalidxml/NoDocType.xml.excluded rename to test/java/util/Properties/invalidxml/NoDocType.xml diff --git a/test/java/util/Properties/invalidxml/NoNamespaceSupport.xml b/test/java/util/Properties/invalidxml/NoNamespaceSupport.xml new file mode 100644 index 000000000..176058d84 --- /dev/null +++ b/test/java/util/Properties/invalidxml/NoNamespaceSupport.xml @@ -0,0 +1,11 @@ + + + + + + +comment1 + +value of the first key +value of the second key + -- GitLab