Port main/codemaker to gbuild.

Also ported the Java tests in codemaker to JUnit
instead of the internal test framework,
and enabled them during the subsequent test phase.

A gbuild API for building private UNO APIs using cppumaker was also added,
and used to run the C++ subsequent tests in codemaker.

Patch by: me

8 files changed, 390 insertions, 329 deletions

diff --git a/codemaker/test/javamaker/build.xml b/codemaker/test/javamaker/build.xml
new file mode 100644
index 000000000000..d455f8e6f003
--- /dev/null
+++ b/codemaker/test/javamaker/build.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<project name="codemaker_test" default="main">
+
+    <property file="../../../ant.properties"/>
+    <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+    <target name="init-project">
+
+        <path id="main.classpath">
+            <pathelement location="${OUTDIR}/bin/juh.jar"/>
+            <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+            <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+        </path>
+
+        <filelist id="idl.files">
+            <file name="${test.src.dir}/test/codemaker/javamaker/types.idl"/>
+            <file name="${test.src.dir}/test/codemaker/javamaker/java15/types15.idl"/>
+        </filelist>
+
+    </target>
+
+</project>
+
diff --git a/codemaker/test/javamaker/makefile.mk b/codemaker/test/javamaker/makefile.mk
deleted file mode 100644
index 560469ed72fa..000000000000
--- a/codemaker/test/javamaker/makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ := ..$/..
-PRJNAME := codemaker
-TARGET := test_codemaker_javamaker
-
-PACKAGE := test$/codemaker$/javamaker
-JAVATESTFILES := Test.java
-IDLTESTFILES := types.idl
-JARFILES := juh.jar jurt.jar ridl.jar OOoRunner.jar
-
-JAVAMAKER = $(AUGMENT_LIBRARY_PATH) $(BIN)$/javamaker$(EXECPOST)
-
-.INCLUDE: javaunittest.mk
-
-$(MISC)$/$(TARGET).javamaker.flag: $(BIN)$/javamaker$(EXECPOST)
diff --git a/codemaker/test/javamaker/Test.java b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/Javamaker_Test.java
index 0c0cdf78f90b..06eb16f75f2e 100644
--- a/codemaker/test/javamaker/Test.java
+++ b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/Javamaker_Test.java
@@ -30,8 +30,9 @@ import com.sun.star.uno.DeploymentException;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XNamingService;
-import complexlib.ComplexTestCase;
 import java.util.EventListener;
+import org.junit.Before;
+import org.junit.Test;
 import test.codemaker.javamaker.Enum1;
 import test.codemaker.javamaker.Enum2;
 import test.codemaker.javamaker.PolyStruct;
@@ -74,155 +75,156 @@ import test.codemaker.javamaker.services.service_volatile;
 import test.codemaker.javamaker.services.service_while;
 import test.codemaker.javamaker.singleton_abstract;
 
