diff options
Diffstat (limited to 'test/javax')
-rw-r--r-- | test/javax/xml/jaxp/transform/8062923/XslSubstringTest.java | 104 | ||||
-rw-r--r-- | test/javax/xml/ws/8046817/GenerateEnumSchema.java | 134 | ||||
-rw-r--r-- | test/javax/xml/ws/8046817/TestClassType.java | 29 | ||||
-rw-r--r-- | test/javax/xml/ws/8046817/TestEnumType.java | 29 |
4 files changed, 296 insertions, 0 deletions
diff --git a/test/javax/xml/jaxp/transform/8062923/XslSubstringTest.java b/test/javax/xml/jaxp/transform/8062923/XslSubstringTest.java new file mode 100644 index 000000000..fcc36aefc --- /dev/null +++ b/test/javax/xml/jaxp/transform/8062923/XslSubstringTest.java @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2015, 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 8062923 8062924 + * @run testng XslSubstringTest + * @summary Test xsl substring function with negative, Inf and + * NaN length and few other use cases + */ + +import java.io.StringReader; +import java.io.StringWriter; +import javax.xml.transform.Source; +import javax.xml.transform.Templates; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +public class XslSubstringTest { + + final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><test></test>"; + final String xslPre = "<xsl:stylesheet version='1.0'" + + " xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>" + + "<xsl:output method='xml' indent='yes' omit-xml-declaration='yes'/>" + + "<xsl:template match='/'><t>"; + final String xslPost = "</t></xsl:template></xsl:stylesheet>"; + + private String testTransform(String xsl) throws Exception { + //Prepare sources for transormation + Source src = new StreamSource(new StringReader(xml)); + Source xslsrc = new StreamSource(new StringReader(xslPre + xsl + xslPost)); + //Create factory, template and transformer + TransformerFactory tf = TransformerFactory.newInstance(); + Templates tmpl = tf.newTemplates(xslsrc); + Transformer t = tmpl.newTransformer(); + //Prepare output stream + StringWriter xmlResultString = new StringWriter(); + StreamResult xmlResultStream = new StreamResult(xmlResultString); + //Transform + t.transform(src, xmlResultStream); + return xmlResultString.toString().trim(); + } + + @Test + public void test8062923() throws Exception { + assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2,-1)\"/>|"), + "<t>||</t>"); + } + + @Test + public void test8062924() throws Exception { + assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2,-1 div 0)\"/>|"), + "<t>||</t>"); + } + + @Test + public void testGeneral1() throws Exception { + assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2, 1)\"/>|"), + "<t>|s|</t>"); + } + + @Test + public void testGeneral2() throws Exception { + assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2, 1 div 0)\"/>|"), + "<t>|sdf|</t>"); + } + + @Test + public void testGeneral3() throws Exception { + assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2, -0 div 0)\"/>|"), + "<t>||</t>"); + } + + @Test + public void testGeneral4() throws Exception { + assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2, 0 div 0)\"/>|"), + "<t>||</t>"); + } +} diff --git a/test/javax/xml/ws/8046817/GenerateEnumSchema.java b/test/javax/xml/ws/8046817/GenerateEnumSchema.java new file mode 100644 index 000000000..cb70d2247 --- /dev/null +++ b/test/javax/xml/ws/8046817/GenerateEnumSchema.java @@ -0,0 +1,134 @@ +/* + * Copyright (c) 2014, 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 8046817 + * @summary schemagen fails to generate xsd for enum types + * @run main/othervm GenerateEnumSchema + */ +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.file.Paths; +import java.util.Scanner; + +public class GenerateEnumSchema { + + private static final String SCHEMA_OUTPUT_FILENAME = "schema1.xsd"; + private static final File schemaOutputFile = new File(SCHEMA_OUTPUT_FILENAME); + + public static void main(String[] args) throws Exception, IOException { + //Check schema generation for class type + runSchemaGen("TestClassType.java"); + checkIfSchemaGenerated(); + checkSchemaContent("<xs:complexType name=\"testClassType\">"); + checkSchemaContent("<xs:element name=\"a\" type=\"xs:int\"/>"); + schemaOutputFile.delete(); + //Check schema generation for enum type + runSchemaGen("TestEnumType.java"); + checkIfSchemaGenerated(); + checkSchemaContent("<xs:simpleType name=\"testEnumType\">"); + checkSchemaContent("<xs:enumeration value=\"ONE\"/>"); + checkSchemaContent("<xs:enumeration value=\"TWO\"/>"); + checkSchemaContent("<xs:enumeration value=\"THREE\"/>"); + schemaOutputFile.delete(); + } + + private static void checkIfSchemaGenerated() { + if (!schemaOutputFile.exists()) { + throw new RuntimeException("FAIL:" + SCHEMA_OUTPUT_FILENAME + " was not generated by schemagen tool"); + } + } + + private static void checkSchemaContent(String exp_token) throws FileNotFoundException { + System.out.print("Check if generated schema contains '" + exp_token + "' string: "); + try (Scanner scanner = new Scanner(schemaOutputFile)) { + if (scanner.findWithinHorizon(exp_token, 0) != null) { + System.out.println("OK"); + return; + } + } + System.out.println("FAIL"); + throw new RuntimeException("The '" + exp_token + "' is not found in generated schema"); + + } + + private static String getClassFilePath(String filename) { + String testSrc = System.getProperty("test.src"); + if (testSrc == null) { + testSrc = "."; + } + return Paths.get(testSrc).resolve(filename).toString(); + } + + private static String getSchemagen() { + String javaHome = System.getProperty("java.home"); + if (javaHome.endsWith("jre")) { + javaHome = new File(javaHome).getParent(); + } + String schemagen = javaHome + File.separator + "bin" + File.separator + "schemagen"; + if (System.getProperty("os.name").startsWith("Windows")) { + schemagen = schemagen.concat(".exe"); + } + return schemagen; + } + + private static void logOutput(Process p) throws IOException { + BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream())); + String s = r.readLine(); + while (s != null) { + System.out.println(s.trim()); + s = r.readLine(); + } + } + + private static void runSchemaGen(String classFile) { + String schemagen = getSchemagen(); + + try { + System.out.println("Call to schemagen: " + schemagen + " " + classFile); + String[] schemagen_args = { + schemagen, + getClassFilePath(classFile) + }; + + ProcessBuilder pb = new ProcessBuilder(schemagen_args); + pb.redirectErrorStream(true); + Process p = pb.start(); + logOutput(p); + int result = p.waitFor(); + p.destroy(); + + if (result != 0) { + throw new RuntimeException("schemagen failed"); + } + } catch (IOException | InterruptedException e) { + System.err.println("Can't run schemagen tool. Exception:"); + e.printStackTrace(System.err); + throw new RuntimeException("Error launching schemagen tool"); + } + } +} diff --git a/test/javax/xml/ws/8046817/TestClassType.java b/test/javax/xml/ws/8046817/TestClassType.java new file mode 100644 index 000000000..e5d72f33e --- /dev/null +++ b/test/javax/xml/ws/8046817/TestClassType.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2014, 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. + */ + +import javax.xml.bind.annotation.XmlType; + +@XmlType +public class TestClassType { + public int a; +} diff --git a/test/javax/xml/ws/8046817/TestEnumType.java b/test/javax/xml/ws/8046817/TestEnumType.java new file mode 100644 index 000000000..785fb191c --- /dev/null +++ b/test/javax/xml/ws/8046817/TestEnumType.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2014, 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. + */ + +import javax.xml.bind.annotation.XmlEnum; + +@XmlEnum(String.class) +public enum TestEnumType { + ONE, TWO, THREE +} |