changeset 9674:f6c3cb79d761

8032884: Globalbindings optionalProperty=primitive does not work when minOccurs=0 Reviewed-by: chegar
author mkos
date Thu, 03 Apr 2014 10:53:35 +0200
parents 7558e4ae79bd
children a73632def406
files test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java test/javax/xml/bind/xjc/8032884/compile-schema.sh test/javax/xml/bind/xjc/8032884/optional-property-schema.xsd
diffstat 3 files changed, 121 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java	Thu Apr 03 10:53:35 2014 +0200
@@ -0,0 +1,68 @@
+/*
+ * 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 8032884
+ * @summary Globalbindings optionalProperty="primitive" does not work when minOccurs=0
+ * @run shell compile-schema.sh
+ * @run main/othervm XjcOptionalPropertyTest
+ */
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+
+public class XjcOptionalPropertyTest {
+
+    public static void main(String[] args) throws IOException {
+
+        generated.Foo foo = new generated.Foo();
+        log("foo = " + foo);
+        Method[] methods = foo.getClass().getMethods();
+        log("Found [" + methods.length + "] methods");
+        for (int i = 0; i < methods.length; i++) {
+            Method method = methods[i];
+            if (method.getName().equals("setFoo")) {
+                log("Checking method [" + method.getName() + "]");
+                Class[] parameterTypes = method.getParameterTypes();
+                if (parameterTypes.length != 1)
+                    fail("more than 1 parameter");
+                if (!parameterTypes[0].isPrimitive()) {
+                    fail("Found [" + parameterTypes[0].getName() + "], but expected primitive!");
+                }
+                break;
+            }
+        }
+        log("TEST PASSED.");
+
+    }
+
+    private static void fail(String message) {
+        throw new RuntimeException(message);
+    }
+
+    private static void log(String msg) {
+        System.out.println(msg);
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/xml/bind/xjc/8032884/compile-schema.sh	Thu Apr 03 10:53:35 2014 +0200
@@ -0,0 +1,39 @@
+#! /bin/sh
+
+#
+# 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.
+#
+
+#
+
+if [ "x$TESTJAVA" = x ]; then
+  TESTJAVA=$1; shift
+  TESTCLASSES=.
+fi
+
+echo "cleaning generated files ..."
+rm -rfv ${TESTSRC}/generated
+
+echo "compiling [optional-property-schema.xsd] schema ..."
+$TESTJAVA/bin/xjc -p generated -d ${TESTSRC} ${TESTSRC}/optional-property-schema.xsd
+
+echo "Schema compiled. Verification of generated files can be done now."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/xml/bind/xjc/8032884/optional-property-schema.xsd	Thu Apr 03 10:53:35 2014 +0200
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns="anamespace"
+           targetNamespace="anamespace" jaxb:version="2.0">
+    <xs:annotation>
+        <xs:appinfo>
+            <jaxb:globalBindings optionalProperty="primitive"/>
+        </xs:appinfo>
+    </xs:annotation>
+    <xs:complexType name="foo">
+        <xs:sequence>
+            <xs:element name="foo" type="xs:int" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
\ No newline at end of file