[nobug] allow using pure JUnit4 in eclipselink.core.test project
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/foundation/eclipselink.core.test/antbuild.xml b/foundation/eclipselink.core.test/antbuild.xml
index 0b0df93..ab13090 100644
--- a/foundation/eclipselink.core.test/antbuild.xml
+++ b/foundation/eclipselink.core.test/antbuild.xml
@@ -348,6 +348,7 @@
<!-- Default test target, runs test.class from test.properties (default is LRG). -->
<target name="test">
+ <antcall target="run-junit-test" inheritRefs="true" />
<antcall target="run-test" inheritRefs="true">
<param name="TEST_CLASS" value="${test.class}"/>
</antcall>
@@ -359,6 +360,7 @@
<!-- Runs SRG (SRGTestModel). -->
<target name="test-srg">
+ <antcall target="run-junit-test" inheritRefs="true" />
<antcall target="run-test" inheritRefs="true">
<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.SRGTestModel"/>
</antcall>
@@ -427,6 +429,7 @@
<!-- Runs LRG (TestRunModel). -->
<target name="test-lrg">
+ <antcall target="run-junit-test" inheritRefs="true" />
<antcall target="run-test" inheritRefs="true">
<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.TestRunModel"/>
</antcall>
@@ -571,10 +574,42 @@
</junit>
</target>
+ <!-- Generic target for running JUnit tests. -->
+ <target name="run-junit-test" depends="init_paths, process-resource">
+ <echo>Running test on ${db.url}</echo>
+ <mkdir dir="${core_test.run.dir}"/>
+ <mkdir dir="${core_test.report.dir}"/>
+ <!-- Can be set e.g. in test.properties to add VM options for a particular platform/driver -->
+ <property name="additional.jvmargs" value="-Ddummy2=dummy"/>
+ <!-- 282012: On a 64-bit JVM - The XML processing at the end of the testing requires at least 1536 -->
+ <!-- Note: on a legacy XP OS with 4GB ram - the max is 1536 - use of 2048 will cause [junit] [WARN ] Unable to acquire some virtual address space - reduced from 2048 to 1908MB. -->
+ <junit jvm="${test.junit.jvm.exec}" printsummary="yes" failureproperty="junit.failed" fork="yes" showoutput="true" maxmemory="${max.heap.memory}" dir="${core_test.run.dir}">
+ <jvmarg value="-Declipselink.logging.level=${logging.level}"/>
+ <jvmarg value="-Ddb.driver=${db.driver}"/>
+ <jvmarg value="-Ddb.url=${db.url}"/>
+ <jvmarg value="-Ddb.user=${db.user}"/>
+ <jvmarg value="-Ddb.pwd=${db.pwd}"/>
+ <jvmarg value="-Ddb.platform=${db.platform}"/>
+ <jvmarg line="${additional.jvmargs}"/>
+ <jvmarg value="${test.security-manager}"/>
+ <jvmarg value="${test.security-manager.policy}"/>
+ <classpath>
+ <path refid="core_test.run.path"/>
+ </classpath>
+ <formatter type="xml"/>
+ <batchtest haltonfailure="no" todir="${report.dir}">
+ <fileset dir="${core_test.src.dir}">
+ <include name="**/junit/**/*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="generate-report">
<junitreport todir="${core_test.report.dir}">
<fileset dir="${core_test.report.dir}">
<include name="*-test-results.xml"/>
+ <include name="TEST-*.xml"/>
</fileset>
<report format="noframes" todir="${core_test.report.dir}"/>
</junitreport>
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/SRGTestModel.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/SRGTestModel.java
index 70a9d04..ef63429 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/SRGTestModel.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/SRGTestModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -14,14 +14,12 @@
import org.eclipse.persistence.testing.framework.*;
import org.eclipse.persistence.testing.tests.employee.EmployeeBasicTestModel;
-import org.eclipse.persistence.testing.tests.helper.HelperTestModel;
import org.eclipse.persistence.testing.tests.inheritance.InheritanceTestModel;
public class SRGTestModel extends TestModel {
public SRGTestModel() {
setDescription("This model is a basic set of tests run by developers before checking in code.");
boolean isSRG = true;
- addTest(new HelperTestModel());
addTest(new org.eclipse.persistence.testing.tests.feature.FeatureTestModel(isSRG));
addTest(new EmployeeBasicTestModel(isSRG));
addTest(new org.eclipse.persistence.testing.tests.writing.ComplexUpdateAndUnitOfWorkTestModel(isSRG));
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/TestRunModel.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/TestRunModel.java
index 9de295f..b6331c4 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/TestRunModel.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/TestRunModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -20,7 +20,6 @@
import org.eclipse.persistence.internal.helper.Helper;
import org.eclipse.persistence.sessions.DatabaseLogin;
import org.eclipse.persistence.testing.framework.*;
-import org.eclipse.persistence.testing.tests.platform.server.wls.WebLogic_12_PlatformTest;
/**
* This class create test runs, i.e. models of model to allow all tests to be run a once.
@@ -47,11 +46,9 @@
if (!getTests().isEmpty()) {
return;
}
- addTestSuite(WebLogic_12_PlatformTest.class);
Vector tests = new Vector();
if (isLight) {
- tests.add("org.eclipse.persistence.testing.tests.helper.HelperTestModel");
tests.add("org.eclipse.persistence.testing.tests.workbenchintegration.MappingWMIntegrationStoredProcedureTestModel");
tests.add("org.eclipse.persistence.testing.tests.workbenchintegration.MappingWorkbenchIntegrationTestModel");
tests.add("org.eclipse.persistence.testing.tests.mapping.MappingTestModel");
@@ -104,11 +101,9 @@
tests.add("org.eclipse.persistence.testing.tests.sessionsxml.SessionsXMLBasicTestModel");
tests.add("org.eclipse.persistence.testing.tests.sessionsxml.SessionsXMLTestModel");
tests.add("org.eclipse.persistence.testing.tests.unitofwork.changeflag.EmployeeChangeTrackingTestModel");
- tests.add("org.eclipse.persistence.testing.tests.helper.HelperTestModel");
tests.add("org.eclipse.persistence.testing.tests.schemaframework.AutoTableGeneratorBasicTestModel");
tests.add("org.eclipse.persistence.testing.tests.schemaframework.StoredProcedureGeneratorModel");
tests.add("org.eclipse.persistence.testing.tests.proxyindirection.ProxyIndirectionTestModel");
- tests.add("org.eclipse.persistence.testing.tests.localization.LocalizationTestModel");
tests.add("org.eclipse.persistence.testing.tests.history.HistoryTestRunModel");
tests.add("org.eclipse.persistence.testing.tests.isolatedsession.IsolatedSessionTestModel");
tests.add("org.eclipse.persistence.testing.tests.unitofwork.writechanges.UnitOfWorkWriteChangesTestModel");
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/FeatureTestModel.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/FeatureTestModel.java
index 88e9ff8..66aa0a6 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/FeatureTestModel.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/FeatureTestModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -30,7 +30,6 @@
import org.eclipse.persistence.testing.tests.expressions.ExpressionTestSuite;
import org.eclipse.persistence.testing.tests.expressions.ExpressionUnitTestSuite;
import org.eclipse.persistence.testing.tests.identitymaps.IdentityMapTestSuite;
-import org.eclipse.persistence.testing.tests.logging.LoggingTestSuite;
import org.eclipse.persistence.testing.tests.transactions.ReadingThroughWriteConnectionInTransactionTest;
import org.eclipse.persistence.testing.tests.transactions.TransactionTestSuite;
import org.eclipse.persistence.testing.tests.writing.CommitOrderTest;
@@ -81,7 +80,6 @@
}
public void addTests() {
- addTest(new LoggingTestSuite());
addTest(new IdentityMapTestSuite());
addTest(new ExpressionTestSuite());
addTest(new ExpressionInMemoryTestSuite());
@@ -120,7 +118,6 @@
//SRG test set is maintained by QA only, do NOT add any new tests into it.
public void addSRGTests() {
- addTest(new LoggingTestSuite(true));
addTest(new ExpressionTestSuite(true));
addTest(new QueryFrameworkTestSuite(true));
addTest(new TransactionTestSuite(true));
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/BasicTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/BasicTest.java
deleted file mode 100644
index 987c056..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/BasicTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.Helper;
-import org.eclipse.persistence.testing.framework.*;
-import java.math.BigDecimal;
-import java.util.*;
-
-public class BasicTest extends AutoVerifyTestCase {
- public static void main(String[] args) throws Throwable {
- BasicTest test = new BasicTest();
- test.setup();
- test.test();
- test.verify();
- test.reset();
- }
-
- public BasicTest() {
- super();
- setDescription("Test some basic functions of Helper");
- }
-
- public void test() {
- if (Helper.compareBigDecimals(new BigDecimal(0.01), new BigDecimal(0.001))) {
- throw new TestErrorException("Failed to compare two different BigDecimal numbers.");
- }
- if (Helper.compareBigDecimals(new BigDecimal(1.01), new BigDecimal(01.001))) {
- throw new TestErrorException("Failed to compare two equal BigDecimal numbers.");
- }
-
- String path = "c:\\test1\\test2\\test3\\";
- String expectedString = "c:\\\\test1\\\\test2\\\\test3\\\\";
- if (!Helper.doubleSlashes(path).equals(expectedString)) {
- throw new TestErrorException("Failed to replace single slash with double slashes from the String.");
- }
-
- String vowels = "lalelilolule";
- expectedString = "llllll";
- if (!Helper.removeVowels(vowels).equals(expectedString)) {
- throw new TestErrorException("Failed to remove vowels from String.");
- }
-
- String excessCharacterString = "1x2x3x";
- expectedString = "123x";
- if (!Helper.removeCharacterToFit(excessCharacterString, 'x', 4).equals(expectedString)) {
- throw new TestErrorException("Failed to remove Character to fit String.");
- }
-
- Helper.printTimeFromMilliseconds(100);
- Helper.printTimeFromMilliseconds(10000);
- Helper.printTimeFromMilliseconds(100000);
-
- if (!(Helper.getInstanceFromClass(this.getClass()) instanceof BasicTest)) {
- throw new TestErrorException("Failed to get instance from Class.");
- }
-
- if (!(Helper.isPrimitiveWrapper(Character.class) && Helper.isPrimitiveWrapper(Boolean.class) && Helper.isPrimitiveWrapper(Byte.class) && Helper.isPrimitiveWrapper(Short.class) && Helper.isPrimitiveWrapper(Integer.class) && Helper.isPrimitiveWrapper(Long.class) && Helper.isPrimitiveWrapper(Float.class) && Helper.isPrimitiveWrapper(Double.class))) {
- throw new TestErrorException("Failed to check if a class is a primitive wrapper.");
- }
-
- java.util.Vector aVector = new java.util.Vector();
- Object elem = new BasicTest();
- aVector.addElement(elem);
-
- if (!Helper.makeVectorFromObject(aVector).equals(aVector)) {
- throw new TestErrorException("Failed to make a java.util.Vector from a java.util.Vector.");
- }
-
- HashSet set = new HashSet();
- set.add(elem);
- if (!Helper.makeVectorFromObject(set).equals(aVector)) {
- throw new TestErrorException("Failed to make a java.util.Vector from a java.util.Set.");
- }
-
- aVector.clear();
- for (int i = 0; i < 3; i++) {
- aVector.add(i, new Integer(i));
- }
-
- Vector reverseVector = Helper.reverseVector(aVector);
- for (int i = 0; i < 3; i++) {
- if (((Integer)reverseVector.elementAt(i)).intValue() != (2 - i)) {
- throw new TestErrorException("Failed to reverse elements of java.util.Vector");
- }
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckAreVectorTypesAssignableTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckAreVectorTypesAssignableTest.java
deleted file mode 100644
index 74c570c..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckAreVectorTypesAssignableTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import java.util.Vector;
-import org.eclipse.persistence.internal.helper.*;
-import org.eclipse.persistence.testing.framework.*;
-import org.eclipse.persistence.testing.models.employee.domain.*;
-
-public class CheckAreVectorTypesAssignableTest extends AutoVerifyTestCase {
- Exception e;
- Vector v1;
- Vector v2;
- boolean test1ResultIsTrue = false;
-
- public CheckAreVectorTypesAssignableTest() {
- setDescription("Test of Helper.areTypesAssignable(Vector types1, Vector types2).");
- }
-
- public void reset() {
- v1 = null;
- v2 = null;
- }
-
- public void setup() {
- v1 = new Vector();
- v1.addElement(Integer.class);
-
- v2 = new Vector();
- v2.addElement(Employee.class);
- }
-
- public void test() {
- try {
- test1ResultIsTrue = Helper.areTypesAssignable(v1, v2);
-
- } catch (Exception e) {
- this.e = e;
- throw new TestErrorException("An exception should not have been thrown when checking if vectors are assignable.");
- }
- }
-
- public void verify() {
- if (test1ResultIsTrue) {
- throw new TestErrorException("An exception should not have been thrown when checking if vectors are assignable.");
- }
- if (e != null) {
- throw new TestErrorException("An exception should not have been thrown when checking if vectors are assignable: " + e.toString());
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckAreVectorTypesAssignableWithNullVectorTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckAreVectorTypesAssignableWithNullVectorTest.java
deleted file mode 100644
index 821f69b..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckAreVectorTypesAssignableWithNullVectorTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import java.util.Vector;
-import org.eclipse.persistence.internal.helper.*;
-import org.eclipse.persistence.testing.framework.*;
-
-public class CheckAreVectorTypesAssignableWithNullVectorTest extends AutoVerifyTestCase {
- Exception e;
- Vector v1;
- Vector v2;
- boolean test1ResultIsTrue = false;
-
- public CheckAreVectorTypesAssignableWithNullVectorTest() {
- setDescription("Test of Helper.areTypesAssignable(Vector types1, Vector types2) when one of vectors is null.");
- }
-
- public void reset() {
- v1 = null;
- }
-
- public void setup() {
- v1 = new Vector();
- v1.addElement(new Integer(1));
- }
-
- public void test() {
- try {
- test1ResultIsTrue = Helper.areTypesAssignable(v1, v2);
-
- } catch (Exception e) {
- this.e = e;
- throw new TestErrorException("An exception should not have been thrown when checking if vectors are assignable - when one of the vectors is null.");
- }
- }
-
- public void verify() {
- if (test1ResultIsTrue) {
- throw new TestErrorException("An exception should not have been thrown when checking if vectors are assignable - when one of the vectors is null.");
- }
- if (e != null) {
- throw new TestErrorException("An exception should not have been thrown when checking if vectors are assignable - when one of the vectors is null.: " + e.toString());
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckClassIsSubclassWithNullSuperclassTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckClassIsSubclassWithNullSuperclassTest.java
deleted file mode 100644
index 87d621e..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckClassIsSubclassWithNullSuperclassTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.*;
-import org.eclipse.persistence.testing.framework.*;
-import org.eclipse.persistence.testing.models.employee.domain.*;
-
-public class CheckClassIsSubclassWithNullSuperclassTest extends AutoVerifyTestCase {
- Exception e;
- Project parent;
- LargeProject subclass;
- boolean test1ResultIsTrue = false;
-
- public CheckClassIsSubclassWithNullSuperclassTest() {
- setDescription("Test of Helper.classIsSubclass().");
- }
-
- public void reset() {
- }
-
- public void setup() {
- }
-
- public void test() {
- try {
- test1ResultIsTrue = Helper.classIsSubclass(LargeProject.class, null);
-
- } catch (Exception e) {
- this.e = e;
- throw new TestErrorException("An exception should not have been thrown when checking for status as a subclass when superclass is null.");
- }
- }
-
- public void verify() {
- if (test1ResultIsTrue) {
- throw new TestErrorException("Helper.classIsSubclass(Class subClass, Class superClass) does not recognize that parent class is null.");
- }
- if (e != null) {
- throw new TestErrorException("An exception should not have been thrown when checking for status as a subclass when superclass is null: " + e.toString());
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckCompareBigDecimalsTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckCompareBigDecimalsTest.java
deleted file mode 100644
index 5356179..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckCompareBigDecimalsTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.*;
-import org.eclipse.persistence.testing.framework.*;
-import java.math.BigDecimal;
-
-public class CheckCompareBigDecimalsTest extends AutoVerifyTestCase {
- Exception e;
- BigDecimal bd1;
- BigDecimal bd2;
- BigDecimal bd3;
- boolean test1ResultIsTrue;
- boolean test2ResultIsTrue;
- boolean test3ResultIsTrue;
- boolean test4ResultIsTrue;
-
- public CheckCompareBigDecimalsTest() {
- setDescription("Test of Helper.compareBigDecimals(java.math.BigDecimal one, java.math.BigDecimal two) when neither of BigDecimals is positive or negative infinity.");
- }
-
- public void reset() {
- bd1 = null;
- bd2 = null;
- bd3 = null;
- }
-
- public void setup() {
- bd1 = new BigDecimal(1);
- bd1.setScale(1);
- bd2 = new BigDecimal(-2);
- bd2.setScale(2);
- bd3 = new BigDecimal(1);
- bd3.setScale(3);
-
- }
-
- public void test() {
- try {
- test1ResultIsTrue = Helper.compareBigDecimals(bd1, bd2);
- test2ResultIsTrue = Helper.compareBigDecimals(bd1, bd3);
-
- } catch (Exception e) {
- this.e = e;
- throw new TestErrorException("An exception should not have been thrown when comparing BigDecimal objects - when neither of the arguments is negative or positive infinity.");
- }
- }
-
- public void verify() {
- if (test1ResultIsTrue) {
- throw new TestErrorException("Helper.compareBigDecimals(java.math.BigDecimal one, java.math.BigDecimal two) - with two non-infinity but different argurments - returns incorrectly.");
- }
- if (!test2ResultIsTrue) {
- throw new TestErrorException("Helper.compareBigDecimals(java.math.BigDecimal one, java.math.BigDecimal two) - with two non-infinity but identical argurments - returns incorrectly.");
- }
- if (e != null) {
- throw new TestErrorException("An exception should not have been thrown when comparing BigDecimal objects - when neither of the arguments is negative or positive infinity: " + e.toString());
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckCompareByteArraysWithDifferentElementsTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckCompareByteArraysWithDifferentElementsTest.java
deleted file mode 100644
index 5ff8f8c..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CheckCompareByteArraysWithDifferentElementsTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.*;
-import org.eclipse.persistence.testing.framework.*;
-
-public class CheckCompareByteArraysWithDifferentElementsTest extends AutoVerifyTestCase {
- Exception e;
- String s1;
- String s2;
- byte[] b1;
- byte[] b2;
- boolean test1ResultIsTrue;
-
- public CheckCompareByteArraysWithDifferentElementsTest() {
- setDescription("Test of Helper.compareByteArrays(byte[] array1, byte[] array2) with byte arrays containing different elements");
- }
-
- public void setup() {
- s1 = "12345";
- s2 = "12346";
- b1 = s1.getBytes();
- b2 = s2.getBytes();
- }
-
- public void test() {
- try {
- test1ResultIsTrue = Helper.compareByteArrays(b1, b2);
-
- } catch (Exception e) {
- this.e = e;
- throw new TestErrorException("An exception should not have been thrown when comparing byte arrays with different elements.");
- }
- }
-
- public void reset() {
- s1 = null;
- s2 = null;
- b1 = null;
- b2 = null;
- }
-
- public void verify() {
- if (test1ResultIsTrue) {
- throw new TestErrorException("Helper.compareByteArrays(b1,b2) when comparing byte arrays with different elements.");
- }
- if (e != null) {
- throw new TestErrorException("An exception should not have been thrown when comparing byte arrays with different elements.: " + e.toString());
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareArrayContentTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareArrayContentTest.java
deleted file mode 100644
index 39827b2..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareArrayContentTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.*;
-import org.eclipse.persistence.testing.framework.*;
-
-public class CompareArrayContentTest extends AutoVerifyTestCase {
- Exception e;
- Integer[] array1 = new Integer[3];
- Integer[] array2 = new Integer[3];
- Integer[] array3 = new Integer[3];
- boolean test1ResultIsTrue = false;
- boolean test2ResultIsTrue = false;
-
- public CompareArrayContentTest() {
- setDescription("Test of Helper.compareArrays(Object[] array1, Object[] array2) method's comparison of object array contents.");
- }
-
- public static void main(String[] args) {
- CompareArrayContentTest x = new CompareArrayContentTest();
- x.setup();
- x.test();
- x.verify();
- x.reset();
- }
-
- public void reset() {
- array1 = null;
- array2 = null;
- array3 = null;
- }
-
- public void setup() {
- for (int count = 0; count < 3; count++) {
- Integer counter = new Integer(count);
- Integer counter2 = new Integer(count + 9);
- array1[count] = counter;
- array2[count] = counter;
- array3[count] = counter2;
- }
- }
-
- public void test() {
- try {
- test1ResultIsTrue = Helper.compareArrays(array1, array2);
- test2ResultIsTrue = Helper.compareArrays(array1, array3);
-
- } catch (Exception e) {
- this.e = e;
- throw new TestErrorException("An exception should not have been thrown when comparing object arrays.");
- }
- }
-
- public void verify() {
- //
- if (!test1ResultIsTrue) {
- throw new TestErrorException("Helper.compareArrays(Object[] array1, Object[] array2) does not recognize that object arrays contain identical elements.");
- }
-
- if (test2ResultIsTrue) {
- throw new TestErrorException("Helper.compareArrays(Object[] array1, Object[] array2) does not recognize that object arrays contain different elements.");
- }
- if (e != null) {
- throw new TestErrorException("An exception should not have been thrown when comparing object arrays: " + e.toString());
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareArrayLengthTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareArrayLengthTest.java
deleted file mode 100644
index 219be82..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareArrayLengthTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.*;
-import org.eclipse.persistence.testing.framework.*;
-
-public class CompareArrayLengthTest extends AutoVerifyTestCase {
- Exception e;
- Integer[] array1 = new Integer[2];
- Integer[] array2 = new Integer[2];
- Integer[] array3 = new Integer[3];
- boolean test1ResultIsTrue = false;
- boolean test2ResultIsTrue = false;
-
- public CompareArrayLengthTest() {
- setDescription("Test of Helper.compareArrays(Object[] array1, Object[] array2) method's comparison of object array length.");
- }
-
- public static void main(String[] args) {
- CompareArrayLengthTest x = new CompareArrayLengthTest();
- x.setup();
- x.test();
- x.verify();
- x.reset();
- }
-
- public void reset() {
- array1 = null;
- array2 = null;
- array3 = null;
- }
-
- public void setup() {
- for (int count = 0; count < 2; count++) {
- Integer counter = new Integer(count);
- array1[count] = counter;
- array2[count] = counter;
- array3[count] = counter;
- }
- array3[2] = new Integer(10);
-
- }
-
- public void test() {
- try {
- test1ResultIsTrue = Helper.compareArrays(array1, array2);
- test2ResultIsTrue = Helper.compareArrays(array1, array3);
-
- } catch (Exception e) {
- this.e = e;
- throw new TestErrorException("An exception should not have been thrown when comparing object array length.");
- }
- }
-
- public void verify() {
- if (!test1ResultIsTrue) {
- throw new TestErrorException("Helper.compareArrays(Object[] array1, Object[] array2) does not recognize that object arrays are of same length.");
- }
-
- if (test2ResultIsTrue) {
- throw new TestErrorException("Helper.compareArrays(Object[] array1, Object[] array2) does not recognize that object arrays are of different length.");
- }
- if (e != null) {
- throw new TestErrorException("An exception should not have been thrown when comparing array length: " + e.toString());
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareCharArrayContentTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareCharArrayContentTest.java
deleted file mode 100644
index 4c6d8fa..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareCharArrayContentTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.*;
-import org.eclipse.persistence.testing.framework.*;
-
-public class CompareCharArrayContentTest extends AutoVerifyTestCase {
- Exception e;
- char[] array1 = { 'a', 'b', 'c' };
- char[] array2 = { 'a', 'b', 'c' };
- char[] array3 = { 'x', 'y', 'z' };
- boolean test1ResultIsTrue = false;
- boolean test2ResultIsTrue = false;
-
- public CompareCharArrayContentTest() {
- setDescription("Test of Helper.compareCharArrays(char[] array1, char[] array2) method's comparison of char array content.");
- }
-
- public void reset() {
- array1 = null;
- array2 = null;
- array3 = null;
- }
-
- public void setup() {
- }
-
- public void test() {
- try {
- test1ResultIsTrue = Helper.compareCharArrays(array1, array2);
- test2ResultIsTrue = Helper.compareCharArrays(array1, array3);
-
- } catch (Exception e) {
- this.e = e;
- throw new TestErrorException("An exception should not have been thrown when comparing char array content.");
- }
- }
-
- public void verify() {
- if (!test1ResultIsTrue) {
- throw new TestErrorException("Helper.compareCharArrays(char[] array1, char[] array2) does not recognize that arrays contain the same elements.");
- }
-
- if (test2ResultIsTrue) {
- throw new TestErrorException("Helper.compareCharArrays(char[] array1, char[] array2) does not recognize that arrays contain different elements.");
- }
- if (e != null) {
- throw new TestErrorException("An exception should not have been thrown when comparing char array content: " + e.toString());
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareCharArrayLengthTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareCharArrayLengthTest.java
deleted file mode 100644
index 7fa2417..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/CompareCharArrayLengthTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.*;
-import org.eclipse.persistence.testing.framework.*;
-
-public class CompareCharArrayLengthTest extends AutoVerifyTestCase {
- Exception e;
- char[] array1 = { 'a', 'b' };
- char[] array2 = { 'a', 'b' };
- char[] array3 = { 'a', 'b', 'c' };
- boolean test1ResultIsTrue = false;
- boolean test2ResultIsTrue = false;
-
- public CompareCharArrayLengthTest() {
- setDescription("Test of Helper.compareCharArrays(char[] array1, char[] array2) method's comparison of array length.");
- }
-
- public static void main(String[] args) {
- CompareCharArrayLengthTest x = new CompareCharArrayLengthTest();
- x.setup();
- x.test();
- x.verify();
- x.reset();
- }
-
- public void setup() {
- }
-
- public void test() {
- try {
- test1ResultIsTrue = Helper.compareCharArrays(array1, array2);
- test2ResultIsTrue = Helper.compareCharArrays(array1, array3);
-
- } catch (Exception e) {
- this.e = e;
- throw new TestErrorException("An exception should not have been thrown when comparing char array length.");
- }
- }
-
- public void verify() {
- if (!test1ResultIsTrue) {
- throw new TestErrorException("Helper.compareCharArrays(char[] array1, char[] array2) does not recognize that arrays are of same length.");
- }
-
- if (test2ResultIsTrue) {
- throw new TestErrorException("Helper.compareCharArrays(char[] array1, char[] array2) does not recognize that arrays are of different length.");
- }
- if (e != null) {
- throw new TestErrorException("An exception should not have been thrown when comparing char array length: " + e.toString());
- }
- }
-
- public void reset() {
- array1 = null;
- array2 = null;
- array3 = null;
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/HelperTestModel.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/HelperTestModel.java
deleted file mode 100644
index 0df39e3..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/HelperTestModel.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.testing.framework.TestModel;
-import org.eclipse.persistence.testing.framework.TestSuite;
-
-public class HelperTestModel extends TestModel {
- public HelperTestModel() {
- setDescription("This model tests functionality in the Helper class");
- }
-
- public void addTests() {
- addTest(getDataTypeComparisonTestSuite());
-
- }
-
- public static TestSuite getDataTypeComparisonTestSuite() {
- TestSuite suite = new TestSuite();
- suite.setName("DataTypeComparisonTestSuite");
- suite.setDescription("This suite tests common helper methods and methods which compare data types");
-
- suite.addTestSuite(org.eclipse.persistence.testing.tests.helper.JavaUtilTest.class);
- suite.addTestSuite(org.eclipse.persistence.testing.tests.helper.JavaVersionTest.class);
-
- suite.addTest(new CompareArrayContentTest());
- suite.addTest(new CompareArrayLengthTest());
- suite.addTest(new CompareCharArrayLengthTest());
- suite.addTest(new CompareCharArrayContentTest());
- suite.addTest(new CheckAreVectorTypesAssignableWithNullVectorTest());
- suite.addTest(new CheckAreVectorTypesAssignableTest());
- suite.addTest(new CheckCompareByteArraysWithDifferentElementsTest());
- suite.addTest(new CheckCompareBigDecimalsTest());
- suite.addTest(new CheckClassIsSubclassWithNullSuperclassTest());
-
- suite.addTest(new BasicTest());
- suite.addTest(new TimeFromDateTest());
- suite.addTest(new TimeFromLongTest());
- suite.addTest(new TimeFromStringTest());
- suite.addTest(new TimestampFromDateTest());
- suite.addTest(new TimestampFromLongTest());
- suite.addTest(new TimestampFromStringTest());
-
- return suite;
-
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimeFromDateTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimeFromDateTest.java
deleted file mode 100644
index b40bed6..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimeFromDateTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.Helper;
-import org.eclipse.persistence.testing.framework.*;
-import java.util.Date;
-import java.sql.Time;
-
-public class TimeFromDateTest extends AutoVerifyTestCase {
- public static void main(String[] args) {
- TimeFromDateTest test = new TimeFromDateTest();
- test.setup();
- test.test();
- test.verify();
- test.reset();
- }
-
- public TimeFromDateTest() {
- super();
- setDescription("Test of Helper.timeFromDate(java.util.Date dateObject)");
- }
-
- Date testDate;
- Time nonOptimizedTime;
- Time optimizedTime;
- boolean optimizedDatesState;
-
- public void setup() {
- testDate = Helper.utilDateFromLong(new Long(System.currentTimeMillis()));
- optimizedDatesState = Helper.shouldOptimizeDates();
- }
-
- public void test() {
- Helper.setShouldOptimizeDates(false);
- nonOptimizedTime = Helper.timeFromDate(testDate);
-
- Helper.setShouldOptimizeDates(true);
- optimizedTime = Helper.timeFromDate(testDate);
- }
-
- public void verify() {
- String testTime = new Time(testDate.getTime()).toString();
-
- if (!(testTime.equals(nonOptimizedTime.toString()))) {
- throw new TestErrorException("Failed to convert java.util.Date to java.sql.Time when shouldOptimizedDates is off");
- }
- if (!(testTime.equals(optimizedTime.toString()))) {
- throw new TestErrorException("Failed to convert java.util.Date to java.sql.Time when shouldOptimizedDates is on");
- }
- }
-
- public void reset() {
- Helper.setShouldOptimizeDates(optimizedDatesState);
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimeFromLongTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimeFromLongTest.java
deleted file mode 100644
index 57196ad..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimeFromLongTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.Helper;
-import org.eclipse.persistence.testing.framework.*;
-import java.sql.Time;
-
-public class TimeFromLongTest extends AutoVerifyTestCase {
- public static void main(String[] args) {
- TimeFromLongTest test = new TimeFromLongTest();
- test.setup();
- test.test();
- test.verify();
- test.reset();
- }
-
- public TimeFromLongTest() {
- super();
- setDescription("Test of Helper.timeFromLong(Long longObject)");
- }
-
- Long currentTime;
- Time nonOptimizedTime;
- Time optimizedTime;
- boolean optimizedDatesState;
-
- public void setup() {
- currentTime = new Long(System.currentTimeMillis());
- optimizedDatesState = Helper.shouldOptimizeDates();
- }
-
- public void test() {
- Helper.setShouldOptimizeDates(false);
- nonOptimizedTime = Helper.timeFromLong(currentTime);
-
- Helper.setShouldOptimizeDates(true);
- optimizedTime = Helper.timeFromLong(currentTime);
- }
-
- public void verify() {
- Time testTime = new Time(currentTime.longValue());
-
- if (!(testTime.equals(nonOptimizedTime) && testTime.toString().equals(nonOptimizedTime.toString()))) {
- throw new TestErrorException("Failed to convert Long to java.sql.Time when shouldOptimizedDates is off");
- }
- if (!(testTime.equals(optimizedTime) && testTime.toString().equals(optimizedTime.toString()))) {
- throw new TestErrorException("Failed to convert Long to java.sql.Time when shouldOptimizedDates is on");
- }
- }
-
- public void reset() {
- Helper.setShouldOptimizeDates(optimizedDatesState);
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimeFromStringTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimeFromStringTest.java
deleted file mode 100644
index 2034a09..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimeFromStringTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.Helper;
-import org.eclipse.persistence.testing.framework.*;
-import java.sql.Time;
-
-public class TimeFromStringTest extends AutoVerifyTestCase {
- public static void main(String[] args) {
- TimeFromStringTest test = new TimeFromStringTest();
- test.setup();
- test.test();
- test.verify();
- test.reset();
- }
-
- public TimeFromStringTest() {
- super();
- setDescription("Test of Helper.timeFromString(String timestampString)");
- }
-
- String currentTime;
- Time nonOptimizedTime;
- Time optimizedTime;
- boolean optimizedDatesState;
-
- public void setup() {
- currentTime = new Time(System.currentTimeMillis()).toString();
- optimizedDatesState = Helper.shouldOptimizeDates();
- }
-
- public void test() {
- Helper.setShouldOptimizeDates(false);
- nonOptimizedTime = Helper.timeFromString(currentTime);
-
- Helper.setShouldOptimizeDates(true);
- optimizedTime = Helper.timeFromString(currentTime);
- }
-
- public void verify() {
- if (!(currentTime.equals(nonOptimizedTime.toString()))) {
- throw new TestErrorException("Failed to convert String to java.sql.Time when shouldOptimizedDates is off");
- }
- if (!(currentTime.equals(optimizedTime.toString()))) {
- throw new TestErrorException("Failed to convert String to java.sql.Time when shouldOptimizedDates is on");
- }
- }
-
- public void reset() {
- Helper.setShouldOptimizeDates(optimizedDatesState);
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimestampFromDateTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimestampFromDateTest.java
deleted file mode 100644
index 352a6f5..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimestampFromDateTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.Helper;
-import org.eclipse.persistence.testing.framework.*;
-import java.util.Date;
-import java.sql.Timestamp;
-
-public class TimestampFromDateTest extends AutoVerifyTestCase {
- public static void main(String[] args) {
- TimestampFromDateTest test = new TimestampFromDateTest();
- test.setup();
- test.test();
- test.verify();
- test.reset();
- }
-
- public TimestampFromDateTest() {
- super();
- setDescription("Test of Helper.timestampFromDate(java.util.Date dateObject)");
- }
-
- Date currentTime;
- Timestamp optimizedTime;
- boolean optimizedDatesState;
-
- public void setup() {
- currentTime = Helper.utilDateFromLong(new Long(System.currentTimeMillis()));
- optimizedDatesState = Helper.shouldOptimizeDates();
- }
-
- public void test() {
- Helper.setShouldOptimizeDates(true);
- optimizedTime = Helper.timestampFromDate(currentTime);
- }
-
- public void verify() {
- String testTime = new Timestamp(currentTime.getTime()).toString();
- if (!(testTime.equals(optimizedTime.toString()))) {
- throw new TestErrorException("Failed to convert java.util.Date to java.sql.Timestamp when shouldOptimizedDates is on");
- }
- }
-
- public void reset() {
- Helper.setShouldOptimizeDates(optimizedDatesState);
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimestampFromLongTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimestampFromLongTest.java
deleted file mode 100644
index 2c84f6c..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimestampFromLongTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.Helper;
-import org.eclipse.persistence.testing.framework.*;
-import java.sql.Timestamp;
-
-public class TimestampFromLongTest extends AutoVerifyTestCase {
- public static void main(String[] args) {
- TimestampFromLongTest test = new TimestampFromLongTest();
- test.setup();
- test.test();
- test.verify();
- test.reset();
- }
-
- public TimestampFromLongTest() {
- super();
- setDescription("Test of Helper.timestampFromLong(Long longObject)");
- }
-
- Long currentTime;
- Timestamp optimizedTime;
- boolean optimizedDatesState;
-
- public void setup() {
- currentTime = new Long(System.currentTimeMillis());
- optimizedDatesState = Helper.shouldOptimizeDates();
- }
-
- public void test() {
- Helper.setShouldOptimizeDates(true);
- optimizedTime = Helper.timestampFromLong(currentTime);
- }
-
- public void verify() {
- String testTime = new Timestamp(currentTime.longValue()).toString();
- if (!(testTime.equals(optimizedTime.toString()))) {
- throw new TestErrorException("Failed to convert Long to java.sql.Timestamp when shouldOptimizedDates is on");
- }
- }
-
- public void reset() {
- Helper.setShouldOptimizeDates(optimizedDatesState);
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimestampFromStringTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimestampFromStringTest.java
deleted file mode 100644
index bdb194f..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/TimestampFromStringTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
-
-import org.eclipse.persistence.internal.helper.Helper;
-import org.eclipse.persistence.testing.framework.*;
-import java.sql.Timestamp;
-
-public class TimestampFromStringTest extends AutoVerifyTestCase {
- public static void main(String[] args) {
- TimestampFromStringTest test = new TimestampFromStringTest();
- test.setup();
- test.test();
- test.verify();
- test.reset();
- }
-
- public TimestampFromStringTest() {
- super();
- setDescription("Test of Helper.timestampFromString(String stringObject)");
- }
-
- String currentTime;
- Timestamp optimizedTime;
- boolean optimizedDatesState;
-
- public void setup() {
- currentTime = new Timestamp(System.currentTimeMillis()).toString();
- optimizedDatesState = Helper.shouldOptimizeDates();
- }
-
- public void test() {
- Helper.setShouldOptimizeDates(true);
- optimizedTime = Helper.timestampFromString(currentTime);
- }
-
- public void verify() {
- if (!(currentTime.equals(optimizedTime.toString()))) {
- throw new TestErrorException("Failed to convert String to java.sql.Timestamp when shouldOptimizedDates is on");
- }
- }
-
- public void reset() {
- Helper.setShouldOptimizeDates(optimizedDatesState);
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/helper/HelperTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/helper/HelperTest.java
new file mode 100644
index 0000000..d768503
--- /dev/null
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/helper/HelperTest.java
@@ -0,0 +1,297 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.persistence.testing.tests.junit.helper;
+
+import java.math.BigDecimal;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Vector;
+
+import org.eclipse.persistence.internal.helper.Helper;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class HelperTest {
+
+ @Test
+ public void basicTest() {
+ Assert.assertFalse("Failed to compare two different BigDecimal numbers.",
+ Helper.compareBigDecimals(new BigDecimal(0.01), new BigDecimal(0.001)));
+ Assert.assertFalse("Failed to compare two equal BigDecimal numbers.",
+ Helper.compareBigDecimals(new BigDecimal(1.01), new BigDecimal(01.001)));
+
+ Assert.assertEquals("Failed to replace single slash with double slashes from the String.",
+ "c:\\\\test1\\\\test2\\\\test3\\\\", Helper.doubleSlashes("c:\\test1\\test2\\test3\\"));
+
+ Assert.assertEquals("Failed to remove vowels from String.",
+ "llllll", Helper.removeVowels("lalelilolule"));
+
+ Assert.assertEquals("Failed to remove Character to fit String.",
+ "123x", Helper.removeCharacterToFit("1x2x3x", 'x', 4));
+
+ Helper.printTimeFromMilliseconds(100);
+ Helper.printTimeFromMilliseconds(10000);
+ Helper.printTimeFromMilliseconds(100000);
+
+ Assert.assertTrue("Failed to get instance from Class.", Helper.getInstanceFromClass(this.getClass()) instanceof HelperTest);
+
+ Assert.assertTrue("Failed to check if Character.class is a primitive wrapper.", Helper.isPrimitiveWrapper(Character.class));
+ Assert.assertTrue("Failed to check if Boolean.class is a primitive wrapper.", Helper.isPrimitiveWrapper(Boolean.class));
+ Assert.assertTrue("Failed to check if Byte.class is a primitive wrapper.", Helper.isPrimitiveWrapper(Byte.class));
+ Assert.assertTrue("Failed to check if Short.class is a primitive wrapper.", Helper.isPrimitiveWrapper(Short.class));
+ Assert.assertTrue("Failed to check if Integer.class is a primitive wrapper.", Helper.isPrimitiveWrapper(Integer.class));
+ Assert.assertTrue("Failed to check if Long.class is a primitive wrapper.", Helper.isPrimitiveWrapper(Long.class));
+ Assert.assertTrue("Failed to check if Float.class is a primitive wrapper.", Helper.isPrimitiveWrapper(Float.class));
+ Assert.assertTrue("Failed to check if Double.class is a primitive wrapper.", Helper.isPrimitiveWrapper(Double.class));
+
+ Vector<Object> aVector = new Vector<Object>();
+ Object elem = new String("dummy");
+ aVector.addElement(elem);
+ Assert.assertEquals("Failed to make a java.util.Vector from a java.util.Vector.",
+ aVector, Helper.makeVectorFromObject(aVector));
+
+ HashSet set = new HashSet();
+ set.add(elem);
+ Assert.assertEquals("Failed to make a java.util.Vector from a java.util.Set.",
+ aVector, Helper.makeVectorFromObject(set));
+
+ aVector.clear();
+ for (int i = 0; i < 3; i++) {
+ aVector.add(i, new Integer(i));
+ }
+
+ Vector reverseVector = Helper.reverseVector(aVector);
+ for (int i = 0; i < 3; i++) {
+ Assert.assertEquals("Failed to reverse elements of java.util.Vector",
+ 2 - i, ((Integer)reverseVector.elementAt(i)).intValue());
+ }
+ }
+
+ @Test
+ public void checkAreVectorTypesAssignableTest() {
+ Vector v1 = new Vector();
+ v1.addElement(Integer.class);
+ Vector v2 = new Vector();
+ v2.addElement(String.class);
+ Assert.assertFalse("An exception should not have been thrown when checking if vectors are assignable.",
+ Helper.areTypesAssignable(v1, v2));
+ }
+
+ @Test
+ public void checkAreVectorTypesAssignableWithNullVectorTest() {
+ Vector v1 = new Vector();
+ v1.addElement(new Integer(1));
+ Assert.assertFalse("An exception should not have been thrown when checking if vectors are assignable - when one of the vectors is null.",
+ Helper.areTypesAssignable(v1, null));
+ }
+
+ @Test
+ public void checkClassIsSubclassWithNullSuperclassTest() {
+ Assert.assertFalse("Helper.classIsSubclass(Class subClass, Class superClass) does not recognize that parent class is null.",
+ Helper.classIsSubclass(HashMap.class, null));
+ }
+
+ @Test
+ public void checkCompareBigDecimalsTest() {
+ BigDecimal bd1 = new BigDecimal(1);
+ bd1.setScale(1);
+ BigDecimal bd2 = new BigDecimal(-2);
+ bd2.setScale(2);
+ BigDecimal bd3 = new BigDecimal(1);
+ bd3.setScale(3);
+
+ Assert.assertFalse("Helper.compareBigDecimals(java.math.BigDecimal one, java.math.BigDecimal two) - with two non-infinity but different argurments - returns incorrectly.",
+ Helper.compareBigDecimals(bd1, bd2));
+ Assert.assertTrue("Helper.compareBigDecimals(java.math.BigDecimal one, java.math.BigDecimal two) - with two non-infinity but identical argurments - returns incorrectly.",
+ Helper.compareBigDecimals(bd1, bd3));
+ }
+
+ @Test
+ public void checkCompareByteArraysWithDifferentElementsTest() {
+ byte[] b1 = "12345".getBytes();
+ byte[] b2 = "12346".getBytes();
+ Assert.assertFalse("Helper.compareByteArrays(b1,b2) when comparing byte arrays with different elements.",
+ Helper.compareByteArrays(b1, b2));
+ }
+
+ @Test
+ public void compareArrayContentTest() {
+ Integer[] array1 = new Integer[3];
+ Integer[] array2 = new Integer[3];
+ Integer[] array3 = new Integer[3];
+ for (int count = 0; count < 3; count++) {
+ Integer counter = new Integer(count);
+ Integer counter2 = new Integer(count + 9);
+ array1[count] = counter;
+ array2[count] = counter;
+ array3[count] = counter2;
+ }
+
+ Assert.assertTrue("Helper.compareArrays(Object[] array1, Object[] array2) does not recognize that object arrays contain identical elements.",
+ Helper.compareArrays(array1, array2));
+ Assert.assertFalse("Helper.compareArrays(Object[] array1, Object[] array2) does not recognize that object arrays contain different elements.",
+ Helper.compareArrays(array1, array3));
+ }
+
+ @Test
+ public void compareArrayLengthTest() {
+ Integer[] array1 = new Integer[2];
+ Integer[] array2 = new Integer[2];
+ Integer[] array3 = new Integer[3];
+ for (int count = 0; count < 2; count++) {
+ Integer counter = new Integer(count);
+ array1[count] = counter;
+ array2[count] = counter;
+ array3[count] = counter;
+ }
+ array3[2] = new Integer(10);
+
+ Assert.assertTrue("Helper.compareArrays(Object[] array1, Object[] array2) does not recognize that object arrays are of same length.",
+ Helper.compareArrays(array1, array2));
+ Assert.assertFalse("Helper.compareArrays(Object[] array1, Object[] array2) does not recognize that object arrays are of different length.",
+ Helper.compareArrays(array1, array3));
+ }
+
+ @Test
+ public void compareCharArrayContentTest() {
+ char[] array1 = { 'a', 'b', 'c' };
+ char[] array2 = { 'a', 'b', 'c' };
+ char[] array3 = { 'x', 'y', 'z' };
+
+ Assert.assertTrue("Helper.compareCharArrays(char[] array1, char[] array2) does not recognize that arrays contain the same elements.",
+ Helper.compareCharArrays(array1, array2));
+ Assert.assertFalse("Helper.compareCharArrays(char[] array1, char[] array2) does not recognize that arrays contain different elements.",
+ Helper.compareCharArrays(array1, array3));
+ }
+
+ @Test
+ public void compareCharArrayLengthTest() {
+ char[] array1 = { 'a', 'b' };
+ char[] array2 = { 'a', 'b' };
+ char[] array3 = { 'a', 'b', 'c' };
+
+ Assert.assertTrue("Helper.compareCharArrays(char[] array1, char[] array2) does not recognize that arrays are of same length.",
+ Helper.compareCharArrays(array1, array2));
+ Assert.assertFalse("Helper.compareCharArrays(char[] array1, char[] array2) does not recognize that arrays are of different length.",
+ Helper.compareCharArrays(array1, array3));
+ }
+
+ @Test
+ public void timeFromDateTest() {
+ boolean optimizedDatesState = Helper.shouldOptimizeDates();
+ try {
+ Date testDate = Helper.utilDateFromLong(new Long(System.currentTimeMillis()));
+ String testTime = new Time(testDate.getTime()).toString();
+
+ Helper.setShouldOptimizeDates(false);
+ Assert.assertEquals("Failed to convert java.util.Date to java.sql.Time when shouldOptimizedDates is off",
+ testTime, Helper.timeFromDate(testDate).toString());
+
+ Helper.setShouldOptimizeDates(true);
+ Assert.assertEquals("Failed to convert java.util.Date to java.sql.Time when shouldOptimizedDates is on",
+ testTime, Helper.timeFromDate(testDate).toString());
+ } finally {
+ Helper.setShouldOptimizeDates(optimizedDatesState);
+ }
+ }
+
+ @Test
+ public void TimeFromLongTest() {
+ boolean optimizedDatesState = Helper.shouldOptimizeDates();
+ try {
+ Long currentTime = new Long(System.currentTimeMillis());
+ Time expectedTestTime = new Time(currentTime.longValue());
+
+ Helper.setShouldOptimizeDates(false);
+ Time actualTime = Helper.timeFromLong(currentTime);
+ Assert.assertEquals("Failed to convert Long to java.sql.Time when shouldOptimizedDates is off",
+ expectedTestTime, actualTime);
+ Assert.assertEquals("Failed to convert Long to java.sql.Time when shouldOptimizedDates is off",
+ expectedTestTime.toString(), actualTime.toString());
+
+ Helper.setShouldOptimizeDates(true);
+ actualTime = Helper.timeFromLong(currentTime);
+ Assert.assertEquals("Failed to convert Long to java.sql.Time when shouldOptimizedDates is on",
+ expectedTestTime, actualTime);
+ Assert.assertEquals("Failed to convert Long to java.sql.Time when shouldOptimizedDates is on",
+ expectedTestTime.toString(), actualTime.toString());
+ } finally {
+ Helper.setShouldOptimizeDates(optimizedDatesState);
+ }
+ }
+
+ @Test
+ public void timeFromStringTest() {
+ boolean optimizedDatesState = Helper.shouldOptimizeDates();
+ try {
+ String currentTime = new Time(System.currentTimeMillis()).toString();
+
+ Helper.setShouldOptimizeDates(false);
+ Assert.assertEquals("Failed to convert String to java.sql.Time when shouldOptimizedDates is off",
+ currentTime, Helper.timeFromString(currentTime).toString());
+
+ Helper.setShouldOptimizeDates(true);
+ Assert.assertEquals("Failed to convert String to java.sql.Time when shouldOptimizedDates is on",
+ currentTime, Helper.timeFromString(currentTime).toString());
+ } finally {
+ Helper.setShouldOptimizeDates(optimizedDatesState);
+ }
+ }
+
+ @Test
+ public void timestampFromDateTest() {
+ boolean optimizedDatesState = Helper.shouldOptimizeDates();
+ try {
+ Date currentTime = Helper.utilDateFromLong(new Long(System.currentTimeMillis()));
+ String testTime = new Timestamp(currentTime.getTime()).toString();
+
+ Helper.setShouldOptimizeDates(true);
+ Assert.assertEquals("Failed to convert java.util.Date to java.sql.Timestamp when shouldOptimizedDates is on",
+ testTime, Helper.timestampFromDate(currentTime).toString());
+ } finally {
+ Helper.setShouldOptimizeDates(optimizedDatesState);
+ }
+ }
+
+ @Test
+ public void timestampFromLongTest() {
+ boolean optimizedDatesState = Helper.shouldOptimizeDates();
+ try {
+ Long currentTime = new Long(System.currentTimeMillis());
+ String testTime = new Timestamp(currentTime.longValue()).toString();
+
+ Helper.setShouldOptimizeDates(true);
+ Assert.assertEquals("Failed to convert Long to java.sql.Timestamp when shouldOptimizedDates is on",
+ testTime, Helper.timestampFromLong(currentTime).toString());
+ } finally {
+ Helper.setShouldOptimizeDates(optimizedDatesState);
+ }
+ }
+
+ @Test
+ public void timestampFromStringTest() {
+ boolean optimizedDatesState = Helper.shouldOptimizeDates();
+ try {
+ String currentTime = new Timestamp(System.currentTimeMillis()).toString();
+
+ Helper.setShouldOptimizeDates(true);
+ Assert.assertEquals("Failed to convert String to java.sql.Timestamp when shouldOptimizedDates is on",
+ currentTime, Helper.timestampFromString(currentTime).toString());
+ } finally {
+ Helper.setShouldOptimizeDates(optimizedDatesState);
+ }
+ }
+}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/JavaUtilTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/helper/JavaUtilTest.java
similarity index 98%
rename from foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/JavaUtilTest.java
rename to foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/helper/JavaUtilTest.java
index 035c3fd..b0cb207 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/JavaUtilTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/helper/JavaUtilTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -10,7 +10,7 @@
* Contributors:
* Tomas Kraus, Peter Benedikovic - initial API and implementation
******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
+package org.eclipse.persistence.testing.tests.junit.helper;
import org.eclipse.persistence.internal.helper.JavaSEPlatform;
import org.eclipse.persistence.internal.helper.JavaVersion;
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/JavaVersionTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/helper/JavaVersionTest.java
similarity index 97%
rename from foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/JavaVersionTest.java
rename to foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/helper/JavaVersionTest.java
index 3625beb..0de71cc 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/helper/JavaVersionTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/helper/JavaVersionTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -11,7 +11,7 @@
* Tomas Kraus - 2017/10/11
* Bug 525854 - Fix Java SE platform detection and clean up platform code
******************************************************************************/
-package org.eclipse.persistence.testing.tests.helper;
+package org.eclipse.persistence.testing.tests.junit.helper;
import java.lang.reflect.Method;
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/localization/LocalizationResourcesTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationResourcesTest.java
similarity index 86%
rename from foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/localization/LocalizationResourcesTest.java
rename to foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationResourcesTest.java
index 62c626d..9277279 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/localization/LocalizationResourcesTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationResourcesTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2017 Oracle and/or its affiliates, IBM Corporation. All rights reserved.
+ * Copyright (c) 2016, 2018 Oracle and/or its affiliates, IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -12,7 +12,7 @@
* 11/07/2017 - Dalia Abo Sheasha
* - 526957 : Split the logging and trace messages
******************************************************************************/
-package org.eclipse.persistence.testing.tests.localization;
+package org.eclipse.persistence.testing.tests.junit.localization;
import java.util.HashSet;
import java.util.LinkedList;
@@ -26,29 +26,13 @@
import org.eclipse.persistence.internal.localization.i18n.ToStringLocalizationResource;
import org.eclipse.persistence.internal.localization.i18n.TraceLocalizationResource;
import org.eclipse.persistence.testing.framework.ReflectionHelper;
+import org.junit.Assert;
import org.junit.Test;
-import junit.framework.TestCase;
-
/**
* Unit tests for EclipseLink logging messages resource bundles.
*/
-public class LocalizationResourcesTest extends TestCase {
-
- /**
- * Creates an instance of jUnit tests for EclipseLink logging categories enumeration.
- */
- public LocalizationResourcesTest() {
- super();
- }
-
- /**
- * Creates an instance of jUnit tests for EclipseLink logging categories enumeration.
- * @param name jUnit test name.
- */
- public LocalizationResourcesTest(final String name) {
- super(name);
- }
+public class LocalizationResourcesTest {
/**
* Build message with list content.
@@ -93,7 +77,7 @@
Object instance = ReflectionHelper.getInstance(c, new Class[] {}, new Object[] {});
bundle = (Object[][])ReflectionHelper.invokeMethod("getContents", instance, new Class[] {}, new Object[] {});
} catch (ReflectiveOperationException | SecurityException e) {
- fail("Could not access " + bundleName + "#getContents()");
+ Assert.fail("Could not access " + bundleName + "#getContents()");
bundle = null;
}
if (bundle != null) {
@@ -116,10 +100,10 @@
}
}
if (nonStringKeys.size() > 0) {
- fail(buildMessageWithList("Non String key found in bundle: ", nonStringKeys));
+ Assert.fail(buildMessageWithList("Non String key found in bundle: ", nonStringKeys));
}
if (duplicateKeys.size() > 0) {
- fail(buildMessageWithList("Duplicate bundle keys found: ", duplicateKeys));
+ Assert.fail(buildMessageWithList("Duplicate bundle keys found: ", duplicateKeys));
}
}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationTest.java
new file mode 100644
index 0000000..8a9b2fa
--- /dev/null
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationTest.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation from Oracle TopLink
+ ******************************************************************************/
+package org.eclipse.persistence.testing.tests.junit.localization;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.eclipse.persistence.internal.localization.LoggingLocalization;
+
+public class LocalizationTest {
+
+ @Test
+ public void test() {
+ Assert.assertEquals("LoggingLocalization.buildMessage could not find the correct translation.",
+ "LoggingTestSession login successful", LoggingLocalization.buildMessage("login_successful", new Object[] { "LoggingTestSession" }));
+ Assert.assertEquals("LoggingLocalization.buildMessage could not find the correct translation.",
+ "message_not_exist (There is no English translation for this message.)", LoggingLocalization.buildMessage("message_not_exist"));
+ }
+}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/logging/LogCategoryTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/logging/LogCategoryTest.java
new file mode 100644
index 0000000..da99e2f
--- /dev/null
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/logging/LogCategoryTest.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Tomas Kraus - Initial implementation
+ ******************************************************************************/
+package org.eclipse.persistence.testing.tests.junit.logging;
+
+import org.eclipse.persistence.logging.LogCategoryHelper;
+import org.junit.Test;
+
+/**
+ * Unit tests for EclipseLink logging categories enumeration.
+ */
+public class LogCategoryTest {
+
+ @Test
+ public void testLength() {
+ LogCategoryHelper.testLength();
+ }
+
+ @Test
+ public void testToValue() {
+ LogCategoryHelper.testToValue();
+ }
+
+ @Test
+ public void testGetNameSpace() throws ReflectiveOperationException {
+ LogCategoryHelper.testGetNameSpace();
+ }
+
+}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/logging/LogLevelTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/logging/LogLevelTest.java
new file mode 100644
index 0000000..ab0f77e
--- /dev/null
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/logging/LogLevelTest.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Tomas Kraus - Initial implementation
+ ******************************************************************************/
+package org.eclipse.persistence.testing.tests.junit.logging;
+
+import org.eclipse.persistence.logging.LogLevelHelper;
+import org.junit.Test;
+
+/**
+ * Unit tests for EclipseLink log levels enumeration.
+ */
+public class LogLevelTest {
+
+ @Test
+ public void testLength() {
+ LogLevelHelper.testLength();
+ }
+
+ @Test
+ public void testToValue() {
+ LogLevelHelper.testToValueString();
+ LogLevelHelper.testToValueInt();
+ LogLevelHelper.testToValueIntFallBack();
+ }
+
+ @Test
+ public void testShouldLog() {
+ LogLevelHelper.testShouldLogOnLogLevel();
+ LogLevelHelper.testShouldLogOnId();
+ }
+
+}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/conversion/AttributeNamePrefixTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/mapping/conversion/AttributeNamePrefixTest.java
similarity index 80%
rename from foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/conversion/AttributeNamePrefixTest.java
rename to foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/mapping/conversion/AttributeNamePrefixTest.java
index 4e0338c..44eb1cd 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/conversion/AttributeNamePrefixTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/mapping/conversion/AttributeNamePrefixTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -11,11 +11,10 @@
* 11/06/2014-2.6 Tomas Kraus
* - 449818: Initial API and implementation.
******************************************************************************/
-package org.eclipse.persistence.testing.tests.mapping.conversion;
-
-import junit.framework.TestCase;
+package org.eclipse.persistence.testing.tests.junit.mapping.conversion;
import org.eclipse.persistence.internal.mappings.converters.AttributeNamePrefix;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -23,7 +22,7 @@
* in {@link org.eclipse.persistence.testing.tests.mapping.MappingTestModel} test model.
* @author Tomas Kraus
*/
-public class AttributeNamePrefixTest extends TestCase {
+public class AttributeNamePrefixTest {
/** All valid attribute name prefixes names. */
private static final String[] NAMES = new String[AttributeNamePrefix.LENGTH];
@@ -58,24 +57,24 @@
// Verify valid attribute name prefixes names.
for (int i = 0; i < AttributeNamePrefix.LENGTH; i++) {
AttributeNamePrefix prefix = AttributeNamePrefix.toValue(NAMES[i]);
- assertNotNull("No attribute prefix enumeration value was found.", prefix);
+ Assert.assertNotNull("No attribute prefix enumeration value was found.", prefix);
}
// Verify invalid attribute name prefixes names (1st letter of valid name is capital).
for (int i = 0; i < AttributeNamePrefix.LENGTH; i++) {
AttributeNamePrefix prefix = AttributeNamePrefix.toValue(wrongValuesFirstLetter[i]);
if (i == 0) {
- assertNotNull("No attribute prefix enumeration value was found for NULL name.", prefix);
+ Assert.assertNotNull("No attribute prefix enumeration value was found for NULL name.", prefix);
} else {
- assertNull("Attribute prefix enumeration value was found for invalid name.", prefix);
+ Assert.assertNull("Attribute prefix enumeration value was found for invalid name.", prefix);
}
}
// Verify invalid attribute name prefixes names (all letters are upper case).
for (int i = 0; i < AttributeNamePrefix.LENGTH; i++) {
AttributeNamePrefix prefix = AttributeNamePrefix.toValue(wrongValuesFirstLetter[i]);
if (i == 0) {
- assertNotNull("No attribute prefix enumeration value was found for NULL name.", prefix);
+ Assert.assertNotNull("No attribute prefix enumeration value was found for NULL name.", prefix);
} else {
- assertNull("Attribute prefix enumeration value was found for invalid name.", prefix);
+ Assert.assertNull("Attribute prefix enumeration value was found for invalid name.", prefix);
}
}
}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/conversion/AttributeNameTokenizerTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/mapping/conversion/AttributeNameTokenizerTest.java
similarity index 83%
rename from foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/conversion/AttributeNameTokenizerTest.java
rename to foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/mapping/conversion/AttributeNameTokenizerTest.java
index fc1540d..ce1a361 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/conversion/AttributeNameTokenizerTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/mapping/conversion/AttributeNameTokenizerTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -11,15 +11,14 @@
* 11/06/2014-2.6 Tomas Kraus
* - 449818: Initial API and implementation.
******************************************************************************/
-package org.eclipse.persistence.testing.tests.mapping.conversion;
+package org.eclipse.persistence.testing.tests.junit.mapping.conversion;
import java.util.Iterator;
-import junit.framework.TestCase;
-
import org.eclipse.persistence.internal.mappings.converters.AttributeNamePrefix;
import org.eclipse.persistence.internal.mappings.converters.AttributeNameTokenizer;
import org.eclipse.persistence.internal.mappings.converters.AttributeNameTokenizer.TokensIterator;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -27,7 +26,7 @@
* in {@link org.eclipse.persistence.testing.tests.mapping.MappingTestModel} test model.
* @author Tomas Kraus
*/
-public class AttributeNameTokenizerTest extends TestCase {
+public class AttributeNameTokenizerTest {
/** Sample attribute names for testing. */
private static String[] ATTR_NAMES = {
@@ -65,7 +64,7 @@
for (int i = 0; i < prefixedNames.length; i++) {
final String prefixedName = prefixedNames[i];
final String result = AttributeNameTokenizer.getNameAfterKey(prefixedName);
- assertTrue("Removal of " + AttributeNamePrefix.KEY.getName() + " prefix failed.",
+ Assert.assertTrue("Removal of " + AttributeNamePrefix.KEY.getName() + " prefix failed.",
result.equals(ATTR_NAMES[i]));
}
}
@@ -79,7 +78,7 @@
for (int i = 0; i < prefixedNames.length; i++) {
final String prefixedName = prefixedNames[i];
final String result = AttributeNameTokenizer.getNameAfterVersion(prefixedName);
- assertTrue("Removal of " + AttributeNamePrefix.VALUE.getName() + " prefix failed.",
+ Assert.assertTrue("Removal of " + AttributeNamePrefix.VALUE.getName() + " prefix failed.",
result.equals(ATTR_NAMES[i]));
}
}
@@ -103,15 +102,15 @@
// Old style for cycle with iterator.
for (Iterator<String> it = new AttributeNameTokenizer(attrName).iterator(); it.hasNext(); ) {
String token = it.next();
- assertTrue("Order of tokens did not match", token.equals(tokens[k++]));
+ Assert.assertTrue("Order of tokens did not match", token.equals(tokens[k++]));
}
- assertEquals("Token count is wrong: " + tokens.length + "!=" + k , tokens.length, k);
+ Assert.assertEquals("Token count is wrong: " + tokens.length + "!=" + k , tokens.length, k);
k = 0;
// New style for cycle.
for (String token : new AttributeNameTokenizer(attrName)) {
- assertTrue("Order of tokens did not match", token.equals(tokens[k++]));
+ Assert.assertTrue("Order of tokens did not match", token.equals(tokens[k++]));
}
- assertEquals("Token count is wrong: " + tokens.length + "!=" + k , tokens.length, k);
+ Assert.assertEquals("Token count is wrong: " + tokens.length + "!=" + k , tokens.length, k);
}
}
}
@@ -137,18 +136,18 @@
TokensIterator it = new TokensIterator(attrName, true);
while (it.hasNext()) {
String token = it.next();
- assertTrue("Order of tokens did not match", token.equals(tokens[k++]));
+ Assert.assertTrue("Order of tokens did not match", token.equals(tokens[k++]));
}
- assertEquals("Token count is wrong: " + tokens.length + "!=" + k , tokens.length, k);
+ Assert.assertEquals("Token count is wrong: " + tokens.length + "!=" + k , tokens.length, k);
AttributeNamePrefix prefix = it.getPrefix();
AttributeNamePrefix expectedPrefix = null;
switch(i) {
case 0: expectedPrefix = AttributeNamePrefix.NULL; break;
case 1: expectedPrefix = AttributeNamePrefix.KEY; break;
case 2: expectedPrefix = AttributeNamePrefix.VALUE; break;
- default: fail("Illegal attribute names array iondex.");
+ default: Assert.fail("Illegal attribute names array iondex.");
}
- assertTrue("Returned prefix type is wrong", expectedPrefix.equals(prefix));
+ Assert.assertTrue("Returned prefix type is wrong", expectedPrefix.equals(prefix));
}
}
}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/platform/server/wls/WebLogic_12_PlatformTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/platform/server/wls/WebLogic_12_PlatformTest.java
similarity index 92%
rename from foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/platform/server/wls/WebLogic_12_PlatformTest.java
rename to foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/platform/server/wls/WebLogic_12_PlatformTest.java
index 4f441e9..a8bac79 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/platform/server/wls/WebLogic_12_PlatformTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/platform/server/wls/WebLogic_12_PlatformTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -10,7 +10,7 @@
* Contributors:
* Oracle - initial API and implementation
******************************************************************************/
-package org.eclipse.persistence.testing.tests.platform.server.wls;
+package org.eclipse.persistence.testing.tests.junit.platform.server.wls;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -18,25 +18,18 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import junit.framework.TestCase;
-
import org.eclipse.persistence.platform.server.ServerPlatform;
import org.eclipse.persistence.platform.server.wls.WebLogic_12_Platform;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
-public class WebLogic_12_PlatformTest extends TestCase {
+public class WebLogic_12_PlatformTest {
public WebLogic_12_PlatformTest() {
}
- public WebLogic_12_PlatformTest(String name) {
- super(name);
- }
-
@After
- @Override
public void tearDown() {
resetContextHelper();
}
@@ -102,13 +95,13 @@
getCicManagerClassMethod.setAccessible(true);
Object result = null;
try {
- result = getCicManagerClassMethod.invoke(contextHelperClass, "org/eclipse/persistence/testing/tests/platform/server/wls/WebLogic_12_PlatformTest.class", "org.eclipse.persistence.testing.tests.platform.server.wls.WebLogic_12_PlatformTest");
+ result = getCicManagerClassMethod.invoke(contextHelperClass, "org/eclipse/persistence/testing/tests/junit/platform/server/wls/WebLogic_12_PlatformTest.class", "org.eclipse.persistence.testing.tests.junit.platform.server.wls.WebLogic_12_PlatformTest");
} catch (Exception e) {
Assert.fail("Failed to invoke getCicManagerClass method: " + e.getMessage());
}
Assert.assertNotNull("Failed to retrieve test class", result);
try {
- result = getCicManagerClassMethod.invoke(contextHelperClass, "this/should/not/resolve", "org.eclipse.persistence.testing.tests.platform.server.wls.WebLogic_12_PlatformTest");
+ result = getCicManagerClassMethod.invoke(contextHelperClass, "this/should/not/resolve", "org.eclipse.persistence.testing.tests.junit.platform.server.wls.WebLogic_12_PlatformTest");
} catch (Exception e) {
Assert.fail("Failed to invoke getCicManagerClass method: " + e.getMessage());
}
@@ -222,7 +215,7 @@
public String getPartitionName() {
return nameCtx;
}
-
+
public boolean isGlobalRuntime() {
return isGlobal;
}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/JCEEncryptionTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/security/JCEEncryptionTest.java
similarity index 61%
rename from foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/JCEEncryptionTest.java
rename to foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/security/JCEEncryptionTest.java
index 94564c2..4867476 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/JCEEncryptionTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/security/JCEEncryptionTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -10,9 +10,10 @@
* Contributors:
* Oracle - initial API and implementation from Oracle TopLink
******************************************************************************/
-package org.eclipse.persistence.testing.tests.security;
+package org.eclipse.persistence.testing.tests.junit.security;
-import org.eclipse.persistence.testing.framework.*;
+import org.junit.Assert;
+import org.junit.Test;
import org.eclipse.persistence.internal.security.Securable;
import org.eclipse.persistence.internal.helper.ConversionManager;
@@ -25,35 +26,15 @@
*
* @author Guy Pelletier
*/
-public class JCEEncryptionTest extends AutoVerifyTestCase {
- String toEncrypt;
- String decrypted;
- Securable encryptor;
+public class JCEEncryptionTest {
- public JCEEncryptionTest() {
- setDescription("Test the encryption/decryption using JCE");
- }
-
- public void reset() {
- }
-
- protected void setup() throws Exception {
- toEncrypt = "testString";
- encryptor = convertToEncryptionObject("org.eclipse.persistence.internal.security.JCEEncryptor");
- }
-
+ @Test
public void test() {
- if (encryptor != null) {
- decrypted = encryptor.decryptPassword(encryptor.encryptPassword(toEncrypt));
- }
- }
-
- protected void verify() {
- if (encryptor == null) {
- throw new TestWarningException("JCE object could not be created.");
- } else if (!decrypted.equals(toEncrypt)) {
- throw new TestErrorException("The JCE encryption --> decryption failed");
- }
+ String toEncrypt = "testString";
+ Securable encryptor = convertToEncryptionObject("org.eclipse.persistence.internal.security.JCEEncryptor");
+ Assert.assertNotNull("JCE object could not be created.", encryptor);
+ String decrypted = encryptor.decryptPassword(encryptor.encryptPassword(toEncrypt));
+ Assert.assertEquals("The JCE encryption --> decryption failed", toEncrypt, decrypted);
}
/**
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/SecurableBackwardsCompatibilityTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/security/SecurableBackwardsCompatibilityTest.java
similarity index 79%
rename from foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/SecurableBackwardsCompatibilityTest.java
rename to foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/security/SecurableBackwardsCompatibilityTest.java
index f29721c..0d26e82 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/SecurableBackwardsCompatibilityTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/security/SecurableBackwardsCompatibilityTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -10,7 +10,7 @@
* Contributors:
* dminsky - initial API and implementation
******************************************************************************/
-package org.eclipse.persistence.testing.tests.security;
+package org.eclipse.persistence.testing.tests.junit.security;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
@@ -25,97 +25,92 @@
import org.eclipse.persistence.internal.helper.Helper;
import org.eclipse.persistence.internal.security.JCEEncryptor;
import org.eclipse.persistence.internal.security.Securable;
-
-import org.eclipse.persistence.testing.framework.ReflectionHelper;
-import org.eclipse.persistence.testing.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Regression test suite for the EclipseLink reference implementation of the Securable interface
* @author dminsky
*/
-public class SecurableBackwardsCompatibilityTest extends TestCase {
-
- public SecurableBackwardsCompatibilityTest(String testMethod) {
- super();
- setName(testMethod);
- }
-
- @Override
- public void test() throws Throwable {
- ReflectionHelper.invokeMethod(getName(), this, new Class[0], new Object[0]);
- }
+public class SecurableBackwardsCompatibilityTest {
/**
* Test the decryption of a String encrypted with DES ECB.
* @throws Exception
*/
+ @Test
public void testStringDecryption_DES_ECB() throws Exception {
String plainTextString = "welcome123_des_ecb";
String testString = encryptString_DES_ECB(plainTextString);
- assertFalse("Strings should not match.", plainTextString.equals(testString));
+ Assert.assertFalse("Strings should not match.", plainTextString.equals(testString));
Securable securable = new JCEEncryptor();
String decryptedString = securable.decryptPassword(testString);
- assertEquals("Strings should match.", plainTextString, decryptedString);
+ Assert.assertEquals("Strings should match.", plainTextString, decryptedString);
}
/**
* Test the decryption of a String encrypted with AES CBC.
* @throws Exception
*/
+ @Test
public void testStringDecryption_AES_CBC() throws Exception {
String plainTextString = "welcome123_aes_cbc";
Securable securable = new JCEEncryptor();
String testString = securable.encryptPassword(plainTextString);
- assertFalse("Strings should not match.", plainTextString.equals(testString));
+ Assert.assertFalse("Strings should not match.", plainTextString.equals(testString));
String decryptedString = securable.decryptPassword(testString);
- assertEquals("Strings should match.", plainTextString, decryptedString);
+ Assert.assertEquals("Strings should match.", plainTextString, decryptedString);
}
/**
* Test the decryption of a String encrypted with AES ECB.
* @throws Exception
*/
+ @Test
public void testStringDecryption_AES_ECB() throws Exception {
String plainTextString = "welcome123_aes_ecb";
String testString = encryptString_AES_ECB(plainTextString);
- assertFalse("Strings should not match.", plainTextString.equals(testString));
+ Assert.assertFalse("Strings should not match.", plainTextString.equals(testString));
Securable securable = new JCEEncryptor();
String decryptedString = securable.decryptPassword(testString);
- assertEquals("Strings should match.", plainTextString, decryptedString);
+ Assert.assertEquals("Strings should match.", plainTextString, decryptedString);
}
/**
* Test the decryption/processing of a plaintext String.
* @throws Exception
*/
+ @Test
public void testStringDecryption_PlainText() throws Exception {
String plainTextString = "welcome123_plaintext";
Securable securable = new JCEEncryptor();
String decryptedString = securable.decryptPassword(plainTextString);
- assertEquals("Passwords should match.", plainTextString, decryptedString);
+ Assert.assertEquals("Passwords should match.", plainTextString, decryptedString);
}
/**
* Test the decryption/processing of a null parameter.
* @throws Exception
*/
+ @Test
public void testNullParameterDecryption() throws Exception {
Securable securable = new JCEEncryptor();
String returnValue = securable.decryptPassword(null);
- assertNull("Null should be returned when decrypting a null value", returnValue);
+ Assert.assertNull("Null should be returned when decrypting a null value", returnValue);
}
/**
* Test the encryption of a null parameter.
* @throws Exception
*/
+ @Test
public void testNullParameterEncryption() throws Exception {
ValidationException expectedException = null;
try {
@@ -124,7 +119,7 @@
} catch (ValidationException ve) {
expectedException = ve;
}
- assertNotNull("A ValidationException should be thrown when encrypting a null value", expectedException);
+ Assert.assertNotNull("A ValidationException should be thrown when encrypting a null value", expectedException);
}
/*
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/sessionsxml/SessionManagerTest.java
similarity index 94%
rename from foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerTest.java
rename to foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/sessionsxml/SessionManagerTest.java
index 86867ea..253bd7c 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/sessionsxml/SessionManagerTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -10,7 +10,7 @@
* Contributors:
* Oracle - initial API and implementation from Oracle TopLink
******************************************************************************/
-package org.eclipse.persistence.testing.tests.sessionsxml;
+package org.eclipse.persistence.testing.tests.junit.sessionsxml;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -25,8 +25,6 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch;
-import junit.framework.TestCase;
-
import org.eclipse.persistence.exceptions.ServerPlatformException;
import org.eclipse.persistence.logging.DefaultSessionLog;
import org.eclipse.persistence.logging.SessionLog;
@@ -43,13 +41,12 @@
/**
* Tests the API from SessionManager.
*/
-public class SessionManagerTest extends TestCase {
+public class SessionManagerTest {
private List<ServerPlatformDetector> detectors;
private SessionLog originalLogger;
@Before
- @Override
public void setUp() {
originalLogger = (SessionLog) getField(SessionManager.class, "LOG", null);
SessionLog log = new LogWrapper();
@@ -58,7 +55,6 @@
}
@After
- @Override
public void tearDown() {
if (detectors != null) {
for (Iterator<ServerPlatformDetector> i = detectors.iterator(); i.hasNext();) {
@@ -164,11 +160,11 @@
reinitManager(true, false);
SessionManager sm = SessionManager.getManager();
LogWrapper logger = (LogWrapper) getField(SessionManager.class, "LOG", null);
- assertEquals(SessionLog.WARNING, logger.getLastLevel());
- assertEquals(SessionLog.CONNECTION, logger.getLastCategory());
+ Assert.assertEquals(SessionLog.WARNING, logger.getLastLevel());
+ Assert.assertEquals(SessionLog.CONNECTION, logger.getLastCategory());
Throwable t = logger.getLastThrowable();
- assertTrue("invalid excpetion type: " + t, t instanceof ServerPlatformException);
- assertTrue("invalid excpetion type: " + t.getCause(), t.getCause() instanceof ClassNotFoundException);
+ Assert.assertTrue("invalid excpetion type: " + t, t instanceof ServerPlatformException);
+ Assert.assertTrue("invalid excpetion type: " + t.getCause(), t.getCause() instanceof ClassNotFoundException);
}
@Test
@@ -179,10 +175,10 @@
reinitManager(true, true);
SessionManager sm = SessionManager.getManager();
LogWrapper logger = (LogWrapper) getField(SessionManager.class, "LOG", null);
- assertEquals(SessionLog.WARNING, logger.getLastLevel());
- assertEquals(SessionLog.CONNECTION, logger.getLastCategory());
+ Assert.assertEquals(SessionLog.WARNING, logger.getLastLevel());
+ Assert.assertEquals(SessionLog.CONNECTION, logger.getLastCategory());
Throwable t = logger.getLastThrowable();
- assertTrue("invalid excpetion type: " + t, t instanceof ServerPlatformException);
+ Assert.assertTrue("invalid excpetion type: " + t, t instanceof ServerPlatformException);
} finally {
Platform.forceNPE = false;
}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/localization/LocalizationTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/localization/LocalizationTest.java
deleted file mode 100644
index d531b3b..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/localization/LocalizationTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.localization;
-
-import org.eclipse.persistence.testing.framework.*;
-import org.eclipse.persistence.internal.localization.LoggingLocalization;
-
-public class LocalizationTest extends AutoVerifyTestCase {
- String localizedString;
- String nonLocalizedString;
-
- public LocalizationTest() {
- setDescription("Verify that the correct translation is returned for a localized string and" + "the NoTranslationForThisLocale message is returned for a non-localized string");
- }
-
- public void test() {
- localizedString = LoggingLocalization.buildMessage("login_successful", new Object[] { "LoggingTestSession" });
- nonLocalizedString = LoggingLocalization.buildMessage("message_not_exist");
- }
-
- protected void verify() {
- if (!localizedString.equals("LoggingTestSession login successful")) {
- throw new TestErrorException("LoggingLocalization.buildMessage could not find the correct translation.");
- }
-
- if (!nonLocalizedString.equals("message_not_exist (There is no English translation for this message.)")) {
- throw new TestErrorException("LoggingLocalization.buildMessage could not find NoTranslationForThisLocale message.");
- }
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/localization/LocalizationTestModel.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/localization/LocalizationTestModel.java
deleted file mode 100644
index 445256a..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/localization/LocalizationTestModel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 1998, 2016 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Oracle - initial API and implementation from Oracle TopLink
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.localization;
-
-import org.eclipse.persistence.testing.framework.*;
-
-public class LocalizationTestModel extends TestModel {
- public LocalizationTestModel() {
- setDescription("This suite tests localization.");
- }
-
- public void addTests() {
- addTest(getLocalizationTestSuite());
- }
-
- public TestSuite getLocalizationTestSuite() {
- TestSuite suite = new TestSuite();
- suite.setName("Localization Test Suite");
- suite.addTestSuite(LocalizationResourcesTest.class);
- suite.addTest(new LocalizationTest());
-
- return suite;
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/logging/LogCategoryTests.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/logging/LogCategoryTests.java
deleted file mode 100644
index 0354d57..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/logging/LogCategoryTests.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Tomas Kraus - Initial implementation
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.logging;
-
-import org.eclipse.persistence.logging.LogCategoryHelper;
-import org.eclipse.persistence.testing.framework.TestCase;
-import org.eclipse.persistence.testing.framework.TestSuite;
-
-/**
- * Unit tests for EclipseLink logging categories enumeration.
- */
-public class LogCategoryTests extends TestCase {
-
- /**
- * Add tests from this class into provided test suite.
- * @param suite Test suite where to add tests.
- */
- public static void addTests(final TestSuite suite) {
- suite.addTest(new TestLength());
- suite.addTest(new TestToValue());
- suite.addTest(new TestGetNameSpace());
- }
-
- /**
- * Creates an instance of jUnit tests for EclipseLink logging categories enumeration.
- */
- public LogCategoryTests() {
- super();
- }
-
- /**
- * Creates an instance of jUnit tests for EclipseLink logging categories enumeration.
- * @param name jUnit test name.
- */
- public LogCategoryTests(final String name) {
- super();
- setName(name);
- }
-
- /**
- * Setup unit test.
- */
- public void setup() {
- }
-
- /**
- * Clean this test suite.
- */
- public void reset() {
- }
-
- /**
- * Test {@code LogCategory.length} value.
- */
- public static final class TestLength extends LogCategoryTests {
-
- /**
- * Creates an instance of jUnit test.
- */
- public TestLength() {
- super();
- }
-
- /**
- * Creates an instance of jUnit test.
- * @param name jUnit test name.
- */
- public TestLength(final String name) {
- super(name);
- }
-
- /**
- * jUnit test method.
- */
- @Override
- public void test() {
- LogCategoryHelper.testLength();
- }
-
- }
-
- /**
- * Test {@code LogCategory.toValue(String)} method.
- */
- public static final class TestToValue extends LogCategoryTests {
-
- /**
- * Creates an instance of jUnit test.
- */
- public TestToValue() {
- super();
- }
-
- /**
- * Creates an instance of jUnit test.
- * @param name jUnit test name.
- */
- public TestToValue(final String name) {
- super(name);
- }
-
- /**
- * jUnit test method.
- */
- @Override
- public void test() {
- LogCategoryHelper.testToValue();
- }
-
- }
-
- /**
- * Test {@code LogCategory.getNameSpace(String)} method.
- */
- public static final class TestGetNameSpace extends LogCategoryTests {
-
- /**
- * Creates an instance of jUnit test.
- */
- public TestGetNameSpace() {
- super();
- }
-
- /**
- * Creates an instance of jUnit test.
- * @param name jUnit test name.
- */
- public TestGetNameSpace(final String name) {
- super(name);
- }
-
- /**
- * jUnit test method.
- * @throws NoSuchFieldException If there is a problem in {@code ReflectionHelper} call.
- * @throws SecurityException If there is a problem in {@code ReflectionHelper} call.
- * @throws IllegalArgumentException If there is a problem in {@code ReflectionHelper} call.
- * @throws IllegalAccessException If there is a problem in {@code ReflectionHelper} call.
- */
- @Override
- public void test() throws ReflectiveOperationException {
- LogCategoryHelper.testGetNameSpace();
- }
-
- }
-
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/logging/LogLevelTests.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/logging/LogLevelTests.java
deleted file mode 100644
index e7e6886..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/logging/LogLevelTests.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Tomas Kraus - Initial implementation
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.logging;
-
-import org.eclipse.persistence.logging.LogLevelHelper;
-import org.eclipse.persistence.testing.framework.TestCase;
-import org.eclipse.persistence.testing.framework.TestSuite;
-
-/**
- * Unit tests for EclipseLink log levels enumeration.
- */
-public class LogLevelTests extends TestCase {
-
- /**
- * Add tests from this class into provided test suite.
- * @param suite Test suite where to add tests.
- */
- public static void addTests(final TestSuite suite) {
- suite.addTest(new TestLength());
- suite.addTest(new TestToValue());
- suite.addTest(new TestShouldLog());
- }
-
- /**
- * Creates an instance of jUnit tests for EclipseLink log levels enumeration.
- */
- public LogLevelTests() {
- super();
- }
-
- /**
- * Creates an instance of jUnit tests for EclipseLink log levels enumeration.
- * @param name jUnit test name.
- */
- public LogLevelTests(final String name) {
- super();
- setName(name);
- }
-
- /**
- * Setup unit test.
- */
- public void setup() {
- }
-
- /**
- * Clean this test suite.
- */
- public void reset() {
- }
-
- /**
- * Test {@code LogLevel.length} value.
- */
- public static final class TestLength extends LogLevelTests {
-
- /**
- * Creates an instance of jUnit test.
- */
- public TestLength() {
- super();
- }
-
- /**
- * Creates an instance of jUnit test.
- * @param name jUnit test name.
- */
- public TestLength(final String name) {
- super(name);
- }
-
- /**
- * jUnit test method.
- */
- @Override
- public void test() {
- LogLevelHelper.testLength();
- }
-
- }
-
- /**
- * Test {@code LogLevel.toValue(String)} method.
- */
- public static final class TestToValue extends LogLevelTests {
-
- /**
- * Creates an instance of jUnit test.
- */
- public TestToValue() {
- super();
- }
-
- /**
- * Creates an instance of jUnit test.
- * @param name jUnit test name.
- */
- public TestToValue(final String name) {
- super(name);
- }
-
- /**
- * jUnit test method.
- */
- @Override
- public void test() {
- LogLevelHelper.testToValueString();
- LogLevelHelper.testToValueInt();
- LogLevelHelper.testToValueIntFallBack();
- }
-
- }
-
- /**
- * Test {@code LogLevel.toValue(String)} method.
- */
- public static final class TestShouldLog extends LogLevelTests {
-
- /**
- * Creates an instance of jUnit test.
- */
- public TestShouldLog() {
- super();
- }
-
- /**
- * Creates an instance of jUnit test.
- * @param name jUnit test name.
- */
- public TestShouldLog(final String name) {
- super(name);
- }
-
- /**
- * jUnit test method.
- */
- @Override
- public void test() {
- LogLevelHelper.testShouldLogOnLogLevel();
- LogLevelHelper.testShouldLogOnId();
- }
-
- }
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/logging/LoggingTestSuite.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/logging/LoggingTestSuite.java
deleted file mode 100644
index b31bb00..0000000
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/logging/LoggingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Tomas Kraus - Initial implementation
- ******************************************************************************/
-package org.eclipse.persistence.testing.tests.logging;
-
-import org.eclipse.persistence.testing.framework.TestSuite;
-
-/**
- * Logging test suite.
- */
-public class LoggingTestSuite extends TestSuite {
-
- /**
- * Creates an instance of logger tests.
- */
- public LoggingTestSuite() {
- setDescription("This suite tests all of the functionality of the logging framework.");
- }
-
- /**
- * Creates an instance of logger tests.
- * @param isSRG Indicates whether the test runs as SRG.
- */
- public LoggingTestSuite(final boolean isSRG) {
- super(isSRG);
- setDescription("This suite tests all of the functionality of the logging framework.");
- }
-
- /**
- * Add tests into this test suite.
- */
- public void addTests() {
- addSRGTests();
- // EclipseLink logging categories enumeration tests.
- LogCategoryTests.addTests(this);
- // EclipseLink log levels enumeration tests.
- LogLevelTests.addTests(this);
- }
-
- // SRG test set is maintained by QA only, do NOT add any new test cases into it.
- /**
- * Add SRG tests into this test suite.
- */
- public void addSRGTests() {
- }
-
-}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/MappingTestModel.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/MappingTestModel.java
index 98f05a8..34c6168 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/MappingTestModel.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/mapping/MappingTestModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -57,7 +57,6 @@
//CR3922 Test buildSelectionCriteria in one-to-one and one-to-many mapping
addTest(getBuildSelectionCriteriaTestSuite());
addTest(getSameNameMappingTestSuite());
- addTest(getConvertAttributeNameTestSuite());
}
public static TestSuite getAdditionalJoinTest() {
@@ -284,15 +283,4 @@
return suite;
}
-
- /**
- * Creates test suite for {@code @Convert} annotation {@code attributeName} argument processing.
- * @return Initialized test suite.
- */
- public static TestSuite getConvertAttributeNameTestSuite() {
- TestSuite suite = new TestSuite();
- suite.addTestSuite(org.eclipse.persistence.testing.tests.mapping.conversion.AttributeNamePrefixTest.class);
- suite.addTestSuite(org.eclipse.persistence.testing.tests.mapping.conversion.AttributeNameTokenizerTest.class);
- return suite;
- }
}
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/SecurityTestModel.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/SecurityTestModel.java
index 232971a..39c2a32 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/SecurityTestModel.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/security/SecurityTestModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -41,20 +41,10 @@
}
public void addTests() {
- addTest(getJCETestSuite());
addTest(getValidationSecurityTestSuite());
addTest(new DatabaseLoginWithNoEncryptorTest());
- addTest(getSecurableBackwardsCompatibilityTestSuite());
}
- public static TestSuite getJCETestSuite() {
- TestSuite suite = new TestSuite();
- suite.setName("JCEEncryptor");
- suite.setDescription("This suite tests the TopLink password encryption schemes");
- suite.addTest(new JCEEncryptionTest());
- return suite;
- }
-
public static TestSuite getValidationSecurityTestSuite() {
TestSuite suite = new TestSuite();
suite.setName("Validation Security Tests");
@@ -78,21 +68,6 @@
return suite;
}
- public static TestSuite getSecurableBackwardsCompatibilityTestSuite() {
- TestSuite suite = new TestSuite();
- suite.setName("Securable Backward Compatibility Tests");
- suite.setDescription("Tests the backwards compatibility of the (default) Securable reference implementation");
-
- suite.addTest(new SecurableBackwardsCompatibilityTest("testStringDecryption_PlainText"));
- suite.addTest(new SecurableBackwardsCompatibilityTest("testStringDecryption_DES_ECB"));
- suite.addTest(new SecurableBackwardsCompatibilityTest("testStringDecryption_AES_CBC"));
- suite.addTest(new SecurableBackwardsCompatibilityTest("testStringDecryption_AES_ECB"));
- suite.addTest(new SecurableBackwardsCompatibilityTest("testNullParameterDecryption"));
- suite.addTest(new SecurableBackwardsCompatibilityTest("testNullParameterEncryption"));
-
- return suite;
- }
-
/**
* Return the JUnit suite to allow JUnit runner to find it.
* Unfortunately JUnit only allows suite methods to be static,
diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLTestModel.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLTestModel.java
index 106e5d5..4d9e463 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLTestModel.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLTestModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -108,7 +108,6 @@
suite.addTest(new SessionManagerGetSessionStringStringTest());
suite.addTest(new SessionManagerGetSessionNotFoundTest());
suite.addTest(new MWConfigModelEncryptionTest());
- suite.addTestSuite(SessionManagerTest.class);
return suite;
}
