Fixing some minor warnings and errors in JPA tests

Signed-off-by: Will Dazey <[email protected]>
eclipse-ee4j · Apr 10, 2019 · e238532 · e238532
1 parent c6923e1
commit e238532
Show file tree

Hide file tree

Showing 344 changed files with 10,474 additions and 2,198 deletions.
diff --git a/antbuild.xml b/antbuild.xml
@@ -1581,10 +1581,10 @@
     <target name="test-jpa" description="run the jpa tests">
         <ant antfile="antbuild.xml" dir="${eclipselink.jpa.test}" target="test-lrg"/>
     </target>
-    <target name="test-jpa21" description="run the jpa tests">
+    <target name="test-jpa21" description="run the jpa 21 tests">
         <ant antfile="antbuild.xml" dir="${eclipselink.jpa.test}" target="test-lrg"/>
     </target>
-    <target name="test-jpa22" description="run the jpa tests">
+    <target name="test-jpa22" description="run the jpa 22 tests">
         <ant antfile="antbuild.xml" dir="${eclipselink.jpa.test}" target="test-lrg22"/>
     </target>
     <!-- Run JPA SRG. -->

diff --git a/...se/persistence/testing/tests/distributedservers/rcm/jgroups/JGroupsConfigurationTest.java b/...se/persistence/testing/tests/distributedservers/rcm/jgroups/JGroupsConfigurationTest.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,7 +20,6 @@
 import org.eclipse.persistence.sessions.coordination.RemoteCommandManager;
 import org.eclipse.persistence.sessions.coordination.TransportManager;
 import org.eclipse.persistence.testing.tests.distributedservers.rcm.ConfigurableCacheSyncDistributedTest;
-import org.junit.Assert;
 
 import java.lang.reflect.Field;
 
