This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openjpa.git
The following commit(s) were added to refs/heads/master by this push: new e68083e move to org.junit.Assert e68083e is described below commit e68083e8d07646278fff970fc811f6bbb962fc9a Author: Mark Struberg <strub...@apache.org> AuthorDate: Sat Apr 3 18:03:42 2021 +0200 move to org.junit.Assert --- .../java/org/apache/openjpa/jdbc/sql/TestBooleanRepresentation.java | 2 +- .../test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java | 2 +- .../openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java | 4 ++-- .../persistence/embed/attrOverrides/TestAttrOverridesXml.java | 2 +- .../persistence/embed/compositepk/TestCompositePrimaryKeys.java | 2 +- .../org/apache/openjpa/persistence/external/TestExternalValues.java | 2 +- .../openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java | 2 +- .../persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java | 2 +- .../persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java | 2 +- .../persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java | 2 +- .../persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java | 2 +- .../persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java | 2 +- .../persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java | 2 +- .../persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java | 2 +- .../persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java | 2 +- .../persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java | 2 +- .../persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java | 2 +- .../persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java | 2 +- .../persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java | 2 +- .../persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java | 2 +- .../persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java | 2 +- .../persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java | 2 +- .../persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java | 2 +- .../persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java | 2 +- .../persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java | 2 +- .../persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java | 2 +- .../persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java | 2 +- .../persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java | 2 +- .../persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java | 2 +- .../persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java | 2 +- .../persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java | 2 +- .../java/org/apache/openjpa/persistence/kernel/TestFieldRange.java | 2 +- .../org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java | 2 +- .../org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java | 2 +- .../org/apache/openjpa/persistence/relations/TestO2ORefColumn.java | 2 +- .../relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java | 2 +- .../java/org/apache/openjpa/tools/maven/test/ItDropSchemaTest.java | 6 ++++-- 37 files changed, 41 insertions(+), 39 deletions(-) diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestBooleanRepresentation.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestBooleanRepresentation.java index 90a44b4..6c5819d 100644 --- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestBooleanRepresentation.java +++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestBooleanRepresentation.java @@ -27,7 +27,7 @@ import java.sql.SQLException; import org.apache.openjpa.lib.jdbc.DelegatingPreparedStatement; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java index 47dbb16..1ed47f4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java @@ -26,7 +26,7 @@ import org.apache.openjpa.persistence.entity.EntityB; import org.apache.openjpa.persistence.entity.EntityC; import org.apache.openjpa.persistence.test.SingleEMFTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestOpenJPA2330 extends SingleEMFTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java index d717dd2..ac6f874 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java @@ -27,7 +27,7 @@ import javax.persistence.Query; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestAssocOverrides extends SQLListenerTestCase { public int numEmployees = 2; @@ -229,7 +229,7 @@ public class TestAssocOverrides extends SQLListenerTestCase { public void findObj2() { EntityManager em = emf.createEntityManager(); PartTimeEmployee p = em.find(PartTimeEmployee.class, 1); - Assert.assertEquals(p.getHourlyWage(), (float)100); + Assert.assertEquals(p.getHourlyWage(), (float)100, 0.001f); em.close(); } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java index fc0c910..1c29aea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java @@ -34,7 +34,7 @@ import org.apache.openjpa.jdbc.sql.DBDictionary; import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestAttrOverridesXml extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java index 8af1319..d24f724 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java @@ -34,7 +34,7 @@ import javax.persistence.criteria.Root; import org.apache.openjpa.persistence.test.SingleEMFTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestCompositePrimaryKeys extends SingleEMFTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java index 67bda94..5201d08 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java @@ -27,7 +27,7 @@ import javax.persistence.Query; import org.apache.openjpa.persistence.RollbackException; import org.apache.openjpa.persistence.test.SingleEMFTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestExternalValues extends SingleEMFTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java index 9c5d77d..77b740e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java @@ -32,7 +32,7 @@ import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMap extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java index 82750df..761ec81 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx1 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java index 636ccec..63bae5e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java @@ -34,7 +34,7 @@ import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx10 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java index 574f163..d213eed 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java @@ -31,7 +31,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx2 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java index ed237ec..19ffbd1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java @@ -31,7 +31,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx3 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java index 773d17c..5a3ecb8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx4 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java index 33bbe6f..7b950af 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx5 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java index 209085c..9b7c11c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx6 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java index 0eb4fce..f067236 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx7 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java index 142efa9..68217e2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java @@ -31,7 +31,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx8 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java index efb9421..b59f44d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestMany2ManyMapEx9 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java index 35f6799..6e4b8ed 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java @@ -34,7 +34,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_26 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java index 344bc6d..91159d1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_26_Ex1 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java index 84159dc..499c5f2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_26_Ex2 extends SQLListenerTestCase { public int numDepartments = 2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java index 6b25b9b..263ef91 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_26_Ex3 extends SQLListenerTestCase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java index ecb9c31..a877095 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java @@ -30,7 +30,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_27 extends SQLListenerTestCase { public int numItems = 2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java index 1d17d00..716f77d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_27_Ex3 extends SQLListenerTestCase { public int numCompany = 2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java index b62bf6a..242a28f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java @@ -31,7 +31,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_27_Ex4 extends SQLListenerTestCase { public int numCompany = 2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java index e680f50..58c22fd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_27_Ex5 extends SQLListenerTestCase { public int numCompany = 2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java index 29f7741..9b65c87 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java @@ -31,7 +31,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_27_Ex6 extends SQLListenerTestCase { public int numCompany = 2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java index 551db66..bc3aee9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_27_Ex7 extends SQLListenerTestCase { public int numCompany = 2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java index e29df86..4ce00e7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java @@ -32,7 +32,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; import static junit.framework.TestCase.assertEquals; import org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex6.Division; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java index 52a2098..6ba29df 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java @@ -31,7 +31,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_29_Ex1 extends SQLListenerTestCase { public int numCompany = 2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java index 6ea174e..f305b41 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java @@ -30,7 +30,7 @@ import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestSpec10_1_29_Ex3 extends SQLListenerTestCase { public int numStudents = 2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java index d63aa63..368150e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java @@ -30,7 +30,7 @@ import javax.persistence.criteria.Root; import org.apache.openjpa.persistence.test.SQLListenerTestCase; -import junit.framework.Assert; +import org.junit.Assert; /** * Tests JQPL and Criteria API equivalent using left join fetch with QueryCache and DataCache enabled. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java index b56bdd0..04f893e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java @@ -35,7 +35,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.AssertionFailedError; public class TestFieldRange extends BaseKernelTest { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java index 6bcb0b8..70fb7db 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java @@ -27,7 +27,7 @@ import org.apache.openjpa.persistence.OpenJPAQuery; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.AssertionFailedError; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java index d7016f0..370d671 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java @@ -33,7 +33,7 @@ import org.apache.openjpa.jdbc.sql.SQLServerDictionary; import org.apache.openjpa.jdbc.sql.SybaseDictionary; import org.apache.openjpa.persistence.test.SingleEMFTestCase; -import junit.framework.Assert; +import org.junit.Assert; /** * Test JDBC escape syntax for date, time, and timestamp literals diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java index 5d89aa5..2af1e6b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java @@ -22,7 +22,7 @@ import javax.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; -import junit.framework.Assert; +import org.junit.Assert; /** * Unit test to verify the foreign key of a Join column in an association (aText), that is exposed as an diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java index dd6c68d..42dd226 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java @@ -24,7 +24,7 @@ import javax.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; -import junit.framework.Assert; +import org.junit.Assert; public class TestRelationFieldAsPrimaryKeyAndForeignKey diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/test/java/org/apache/openjpa/tools/maven/test/ItDropSchemaTest.java b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/test/java/org/apache/openjpa/tools/maven/test/ItDropSchemaTest.java index 7a0d6cd..3493c43 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/test/java/org/apache/openjpa/tools/maven/test/ItDropSchemaTest.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/test/java/org/apache/openjpa/tools/maven/test/ItDropSchemaTest.java @@ -18,13 +18,14 @@ */ package org.apache.openjpa.tools.maven.test; -import junit.framework.TestCase; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; +import org.junit.Test; +import static org.junit.Assert.*; -public class ItDropSchemaTest extends TestCase { +public class ItDropSchemaTest { /** contains the directory where all generated results are placed */ private final static String TARGET_DIR = "target"; @@ -39,6 +40,7 @@ public class ItDropSchemaTest extends TestCase { * check if the generated SQL script is correct. * @throws Exception */ + @Test public void testSqlGeneration() throws Exception { File sqlFile = new File( TARGET_DIR, SQL_FILE );