Merge pull request OpenLiberty#20 from crpotter/integration

Initial drop of unit test merge
AidanPolese · Apr 19, 2017 · e1f091c · e1f091c
2 parents 76bbbcf + ec66457
commit e1f091c
Show file tree

Hide file tree

Showing 511 changed files with 278 additions and 16,716 deletions.
diff --git a/dev/com.ibm.ws.common.encoder/.classpath b/dev/com.ibm.ws.common.encoder/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/dev/com.ibm.ws.common.encoder/.gitignore b/dev/com.ibm.ws.common.encoder/.gitignore
@@ -1,2 +1,3 @@
 /bin/
+/bin_test/
 /generated/
diff --git a/dev/com.ibm.ws.common.encoder/bnd.bnd b/dev/com.ibm.ws.common.encoder/bnd.bnd
@@ -12,3 +12,13 @@ publish.wlp.jar.disabled: true
 -buildpath: \
 	${javac.bootclasspath.java6}, \
 	com.ibm.ws.org.osgi.annotation.versioning.1.0.0;version=latest
+
+-testpath: \
+	../build.sharedResources/lib/junit/old/junit.jar;version=file, \
+	../build.sharedResources/lib/ws-junit/ws-junit.jar;version=file, \
+	../build.sharedResources/lib/hamcrest-all.jar;version=file, \
+	../build.sharedResources/lib/jmock/old/jmock-junit4.jar;version=file, \
+	../build.sharedResources/lib/jmock/old/jmock.jar;version=file, \
+    com.ibm.ws.logging;version=latest, \
+    com.ibm.ws.kernel.boot.logging;version=latest, \
+    com.ibm.ws.kernel.security.thread;version=latest
diff --git a/...ws.common.encoder_test/build-unittest.xml → ....ibm.ws.common.encoder/build-unittest.xml b/...ws.common.encoder_test/build-unittest.xml → ....ibm.ws.common.encoder/build-unittest.xml
diff --git a/...mon/internal/encoder/Base64CoderTest.java → ...mon/internal/encoder/Base64CoderTest.java b/...mon/internal/encoder/Base64CoderTest.java → ...mon/internal/encoder/Base64CoderTest.java
diff --git a/dev/com.ibm.ws.common.encoder_test/.classpath b/dev/com.ibm.ws.common.encoder_test/.classpath
diff --git a/dev/com.ibm.ws.common.encoder_test/.classpath.gradle b/dev/com.ibm.ws.common.encoder_test/.classpath.gradle
diff --git a/dev/com.ibm.ws.common.encoder_test/.gitignore b/dev/com.ibm.ws.common.encoder_test/.gitignore
diff --git a/dev/com.ibm.ws.common.encoder_test/.project b/dev/com.ibm.ws.common.encoder_test/.project
diff --git a/dev/com.ibm.ws.common.encoder_test/.settings/org.eclipse.core.resources.prefs b/dev/com.ibm.ws.common.encoder_test/.settings/org.eclipse.core.resources.prefs
diff --git a/dev/com.ibm.ws.common.encoder_test/.settings/org.eclipse.jdt.core.prefs b/dev/com.ibm.ws.common.encoder_test/.settings/org.eclipse.jdt.core.prefs
diff --git a/dev/com.ibm.ws.common.encoder_test/.settings/org.eclipse.jdt.ui.prefs b/dev/com.ibm.ws.common.encoder_test/.settings/org.eclipse.jdt.ui.prefs
diff --git a/dev/com.ibm.ws.common.encoder_test/bnd.bnd b/dev/com.ibm.ws.common.encoder_test/bnd.bnd
diff --git a/dev/com.ibm.ws.common.encoder_test/bnd.bnd.gradle b/dev/com.ibm.ws.common.encoder_test/bnd.bnd.gradle
diff --git a/dev/com.ibm.ws.common.encoder_test/build.gradle b/dev/com.ibm.ws.common.encoder_test/build.gradle
diff --git a/dev/com.ibm.ws.common.encoder_test/delivery.sets b/dev/com.ibm.ws.common.encoder_test/delivery.sets
diff --git a/dev/com.ibm.ws.config.schemagen/.classpath b/dev/com.ibm.ws.config.schemagen/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/dev/com.ibm.ws.config.schemagen/.gitignore b/dev/com.ibm.ws.config.schemagen/.gitignore
@@ -1,2 +1,3 @@
 /bin/