@@ -38,9 +38,9 @@ protected void test() throws Throwable {
         RemoteConnection connection = transport.getConnectionToLocalHost();
         try {
             int multicastPort = getMulticastPort(connection);
-            Assert.assertEquals("Default multicast port different than expected", 45588, multicastPort);
+            assertEquals("Default multicast port different than expected", 45588, multicastPort);
         } catch (Exception x) {
-            Assert.fail("Failed to retrieve multicast port: " + x.getMessage());
+            fail("Failed to retrieve multicast port: " + x.getMessage());
         } finally {
             connection.close();
         }
@@ -53,9 +53,9 @@ protected void test() throws Throwable {
         connection = transport.getConnectionToLocalHost();
         try {
             int multicastPort = getMulticastPort(connection);
-            Assert.assertEquals("Configured multicast port different than expected", 45678, multicastPort);
+            assertEquals("Configured multicast port different than expected", 45678, multicastPort);
         } catch (Exception x) {
-            Assert.fail("Failed to retrieve multicast port: " + x.getMessage());
+            fail("Failed to retrieve multicast port: " + x.getMessage());
         } finally {
             connection.close();
         }

diff --git a/...org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java b/...org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,7 +25,6 @@
 
 //JUnit4 imports
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -90,7 +90,7 @@ protected void assertDefaultValues(DynamicEntity simpleInstance) {
     @Override
     public DynamicEntity createSimpleInstance(Session session, int id) {
         DynamicType simpleEntityType = dynamicHelper.getType("Simple");
-        Assert.assertNotNull(simpleEntityType);
+        assertNotNull(simpleEntityType);
 
         DynamicEntity simpleInstance = simpleEntityType.newDynamicEntity();
         simpleInstance.set("id1", id);

diff --git a/...re.test/src/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java b/...re.test/src/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +26,6 @@
 //JUnit4 imports
 import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -162,7 +162,7 @@ protected void assertDefaultValues(DynamicEntity simpleInstance) {
 
     public DynamicEntity createSimpleInstance(Session session, int id) {
         DynamicType simpleEntityType = dynamicHelper.getType("Simple");
-        Assert.assertNotNull(simpleEntityType);
+        assertNotNull(simpleEntityType);
 
         DynamicEntity simpleInstance = simpleEntityType.newDynamicEntity();
         simpleInstance.set("id", id);

diff --git a/...src/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java b/...src/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +27,6 @@
 //JUnit4 imports
 import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -174,7 +174,7 @@ protected void assertDefaultValues(DynamicEntity simpleInstance) {
 
     public DynamicEntity createSimpleInstance(Session session, int id) {
         DynamicType simpleEntityType = dynamicHelper.getType("Simple");
-        Assert.assertNotNull(simpleEntityType);
+        assertNotNull(simpleEntityType);
 
         DynamicEntity simpleInstance = simpleEntityType.newDynamicEntity();
         simpleInstance.set("id", id);

diff --git a/...clipse/persistence/testing/tests/dynamic/simple/mappings/SimpleTypes_AggregateObject.java b/...clipse/persistence/testing/tests/dynamic/simple/mappings/SimpleTypes_AggregateObject.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +39,6 @@
 import org.eclipse.persistence.sessions.UnitOfWork;
 import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -147,7 +147,7 @@ public void verifyConfig() throws Exception {
     @Test
     public void verifyProperties() {
         DynamicType simpleTypeA = dynamicHelper.getType("SimpleA");
-        Assert.assertNotNull(simpleTypeA);
+        assertNotNull(simpleTypeA);
 
         assertEquals(4, simpleTypeA.getNumberOfProperties());
         assertEquals("id", simpleTypeA.getPropertiesNames().get(0));
@@ -159,7 +159,7 @@ public void verifyProperties() {
     @Test
     public void createSimpleA() {
         DynamicType simpleTypeA = dynamicHelper.getType("SimpleA");
-        Assert.assertNotNull(simpleTypeA);
+        assertNotNull(simpleTypeA);
 
         DynamicEntity a = simpleTypeA.newDynamicEntity();
 
@@ -179,7 +179,7 @@ public void createSimpleA() {
     @Test
     public void persistSimpleA() {
         DynamicType simpleTypeA = dynamicHelper.getType("SimpleA");
-        Assert.assertNotNull(simpleTypeA);
+        assertNotNull(simpleTypeA);
 
         DynamicEntity simpleInstance = simpleTypeA.newDynamicEntity();
         simpleInstance.set("id", 1);
@@ -193,15 +193,15 @@ public void persistSimpleA() {
         countQuery.addCount();
         countQuery.setShouldReturnSingleValue(true);
         int simpleCount = ((Number) session.executeQuery(countQuery)).intValue();
-        Assert.assertEquals(1, simpleCount);
+        assertEquals(1, simpleCount);
     }
 
     @Test
     public void verifyChangTracking() {
         persistSimpleA();
 
         DynamicType simpleTypeA = dynamicHelper.getType("SimpleA");
-        Assert.assertNotNull(simpleTypeA);
+        assertNotNull(simpleTypeA);
 
         UnitOfWork uow = session.acquireUnitOfWork();
 
@@ -227,11 +227,11 @@ public void verifyChangTracking() {
     @Test
     public void createSimpleAwithSimpleB() {
         DynamicType simpleTypeA = dynamicHelper.getType("SimpleA");
-        Assert.assertNotNull(simpleTypeA);
+        assertNotNull(simpleTypeA);
         DynamicType simpleTypeB = dynamicHelper.getType("SimpleB");
-        Assert.assertNotNull(simpleTypeB);
+        assertNotNull(simpleTypeB);
 
-        Assert.assertNotNull(session.getDescriptorForAlias("SimpleB"));
+        assertNotNull(session.getDescriptorForAlias("SimpleB"));
 
         DynamicEntity simpleInstanceB = simpleTypeB.newDynamicEntity();
         simpleInstanceB.set("value2", true);
@@ -251,7 +251,7 @@ public void createSimpleAwithSimpleB() {
         countQuery.setShouldReturnSingleValue(true);
 
         int simpleCountA = ((Number) session.executeQuery(countQuery)).intValue();
-        Assert.assertEquals(1, simpleCountA);
+        assertEquals(1, simpleCountA);
     }
 
 }
diff --git a/...org/eclipse/persistence/testing/tests/dynamic/simple/mappings/SimpleTypes_ManyToMany.java b/...org/eclipse/persistence/testing/tests/dynamic/simple/mappings/SimpleTypes_ManyToMany.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,7 +30,6 @@
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -141,7 +141,7 @@ public void createSimpleA() {
         countQuery.addCount();
         countQuery.setShouldReturnSingleValue(true);
         int simpleCount = ((Number) session.executeQuery(countQuery)).intValue();
-        Assert.assertEquals(1, simpleCount);
+        assertEquals(1, simpleCount);
     }
 
     @Test
@@ -158,7 +158,7 @@ public void createSimpleB() {
         countQuery.addCount();
         countQuery.setShouldReturnSingleValue(true);
         int simpleCount = ((Number) session.executeQuery(countQuery)).intValue();
-        Assert.assertEquals(1, simpleCount);
+        assertEquals(1, simpleCount);
     }
 
     @Test
@@ -181,13 +181,13 @@ public void createAwithB() {
         countQueryB.addCount();
         countQueryB.setShouldReturnSingleValue(true);
         int simpleCountB = ((Number) session.executeQuery(countQueryB)).intValue();
-        Assert.assertEquals(1, simpleCountB);
+        assertEquals(1, simpleCountB);
 
         ReportQuery countQueryA = dynamicHelper.newReportQuery("SimpleA", new ExpressionBuilder());
         countQueryA.addCount();
         countQueryA.setShouldReturnSingleValue(true);
         int simpleCountA = ((Number) session.executeQuery(countQueryA)).intValue();
-        Assert.assertEquals(1, simpleCountA);
+        assertEquals(1, simpleCountA);
     }
 
     @Ignore

diff --git a/...org/eclipse/persistence/testing/tests/dynamic/simple/mappings/SimpleTypes_MultiTable.java b/...org/eclipse/persistence/testing/tests/dynamic/simple/mappings/SimpleTypes_MultiTable.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,7 +37,6 @@
 import org.eclipse.persistence.sessions.UnitOfWork;
 import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -122,7 +122,7 @@ public void verifyConfig() throws Exception {
     @Test
     public void verifyProperties() {
         DynamicType simpleTypeA = dynamicHelper.getType("SimpleA");
-        Assert.assertNotNull(simpleTypeA);
+        assertNotNull(simpleTypeA);
 
         assertEquals(6, simpleTypeA.getNumberOfProperties());
         assertTrue(simpleTypeA.getPropertiesNames().contains("id"));
@@ -143,23 +143,23 @@ public void verifyProperties() {
     @Test
     public void createSimpleA() {
         DynamicType simpleTypeA = dynamicHelper.getType("SimpleA");
-        Assert.assertNotNull(simpleTypeA);
+        assertNotNull(simpleTypeA);
 
         DynamicEntity a = simpleTypeA.newDynamicEntity();
 
         assertNotNull(a);
         assertEquals(((Number) a.get("id")).intValue(), 0);
         assertFalse(a.isSet("value1"));
-        assertEquals(a.get("value2"), false);
+        assertEquals(false, a.get("value2"));
         assertFalse(a.isSet("value3"));
-        assertEquals(((Number) a.get("value4")).doubleValue(), 0.0, 0.01);
+        assertEquals(0.0, ((Number) a.get("value4")).doubleValue(), 0.01);
         assertFalse(a.isSet("value5"));
     }
 
     @Test
     public void persistSimpleA() {
         DynamicType simpleTypeA = dynamicHelper.getType("SimpleA");
-        Assert.assertNotNull(simpleTypeA);
+        assertNotNull(simpleTypeA);
 
         DynamicEntity simpleInstance = simpleTypeA.newDynamicEntity();
         simpleInstance.set("id", 1);
@@ -173,7 +173,7 @@ public void persistSimpleA() {
         countQuery.addCount();
         countQuery.setShouldReturnSingleValue(true);
         int simpleCount = ((Number) session.executeQuery(countQuery)).intValue();
-        Assert.assertEquals(1, simpleCount);
+        assertEquals(1, simpleCount);
 
         session.release();
     }
@@ -182,7 +182,7 @@ public void persistSimpleA() {
     public void verifyChangeTracking() {
         persistSimpleA();
         DynamicType simpleTypeA = dynamicHelper.getType("SimpleA");
-        Assert.assertNotNull(simpleTypeA);
+        assertNotNull(simpleTypeA);
 
         UnitOfWork uow = session.acquireUnitOfWork();