-public final class Test extends ComplexTestCase {
-    public String[] getTestMethodNames() {
-        return new String[] {
-            "testEnum1", "testEnum2", "testPolyStruct", "testEmptyStruct2",
-            "testFullStruct2", "testXEventListener", "testS1", "testS2",
-            "testKeywordServices", "testSingletons" };
-    }
+import static org.junit.Assert.*;
 
+public final class Javamaker_Test {
+    @Before
     public void before() throws Exception {
         context = Bootstrap.createInitialComponentContext(null);
     }
 
+    @Test
     public void testEnum1() {
-        assure(Enum1.VALUE1.getValue() == -100);
-        assure(Enum1.VALUE2.getValue() == 100);
-        assure(Enum1.VALUE1_value == -100);
-        assure(Enum1.VALUE2_value == 100);
-        assure(Enum1.getDefault() == Enum1.VALUE1);
-        assure(Enum1.fromInt(-101) == null);
-        assure(Enum1.fromInt(-100) == Enum1.VALUE1);
-        assure(Enum1.fromInt(-99) == null);
-        assure(Enum1.fromInt(0) == null);
-        assure(Enum1.fromInt(99) == null);
-        assure(Enum1.fromInt(100) == Enum1.VALUE2);
-        assure(Enum1.fromInt(101) == null);
+        assertTrue(Enum1.VALUE1.getValue() == -100);
+        assertTrue(Enum1.VALUE2.getValue() == 100);
+        assertTrue(Enum1.VALUE1_value == -100);
+        assertTrue(Enum1.VALUE2_value == 100);
+        assertTrue(Enum1.getDefault() == Enum1.VALUE1);
+        assertTrue(Enum1.fromInt(-101) == null);
+        assertTrue(Enum1.fromInt(-100) == Enum1.VALUE1);
+        assertTrue(Enum1.fromInt(-99) == null);
+        assertTrue(Enum1.fromInt(0) == null);
+        assertTrue(Enum1.fromInt(99) == null);
+        assertTrue(Enum1.fromInt(100) == Enum1.VALUE2);
+        assertTrue(Enum1.fromInt(101) == null);
     }
 
+    @Test
     public void testEnum2() {
-        assure(Enum2.VALUE0.getValue() == 0);
-        assure(Enum2.VALUE1.getValue() == 1);
-        assure(Enum2.VALUE2.getValue() == 2);
-        assure(Enum2.VALUE4.getValue() == 4);
-        assure(Enum2.VALUE0_value == 0);
-        assure(Enum2.VALUE1_value == 1);
-        assure(Enum2.VALUE2_value == 2);
-        assure(Enum2.VALUE4_value == 4);
-        assure(Enum2.getDefault() == Enum2.VALUE0);
-        assure(Enum2.fromInt(-1) == null);
-        assure(Enum2.fromInt(0) == Enum2.VALUE0);
-        assure(Enum2.fromInt(1) == Enum2.VALUE1);
-        assure(Enum2.fromInt(2) == Enum2.VALUE2);
-        assure(Enum2.fromInt(3) == null);
-        assure(Enum2.fromInt(4) == Enum2.VALUE4);
-        assure(Enum2.fromInt(5) == null);
+        assertTrue(Enum2.VALUE0.getValue() == 0);
+        assertTrue(Enum2.VALUE1.getValue() == 1);
+        assertTrue(Enum2.VALUE2.getValue() == 2);
+        assertTrue(Enum2.VALUE4.getValue() == 4);
+        assertTrue(Enum2.VALUE0_value == 0);
+        assertTrue(Enum2.VALUE1_value == 1);
+        assertTrue(Enum2.VALUE2_value == 2);
+        assertTrue(Enum2.VALUE4_value == 4);
+        assertTrue(Enum2.getDefault() == Enum2.VALUE0);
+        assertTrue(Enum2.fromInt(-1) == null);
+        assertTrue(Enum2.fromInt(0) == Enum2.VALUE0);
+        assertTrue(Enum2.fromInt(1) == Enum2.VALUE1);
+        assertTrue(Enum2.fromInt(2) == Enum2.VALUE2);
+        assertTrue(Enum2.fromInt(3) == null);
+        assertTrue(Enum2.fromInt(4) == Enum2.VALUE4);
+        assertTrue(Enum2.fromInt(5) == null);
     }
 
+    @Test
     public void testPolyStruct() {
         PolyStruct s = new PolyStruct();
-        assure(s.member1 == null);
-        assure(s.member2 == 0);
+        assertTrue(s.member1 == null);
+        assertTrue(s.member2 == 0);
         s = new PolyStruct("ABC", 5);
-        assure(s.member1.equals("ABC"));
-        assure(s.member2 == 5);
+        assertTrue(s.member1.equals("ABC"));
+        assertTrue(s.member2 == 5);
     }
 
+    @Test
     public void testEmptyStruct2() {
         Struct2 s = new Struct2();
-        assure(s.p1 == false);
-        assure(s.p2 == 0);
-        assure(s.p3 == 0);
-        assure(s.p4 == 0);
-        assure(s.p5 == 0);
-        assure(s.p6 == 0);
-        assure(s.p7 == 0L);
-        assure(s.p8 == 0L);
-        assure(s.p9 == 0.0f);
-        assure(s.p10 == 0.0);
-        assure(s.p11 == '\u0000');
-        assure(s.p12.equals(""));
-        assure(s.p13.equals(Type.VOID));
-        assure(s.p14.equals(Any.VOID));
-        assure(s.p15 == Enum2.VALUE0);
-        assure(s.p16.member1 == 0);
-        assure(s.p17 == null);
-        assure(s.p18 == null);
-        assure(s.t1 == false);
-        assure(s.t2 == 0);
-        assure(s.t3 == 0);
-        assure(s.t4 == 0);
-        assure(s.t5 == 0);
-        assure(s.t6 == 0);
-        assure(s.t7 == 0L);
-        assure(s.t8 == 0L);
-        assure(s.t9 == 0.0f);
-        assure(s.t10 == 0.0);
-        assure(s.t11 == '\u0000');
-        assure(s.t12.equals(""));
-        assure(s.t13.equals(Type.VOID));
-        assure(s.t14.equals(Any.VOID));
-        assure(s.t15 == Enum2.VALUE0);
-        assure(s.t16.member1 == 0);
-        assure(s.t17 == null);
-        assure(s.t18 == null);
-        assure(s.a1.length == 0);
-        assure(s.a2.length == 0);
-        assure(s.a3.length == 0);
-        assure(s.a4.length == 0);
-        assure(s.a5.length == 0);
-        assure(s.a6.length == 0);
-        assure(s.a7.length == 0);
-        assure(s.a8.length == 0);
-        assure(s.a9.length == 0);
-        assure(s.a10.length == 0);
-        assure(s.a11.length == 0);
-        assure(s.a12.length == 0);
-        assure(s.a13.length == 0);
-        assure(s.a14.length == 0);
-        assure(s.a15.length == 0);
-        assure(s.a16.length == 0);
-        assure(s.a17.length == 0);
-        assure(s.a18.length == 0);
-        assure(s.aa1.length == 0);
-        assure(s.aa2.length == 0);
-        assure(s.aa3.length == 0);
-        assure(s.aa4.length == 0);
-        assure(s.aa5.length == 0);
-        assure(s.aa6.length == 0);
-        assure(s.aa7.length == 0);
-        assure(s.aa8.length == 0);
-        assure(s.aa9.length == 0);
-        assure(s.aa10.length == 0);
-        assure(s.aa11.length == 0);
-        assure(s.aa12.length == 0);
-        assure(s.aa13.length == 0);
-        assure(s.aa14.length == 0);
-        assure(s.aa15.length == 0);
-        assure(s.aa16.length == 0);
-        assure(s.aa17.length == 0);
-        assure(s.aa18.length == 0);
-        assure(s.at1.length == 0);
-        assure(s.at2.length == 0);
-        assure(s.at3.length == 0);
-        assure(s.at4.length == 0);
-        assure(s.at5.length == 0);
-        assure(s.at6.length == 0);
-        assure(s.at7.length == 0);
-        assure(s.at8.length == 0);
-        assure(s.at9.length == 0);
-        assure(s.at10.length == 0);
-        assure(s.at11.length == 0);
-        assure(s.at12.length == 0);
-        assure(s.at13.length == 0);
-        assure(s.at14.length == 0);
-        assure(s.at15.length == 0);
-        assure(s.at16.length == 0);
-        assure(s.at17.length == 0);
-        assure(s.at18.length == 0);
+        assertTrue(s.p1 == false);
+        assertTrue(s.p2 == 0);
+        assertTrue(s.p3 == 0);
+        assertTrue(s.p4 == 0);
+        assertTrue(s.p5 == 0);
+        assertTrue(s.p6 == 0);
+        assertTrue(s.p7 == 0L);
+        assertTrue(s.p8 == 0L);
+        assertTrue(s.p9 == 0.0f);
+        assertTrue(s.p10 == 0.0);
+        assertTrue(s.p11 == '\u0000');
+        assertTrue(s.p12.equals(""));
+        assertTrue(s.p13.equals(Type.VOID));
+        assertTrue(s.p14.equals(Any.VOID));
+        assertTrue(s.p15 == Enum2.VALUE0);
+        assertTrue(s.p16.member1 == 0);
+        assertTrue(s.p17 == null);
+        assertTrue(s.p18 == null);
+        assertTrue(s.t1 == false);
+        assertTrue(s.t2 == 0);
+        assertTrue(s.t3 == 0);
+        assertTrue(s.t4 == 0);
+        assertTrue(s.t5 == 0);
+        assertTrue(s.t6 == 0);
+        assertTrue(s.t7 == 0L);
+        assertTrue(s.t8 == 0L);
+        assertTrue(s.t9 == 0.0f);
+        assertTrue(s.t10 == 0.0);
+        assertTrue(s.t11 == '\u0000');
+        assertTrue(s.t12.equals(""));
+        assertTrue(s.t13.equals(Type.VOID));
+        assertTrue(s.t14.equals(Any.VOID));
+        assertTrue(s.t15 == Enum2.VALUE0);
+        assertTrue(s.t16.member1 == 0);
+        assertTrue(s.t17 == null);
+        assertTrue(s.t18 == null);
+        assertTrue(s.a1.length == 0);
+        assertTrue(s.a2.length == 0);
+        assertTrue(s.a3.length == 0);
+        assertTrue(s.a4.length == 0);
+        assertTrue(s.a5.length == 0);
+        assertTrue(s.a6.length == 0);
+        assertTrue(s.a7.length == 0);
+        assertTrue(s.a8.length == 0);
+        assertTrue(s.a9.length == 0);
+        assertTrue(s.a10.length == 0);
+        assertTrue(s.a11.length == 0);
+        assertTrue(s.a12.length == 0);
+        assertTrue(s.a13.length == 0);
+        assertTrue(s.a14.length == 0);
+        assertTrue(s.a15.length == 0);
+        assertTrue(s.a16.length == 0);
+        assertTrue(s.a17.length == 0);
+        assertTrue(s.a18.length == 0);
+        assertTrue(s.aa1.length == 0);
+        assertTrue(s.aa2.length == 0);
+        assertTrue(s.aa3.length == 0);
+        assertTrue(s.aa4.length == 0);
+        assertTrue(s.aa5.length == 0);
+        assertTrue(s.aa6.length == 0);
+        assertTrue(s.aa7.length == 0);
+        assertTrue(s.aa8.length == 0);
+        assertTrue(s.aa9.length == 0);
+        assertTrue(s.aa10.length == 0);
+        assertTrue(s.aa11.length == 0);
+        assertTrue(s.aa12.length == 0);
+        assertTrue(s.aa13.length == 0);
+        assertTrue(s.aa14.length == 0);
+        assertTrue(s.aa15.length == 0);
+        assertTrue(s.aa16.length == 0);
+        assertTrue(s.aa17.length == 0);
+        assertTrue(s.aa18.length == 0);
+        assertTrue(s.at1.length == 0);
+        assertTrue(s.at2.length == 0);
+        assertTrue(s.at3.length == 0);
+        assertTrue(s.at4.length == 0);
+        assertTrue(s.at5.length == 0);
+        assertTrue(s.at6.length == 0);
+        assertTrue(s.at7.length == 0);
+        assertTrue(s.at8.length == 0);
+        assertTrue(s.at9.length == 0);
+        assertTrue(s.at10.length == 0);
+        assertTrue(s.at11.length == 0);
+        assertTrue(s.at12.length == 0);
+        assertTrue(s.at13.length == 0);
+        assertTrue(s.at14.length == 0);
+        assertTrue(s.at15.length == 0);
+        assertTrue(s.at16.length == 0);
+        assertTrue(s.at17.length == 0);
+        assertTrue(s.at18.length == 0);
     }
 
+    @Test
     public void testFullStruct2() {
         //TODO:
         Struct2 s = new Struct2(
@@ -247,125 +249,127 @@ public final class Test extends ComplexTestCase {
             new char[0][], new String[0][], new Type[0][], new Object[0][],
             new Enum2[0][], new Struct1[0][], new Object[0][],
             new XNamingService[0][]);
-        assure(s.p1 == true);
-        assure(s.p2 == 1);
-        assure(s.p3 == 2);
-        assure(s.p4 == 3);
-        assure(s.p5 == 4);
-        assure(s.p6 == 5);
-        assure(s.p7 == 6L);
-        assure(s.p8 == 7L);
-        assure(s.p9 == 0.8f);
-        assure(s.p10 == 0.9);
-        assure(s.p11 == 'A');
-        assure(s.p12.equals("BCD"));
-        assure(s.p13.equals(Type.UNSIGNED_HYPER));
-        assure(s.p14.equals(new Integer(22)));
-        assure(s.p15 == Enum2.VALUE4);
-        assure(s.p16.member1 == 1);
-        assure(s.p17 == null);
-        assure(s.p18 == null);
-        assure(s.t1 == false);
-        assure(s.t2 == 0);
-        assure(s.t3 == 0);
-        assure(s.t4 == 0);
-        assure(s.t5 == 0);
-        assure(s.t6 == 0);
-        assure(s.t7 == 0L);
-        assure(s.t8 == 0L);
-        assure(s.t9 == 0.0f);
-        assure(s.t10 == 0.0);
-        assure(s.t11 == '\u0000');
-        assure(s.t12.equals(""));
-        assure(s.t13.equals(Type.VOID));
-        assure(s.t14.equals(Any.VOID));
-        assure(s.t15 == Enum2.VALUE0);
-        assure(s.t16.member1 == 0);
-        assure(s.t17 == null);
-        assure(s.t18 == null);
-        assure(s.a1.length == 2);
-        assure(s.a1[0] == false);
-        assure(s.a1[1] == true);
-        assure(s.a2.length == 2);
-        assure(s.a2[0] == 1);
-        assure(s.a2[1] == 2);
-        assure(s.a3.length == 0);
-        assure(s.a4.length == 0);
-        assure(s.a5.length == 0);
-        assure(s.a6.length == 0);
-        assure(s.a7.length == 0);
-        assure(s.a8.length == 0);
-        assure(s.a9.length == 0);
-        assure(s.a10.length == 0);
-        assure(s.a11.length == 0);
-        assure(s.a12.length == 0);
-        assure(s.a13.length == 0);
-        assure(s.a14.length == 0);
-        assure(s.a15.length == 0);
-        assure(s.a16.length == 2);
-        assure(s.a16[0].member1 == 1);
-        assure(s.a16[1].member1 == 2);
-        assure(s.a17.length == 0);
-        assure(s.a18.length == 0);
-        assure(s.aa1.length == 0);
-        assure(s.aa2.length == 0);
-        assure(s.aa3.length == 0);
-        assure(s.aa4.length == 0);
-        assure(s.aa5.length == 0);
-        assure(s.aa6.length == 0);
-        assure(s.aa7.length == 0);
-        assure(s.aa8.length == 0);
-        assure(s.aa9.length == 0);
-        assure(s.aa10.length == 0);
-        assure(s.aa11.length == 0);
-        assure(s.aa12.length == 0);
-        assure(s.aa13.length == 0);
-        assure(s.aa14.length == 0);
-        assure(s.aa15.length == 0);
-        assure(s.aa16.length == 0);
-        assure(s.aa17.length == 0);
-        assure(s.aa18.length == 0);
-        assure(s.at1.length == 0);
-        assure(s.at2.length == 0);
-        assure(s.at3.length == 0);
-        assure(s.at4.length == 0);
-        assure(s.at5.length == 0);
-        assure(s.at6.length == 0);
-        assure(s.at7.length == 0);
-        assure(s.at8.length == 0);
-        assure(s.at9.length == 0);
-        assure(s.at10.length == 0);
-        assure(s.at11.length == 0);
-        assure(s.at12.length == 0);
-        assure(s.at13.length == 0);
-        assure(s.at14.length == 0);
-        assure(s.at15.length == 0);
-        assure(s.at16.length == 0);
-        assure(s.at17.length == 0);
-        assure(s.at18.length == 0);
+        assertTrue(s.p1 == true);
+        assertTrue(s.p2 == 1);
+        assertTrue(s.p3 == 2);
+        assertTrue(s.p4 == 3);
+        assertTrue(s.p5 == 4);
+        assertTrue(s.p6 == 5);
+        assertTrue(s.p7 == 6L);
+        assertTrue(s.p8 == 7L);
+        assertTrue(s.p9 == 0.8f);
+        assertTrue(s.p10 == 0.9);
+        assertTrue(s.p11 == 'A');
+        assertTrue(s.p12.equals("BCD"));
+        assertTrue(s.p13.equals(Type.UNSIGNED_HYPER));
+        assertTrue(s.p14.equals(new Integer(22)));
+        assertTrue(s.p15 == Enum2.VALUE4);
+        assertTrue(s.p16.member1 == 1);
+        assertTrue(s.p17 == null);
+        assertTrue(s.p18 == null);
+        assertTrue(s.t1 == false);
+        assertTrue(s.t2 == 0);
+        assertTrue(s.t3 == 0);
+        assertTrue(s.t4 == 0);
+        assertTrue(s.t5 == 0);
+        assertTrue(s.t6 == 0);
+        assertTrue(s.t7 == 0L);
+        assertTrue(s.t8 == 0L);
+        assertTrue(s.t9 == 0.0f);
+        assertTrue(s.t10 == 0.0);
+        assertTrue(s.t11 == '\u0000');
+        assertTrue(s.t12.equals(""));
+        assertTrue(s.t13.equals(Type.VOID));
+        assertTrue(s.t14.equals(Any.VOID));
+        assertTrue(s.t15 == Enum2.VALUE0);
+        assertTrue(s.t16.member1 == 0);
+        assertTrue(s.t17 == null);
+        assertTrue(s.t18 == null);
+        assertTrue(s.a1.length == 2);
+        assertTrue(s.a1[0] == false);
+        assertTrue(s.a1[1] == true);
+        assertTrue(s.a2.length == 2);
+        assertTrue(s.a2[0] == 1);
+        assertTrue(s.a2[1] == 2);
+        assertTrue(s.a3.length == 0);
+        assertTrue(s.a4.length == 0);
+        assertTrue(s.a5.length == 0);
+        assertTrue(s.a6.length == 0);
+        assertTrue(s.a7.length == 0);
+        assertTrue(s.a8.length == 0);
+        assertTrue(s.a9.length == 0);
+        assertTrue(s.a10.length == 0);
+        assertTrue(s.a11.length == 0);
+        assertTrue(s.a12.length == 0);
+        assertTrue(s.a13.length == 0);
+        assertTrue(s.a14.length == 0);
+        assertTrue(s.a15.length == 0);
+        assertTrue(s.a16.length == 2);
+        assertTrue(s.a16[0].member1 == 1);
+        assertTrue(s.a16[1].member1 == 2);
+        assertTrue(s.a17.length == 0);
+        assertTrue(s.a18.length == 0);
+        assertTrue(s.aa1.length == 0);
+        assertTrue(s.aa2.length == 0);
+        assertTrue(s.aa3.length == 0);
+        assertTrue(s.aa4.length == 0);
+        assertTrue(s.aa5.length == 0);
+        assertTrue(s.aa6.length == 0);
+        assertTrue(s.aa7.length == 0);
+        assertTrue(s.aa8.length == 0);
+        assertTrue(s.aa9.length == 0);
+        assertTrue(s.aa10.length == 0);
+        assertTrue(s.aa11.length == 0);
+        assertTrue(s.aa12.length == 0);
+        assertTrue(s.aa13.length == 0);
+        assertTrue(s.aa14.length == 0);
+        assertTrue(s.aa15.length == 0);
+        assertTrue(s.aa16.length == 0);
+        assertTrue(s.aa17.length == 0);
+        assertTrue(s.aa18.length == 0);
+        assertTrue(s.at1.length == 0);
+        assertTrue(s.at2.length == 0);
+        assertTrue(s.at3.length == 0);
+        assertTrue(s.at4.length == 0);
+        assertTrue(s.at5.length == 0);
+        assertTrue(s.at6.length == 0);
+        assertTrue(s.at7.length == 0);
+        assertTrue(s.at8.length == 0);
+        assertTrue(s.at9.length == 0);
+        assertTrue(s.at10.length == 0);
+        assertTrue(s.at11.length == 0);
+        assertTrue(s.at12.length == 0);
+        assertTrue(s.at13.length == 0);
+        assertTrue(s.at14.length == 0);
+        assertTrue(s.at15.length == 0);
+        assertTrue(s.at16.length == 0);
+        assertTrue(s.at17.length == 0);
+        assertTrue(s.at18.length == 0);
     }
 
+    @Test
     public void testXEventListener() {
-        assure(EventListener.class.isAssignableFrom(XEventListener.class));
+        assertTrue(EventListener.class.isAssignableFrom(XEventListener.class));
     }
 
+    @Test
     public void testS1() throws com.sun.star.uno.Exception {
         //TODO:
         try {
             S1.create1(context);
-            failed("S1.create1");
+            fail("S1.create1");
         } catch (DeploymentException e) {}
         try {
             S1.create2(context, new Any[0]);
-            failed("S1.create2");
+            fail("S1.create2");
         } catch (com.sun.star.uno.Exception e) {}
         try {
             S1.create3(context, new Any[0]);
-            failed("S1.create3");
+            fail("S1.create3");
         } catch (DeploymentException e) {}
         try {
             S1.create4(context, 0, 0, 0);
-            failed("S1.create4");
+            fail("S1.create4");
         } catch (DeploymentException e) {}
         try {
             S1.create5(
@@ -389,165 +393,168 @@ public final class Test extends ComplexTestCase {
                 new char[0][], new String[0][], new Type[0][], new Object[0][],
                 new Enum2[0][], new Struct1[0][], new Object[0][],
                 new XNamingService[0][]);
-            failed("S1.create4");
+            fail("S1.create4");
         } catch (DeploymentException e) {}
     }
 
+    @Test
     public void testS2() {
         //TODO
     }
 
+    @Test
     public void testKeywordServices() {
         try {
             service_abstract.method_abstract(context, 0);
-            failed("service_abstract.method_abstract");
+            fail("service_abstract.method_abstract");
         } catch (DeploymentException e) {}
         try {
             service_assert.method_assert(context, 0);
-            failed("service_assert.method_assert");
+            fail("service_assert.method_assert");
         } catch (DeploymentException e) {}
         try {
             service_break.method_break(context, 0);
-            failed("service_break.method_break");
+            fail("service_break.method_break");
         } catch (DeploymentException e) {}
         try {
             service_catch.method_catch(context, 0);
-            failed("service_catch.method_catch");
+            fail("service_catch.method_catch");
         } catch (DeploymentException e) {}
         try {
             service_class.method_class(context, 0);
-            failed("service_class.method_class");
+            fail("service_class.method_class");
         } catch (DeploymentException e) {}
         try {
             service_continue.method_continue(context, 0);
-            failed("service_continue.method_continue");
+            fail("service_continue.method_continue");
         } catch (DeploymentException e) {}
         try {
             service_do.method_do(context, 0);
-            failed("service_do.method_do");
+            fail("service_do.method_do");
         } catch (DeploymentException e) {}
         try {
             service_else.method_else(context, 0);
-            failed("service_else.method_else");
+            fail("service_else.method_else");
         } catch (DeploymentException e) {}
         try {
             service_extends.method_extends(context, 0);
-            failed("service_extends.method_extends");
+            fail("service_extends.method_extends");
         } catch (DeploymentException e) {}
         try {
             service_final.method_final(context, 0);
-            failed("service_final.method_final");
+            fail("service_final.method_final");
         } catch (DeploymentException e) {}
         try {
             service_finally.method_finally(context, 0);
-            failed("service_finally.method_finally");
+            fail("service_finally.method_finally");
         } catch (DeploymentException e) {}
         try {
             service_for.method_for(context, 0);
-            failed("service_for.method_for");
+            fail("service_for.method_for");
         } catch (DeploymentException e) {}
         try {
             service_goto.method_goto(context, 0);
-            failed("service_goto.method_goto");
+            fail("service_goto.method_goto");
         } catch (DeploymentException e) {}
         try {
             service_if.method_if(context, 0);
-            failed("service_if.method_if");
+            fail("service_if.method_if");
         } catch (DeploymentException e) {}
         try {
             service_implements.method_implements(context, 0);
-            failed("service_implements.method_implements");
+            fail("service_implements.method_implements");
         } catch (DeploymentException e) {}
         try {
             service_import.method_import(context, 0);
-            failed("service_import.method_import");
+            fail("service_import.method_import");
         } catch (DeploymentException e) {}
         try {
             service_instanceof.method_instanceof(context, 0);
-            failed("service_instanceof.method_instanceof");
+            fail("service_instanceof.method_instanceof");
         } catch (DeploymentException e) {}
         try {
             service_int.method_int(context, 0);
-            failed("service_int.method_int");
+            fail("service_int.method_int");
         } catch (DeploymentException e) {}
         try {
             service_native.method_native(context, 0);
-            failed("service_native.method_native");
+            fail("service_native.method_native");
         } catch (DeploymentException e) {}
         try {
             service_new.method_new(context, 0);
-            failed("service_new.method_new");
+            fail("service_new.method_new");
         } catch (DeploymentException e) {}
         try {
             service_package.method_package(context, 0);
-            failed("service_package.method_package");
+            fail("service_package.method_package");
         } catch (DeploymentException e) {}
         try {
             service_private.method_private(context, 0);
-            failed("service_private.method_private");
+            fail("service_private.method_private");
         } catch (DeploymentException e) {}
         try {
             service_protected.method_protected(context, 0);
-            failed("service_protected.method_protected");
+            fail("service_protected.method_protected");
         } catch (DeploymentException e) {}
         try {
             service_public.method_public(context, 0);
-            failed("service_public.method_public");
+            fail("service_public.method_public");
         } catch (DeploymentException e) {}
         try {
             service_return.method_return(context, 0);
-            failed("service_return.method_return");
+            fail("service_return.method_return");
         } catch (DeploymentException e) {}
         try {
             service_static.method_static(context, 0);
-            failed("service_static.method_static");
+            fail("service_static.method_static");
         } catch (DeploymentException e) {}
         try {
             service_strictfp.method_strictfp(context, 0);
-            failed("service_strictfp.method_strictfp");
+            fail("service_strictfp.method_strictfp");
         } catch (DeploymentException e) {}
         try {
             service_super.method_super(context, 0);
-            failed("service_super.method_super");
+            fail("service_super.method_super");
         } catch (DeploymentException e) {}
         try {
             service_synchronized.method_synchronized(context, 0);
-            failed("service_synchronized.method_synchronized");
+            fail("service_synchronized.method_synchronized");
         } catch (DeploymentException e) {}
         try {
             service_this.method_this(context, 0);
-            failed("service_this.method_this");
+            fail("service_this.method_this");
         } catch (DeploymentException e) {}
         try {
             service_throw.method_throw(context, 0);
-            failed("service_throw.method_throw");
+            fail("service_throw.method_throw");
         } catch (DeploymentException e) {}
         try {
             service_throws.method_throws(context, 0);
-            failed("service_throws.method_throws");
+            fail("service_throws.method_throws");
         } catch (DeploymentException e) {}
         try {
             service_try.method_try(context, 0);
-            failed("service_try.method_try");
+            fail("service_try.method_try");
         } catch (DeploymentException e) {}
         try {
             service_volatile.method_volatile(context, 0);
-            failed("service_volatile.method_volatile");
+            fail("service_volatile.method_volatile");
         } catch (DeploymentException e) {}
         try {
             service_while.method_while(context, 0);
-            failed("service_while.method_while");
+            fail("service_while.method_while");
         } catch (DeploymentException e) {}
     }
 
+    @Test
     public void testSingletons() {
         try {
             S4.get(context);
-            failed("S4");
+            fail("S4");
         } catch (DeploymentException e) {}
         try {
             singleton_abstract.get(context);
-            failed("singleton_abstract");
+            fail("singleton_abstract");
         } catch (DeploymentException e) {}
     }
 
diff --git a/codemaker/test/javamaker/java15/Test.java b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/Java15Javamaker_Test.java
index b0133dcbccc9..00e32290398f 100644
--- a/codemaker/test/javamaker/java15/Test.java
+++ b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/Java15Javamaker_Test.java
@@ -26,47 +26,47 @@ package test.codemaker.javamaker.java15;
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.uno.DeploymentException;
 import com.sun.star.uno.XComponentContext;
-import complexlib.ComplexTestCase;
+import org.junit.Test;
 
-public final class Test extends ComplexTestCase {
-    public String[] getTestMethodNames() {
-        return new String[] {
-            "testPlainPolyStruct", "testBooleanPolyStruct", "testStruct",
-            "testService" };
-    }
+import static org.junit.Assert.*;
 
+public final class Java15Javamaker_Test {
+    @Test
     public void testPlainPolyStruct() {
         PolyStruct s = new PolyStruct();
-        assure(s.member1 == null);
-        assure(s.member2 == 0);
+        assertTrue(s.member1 == null);
+        assertTrue(s.member2 == 0);
         s = new PolyStruct("ABC", 5);
-        assure(s.member1.equals("ABC"));
-        assure(s.member2 == 5);
+        assertTrue(s.member1.equals("ABC"));
+        assertTrue(s.member2 == 5);
     }
 
+    @Test
     public void testBooleanPolyStruct() {
         PolyStruct<Boolean,Object> s = new PolyStruct<Boolean,Object>();
-        assure(s.member1 == null);
-        assure(s.member2 == 0);
+        assertTrue(s.member1 == null);
+        assertTrue(s.member2 == 0);
         s = new PolyStruct<Boolean,Object>(true, 5);
-        assure(s.member1 == true);
-        assure(s.member2 == 5);
+        assertTrue(s.member1 == true);
+        assertTrue(s.member2 == 5);
     }
 
+    @Test
     public void testStruct() {
         Struct s = new Struct();
-        assure(s.member.member1 == null);
-        assure(s.member.member2 == 0);
+        assertTrue(s.member.member1 == null);
+        assertTrue(s.member.member2 == 0);
         s = new Struct(
             new PolyStruct<PolyStruct<boolean[], Object>, Integer>(
                 new PolyStruct<boolean[], Object>(new boolean[] { true }, 3),
                 4));
-        assure(s.member.member1.member1.length == 1);
-        assure(s.member.member1.member1[0] == true);
-        assure(s.member.member1.member2 == 3);
-        assure(s.member.member2 == 4);
+        assertTrue(s.member.member1.member1.length == 1);
+        assertTrue(s.member.member1.member1[0] == true);
+        assertTrue(s.member.member1.member2 == 3);
+        assertTrue(s.member.member2 == 4);
     }
 
+    @Test
     public void testService() {
         XComponentContext context = new XComponentContext() {
                 public Object getValueByName(String name) {
@@ -79,12 +79,12 @@ public final class Test extends ComplexTestCase {
             };
         try {
             Service.create(context);
-            failed();
+            fail();
         } catch (DeploymentException e) {}
         try {
             Service.create(
                 context, false, (byte) 1, (short) 2, Integer.valueOf(4));
-            failed();
+            fail();
         } catch (DeploymentException e) {}
     }
 
diff --git a/codemaker/test/javamaker/java15/makefile.mk b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/makefile.mk
index 170b0d3b5d57..170b0d3b5d57 100644
--- a/codemaker/test/javamaker/java15/makefile.mk
+++ b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/makefile.mk
diff --git a/codemaker/test/javamaker/java15/types.idl b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/types.idl
index 4271e121b259..4271e121b259 100644
--- a/codemaker/test/javamaker/java15/types.idl
+++ b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/types.idl
diff --git a/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/types15.idl b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/types15.idl
new file mode 100644
index 000000000000..4271e121b259
--- /dev/null
+++ b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/types15.idl
@@ -0,0 +1,46 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#include "com/sun/star/uno/XInterface.idl"
+
+module test { module codemaker { module javamaker { module java15 {
+
+struct PolyStruct<if,else> {
+    if member1;
+    long member2;
+};
+
+struct Struct {
+    PolyStruct<PolyStruct<sequence<boolean>,any>,long> member;
+};
+
+service Service: com::sun::star::uno::XInterface {
+    create([in] any... args);
+};
+
+interface XIfc {
+    void f1([in] PolyStruct<long, long> arg);
+    void f2([in] PolyStruct<any, com::sun::star::uno::XInterface> arg);
+};
+
+}; }; }; };
diff --git a/codemaker/test/javamaker/types.idl b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/types.idl
index b390cf6b23a1..b390cf6b23a1 100644
--- a/codemaker/test/javamaker/types.idl
+++ b/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/types.idl