+/bin_test/
 /generated/
diff --git a/dev/com.ibm.ws.config.schemagen/bnd.bnd b/dev/com.ibm.ws.config.schemagen/bnd.bnd
@@ -21,3 +21,13 @@ Private-Package: com.ibm.ws.config.schemagen.internal
 	com.ibm.websphere.org.osgi.core.6.0.0;version=latest,\
 	com.ibm.ws.org.eclipse.equinox.metatype.1.4.200;version=latest,\
 	com.ibm.wsspi.org.osgi.service.metatype.1.3.0;version=latest
+
+-testpath: \
+	../build.sharedResources/lib/junit/old/junit.jar;version=file, \
+	../build.sharedResources/lib/ws-junit/ws-junit.jar;version=file, \
+	../build.sharedResources/lib/hamcrest-all.jar;version=file, \
+	../build.sharedResources/lib/jmock/old/jmock-junit4.jar;version=file, \
+	../build.sharedResources/lib/jmock/old/jmock.jar;version=file, \
+    com.ibm.ws.logging;version=latest, \
+    com.ibm.ws.org.apache.aries.util.1.1.2;version=latest, \
+    com.ibm.ws.kernel.service;version=latest
diff --git a/....config.schemagen_test/build-unittest.xml → ...bm.ws.config.schemagen/build-unittest.xml b/....config.schemagen_test/build-unittest.xml → ...bm.ws.config.schemagen/build-unittest.xml
diff --git a/....schemagen_test/lib/features/myfeature.mf → ...onfig.schemagen/lib/features/myfeature.mf b/....schemagen_test/lib/features/myfeature.mf → ...onfig.schemagen/lib/features/myfeature.mf
diff --git a/...bm.ws.config.schemagen_test/lib/myjar.jar → ...com.ibm.ws.config.schemagen/lib/myjar.jar b/...bm.ws.config.schemagen_test/lib/myjar.jar → ...com.ibm.ws.config.schemagen/lib/myjar.jar
diff --git a/...est/src/OSGI-INF/l10n/metatype.properties → ...en/test/OSGI-INF/l10n/metatype.properties b/...est/src/OSGI-INF/l10n/metatype.properties → ...en/test/OSGI-INF/l10n/metatype.properties
diff --git a/...ittest/src/OSGI-INF/metatype/metatype.xml → ...magen/test/OSGI-INF/metatype/metatype.xml b/...ittest/src/OSGI-INF/metatype/metatype.xml → ...magen/test/OSGI-INF/metatype/metatype.xml
diff --git a/...emagen/internal/GeneratorOptionsTest.java → ...emagen/internal/GeneratorOptionsTest.java b/...emagen/internal/GeneratorOptionsTest.java → ...emagen/internal/GeneratorOptionsTest.java
diff --git a/...schemagen/internal/GeneratorTestBase.java → ...schemagen/internal/GeneratorTestBase.java b/...schemagen/internal/GeneratorTestBase.java → ...schemagen/internal/GeneratorTestBase.java
@@ -55,8 +55,8 @@ public static void setup(String[] args) throws Exception {
     attribs.putValue(Constants.BUNDLE_SYMBOLICNAME, "myjar");
 
     JarOutputStream jarOut = new JarOutputStream(new FileOutputStream(new File(installDir,"lib/myjar.jar")), man);
-    putFile(jarOut, "unittest/src", "OSGI-INF/metatype/metatype.xml");
-    putFile(jarOut, "unittest/src", "OSGI-INF/l10n/metatype.properties");
+    putFile(jarOut, "test", "OSGI-INF/metatype/metatype.xml");
+    putFile(jarOut, "test", "OSGI-INF/l10n/metatype.properties");
     jarOut.close();
 
     copyConfigJar(new File(installDir, "lib"));

diff --git a/...hemagen/internal/Generatorv1TestBase.java → ...hemagen/internal/Generatorv1TestBase.java b/...hemagen/internal/Generatorv1TestBase.java → ...hemagen/internal/Generatorv1TestBase.java
diff --git a/...internal/Generatorv1WithSchema10Test.java → ...internal/Generatorv1WithSchema10Test.java b/...internal/Generatorv1WithSchema10Test.java → ...internal/Generatorv1WithSchema10Test.java
diff --git a/...internal/Generatorv1WithSchema11Test.java → ...internal/Generatorv1WithSchema11Test.java b/...internal/Generatorv1WithSchema11Test.java → ...internal/Generatorv1WithSchema11Test.java
diff --git a/...hemagen/internal/Generatorv2TestBase.java → ...hemagen/internal/Generatorv2TestBase.java b/...hemagen/internal/Generatorv2TestBase.java → ...hemagen/internal/Generatorv2TestBase.java
diff --git a/...internal/Generatorv2WithSchema10Test.java → ...internal/Generatorv2WithSchema10Test.java b/...internal/Generatorv2WithSchema10Test.java → ...internal/Generatorv2WithSchema10Test.java
diff --git a/...internal/Generatorv2WithSchema11Test.java → ...internal/Generatorv2WithSchema11Test.java b/...internal/Generatorv2WithSchema11Test.java → ...internal/Generatorv2WithSchema11Test.java
diff --git a/...Generatorv2WithSchmea11BetaBuildTest.java → ...Generatorv2WithSchmea11BetaBuildTest.java b/...Generatorv2WithSchmea11BetaBuildTest.java → ...Generatorv2WithSchmea11BetaBuildTest.java
diff --git a/...l/Generatorv2WithSchmea11GABuildTest.java → ...l/Generatorv2WithSchmea11GABuildTest.java b/...l/Generatorv2WithSchmea11GABuildTest.java → ...l/Generatorv2WithSchmea11GABuildTest.java
diff --git a/dev/com.ibm.ws.config.schemagen_test/.classpath b/dev/com.ibm.ws.config.schemagen_test/.classpath
diff --git a/dev/com.ibm.ws.config.schemagen_test/.classpath.gradle b/dev/com.ibm.ws.config.schemagen_test/.classpath.gradle
diff --git a/dev/com.ibm.ws.config.schemagen_test/.project b/dev/com.ibm.ws.config.schemagen_test/.project
diff --git a/dev/com.ibm.ws.config.schemagen_test/.settings/org.eclipse.jdt.core.prefs b/dev/com.ibm.ws.config.schemagen_test/.settings/org.eclipse.jdt.core.prefs
diff --git a/dev/com.ibm.ws.config.schemagen_test/bnd.bnd b/dev/com.ibm.ws.config.schemagen_test/bnd.bnd
diff --git a/dev/com.ibm.ws.config.schemagen_test/bnd.bnd.gradle b/dev/com.ibm.ws.config.schemagen_test/bnd.bnd.gradle
diff --git a/dev/com.ibm.ws.config.schemagen_test/build.gradle b/dev/com.ibm.ws.config.schemagen_test/build.gradle
diff --git a/dev/com.ibm.ws.config.schemagen_test/delivery.sets b/dev/com.ibm.ws.config.schemagen_test/delivery.sets
diff --git a/dev/com.ibm.ws.crypto.certificateutil/.classpath b/dev/com.ibm.ws.crypto.certificateutil/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>