From b973cc3b8624c46eec6750320baddef5d0ff6b83 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 2 Jul 2014 23:29:54 +1200 Subject: [PATCH] No effective change - imports of Assert in tests + formatting --- .../com/avaje/ebean/TestDirtyProperties.java | 3 +- .../server/querydefn/TestQueryLanguage.java | 8 +- .../server/util/ClassPathSearchTests.java | 8 +- .../com/avaje/tests/basic/MainDbBoolean.java | 2 +- .../com/avaje/tests/basic/MainFutureList.java | 176 ------------------ .../tests/basic/TestAssocOneEqExpression.java | 3 +- .../tests/basic/TestBeanReferenceRefresh.java | 3 +- .../com/avaje/tests/basic/TestFetchId.java | 3 +- .../com/avaje/tests/basic/TestIUDVanilla.java | 3 +- .../com/avaje/tests/basic/TestInEmpty.java | 3 +- .../com/avaje/tests/basic/TestInheritRef.java | 3 +- .../com/avaje/tests/basic/TestJodaType.java | 3 +- .../tests/basic/TestJoinInheritance.java | 3 +- .../tests/basic/TestLazyLoadInCache.java | 3 +- .../avaje/tests/basic/TestLoadBeanCache.java | 3 +- .../tests/basic/TestLogTransLogOnError.java | 8 +- .../com/avaje/tests/basic/TestM2MVanilla.java | 3 +- .../avaje/tests/basic/TestManyLazyLoad.java | 3 +- .../tests/basic/TestOrderByAnnotation.java | 3 +- .../basic/TestOrderTotalAmountReportBean.java | 3 +- .../tests/basic/TestOrderTotalAmountSql.java | 3 +- .../com/avaje/tests/basic/TestPaging.java | 3 +- .../tests/basic/TestPersistenceContext.java | 3 +- .../java/com/avaje/tests/basic/TestQuery.java | 3 +- .../com/avaje/tests/basic/TestQueryParse.java | 3 +- .../tests/basic/TestQueryWhereBetween.java | 3 +- .../avaje/tests/basic/TestQueryWithCache.java | 3 +- .../tests/basic/TestReadOnlyPropagation.java | 3 +- .../tests/basic/TestSaveDeleteOneToOne.java | 3 +- .../basic/TestSaveDeleteOneToOneMultiple.java | 3 +- .../com/avaje/tests/basic/TestTransient.java | 3 +- .../tests/basic/TestWhereAnnotation.java | 3 +- .../basic/encrypt/TestEncryptBinary.java | 3 +- .../tests/basic/event/TestQueryAdapter.java | 3 +- .../one2one/TestOne2OneBookingInvoice.java | 3 +- .../batchload/TestBatchLazyWithCacheHits.java | 3 +- .../batchload/TestBatchLazyWithDeleted.java | 6 +- .../avaje/tests/batchload/TestLazyJoin.java | 3 +- .../avaje/tests/batchload/TestLazyJoin2.java | 3 +- .../TestLazyLoadNonExistantBean.java | 3 +- .../avaje/tests/batchload/TestQueryJoin.java | 3 +- .../batchload/TestQueryJoinToAssocOne.java | 3 +- .../batchload/TestSecondQueryNoRows.java | 3 +- .../com/avaje/tests/cache/TestCacheBasic.java | 4 +- .../avaje/tests/cache/TestCacheNaturalId.java | 3 +- .../tests/cache/TestExternalNotification.java | 3 +- .../tests/cache/TestQueryCacheCountry.java | 3 +- .../tests/cache/TestQueryCacheInsert.java | 3 +- .../tests/compositekeys/TestCKeyDelete.java | 3 +- .../tests/compositekeys/TestCKeyLazyLoad.java | 3 +- .../com/avaje/tests/config/TestTableName.java | 8 +- .../avaje/tests/ddd/iud/TestDExhEntityEl.java | 12 -- .../avaje/tests/ddd/iud/TestDPersonEl.java | 10 - .../avaje/tests/ddd/iud/TestDPersonIUD.java | 11 -- .../java/com/avaje/tests/el/TestELBasic.java | 8 +- .../enhancement/TestEnhancementEquals.java | 3 +- .../avaje/tests/genkey/TestGeneratedKeys.java | 2 +- .../com/avaje/tests/genkey/TestSeqBatch.java | 8 +- .../idkeys/TestPropertyChangeSupport.java | 1 - .../tests/idkeys/TestSimpleIdInsert.java | 8 +- .../tests/iud/TestInsertQueryUpdate.java | 3 +- .../tests/iud/TestInsertUpdateTrans.java | 3 +- .../java/com/avaje/tests/lib/SimpleTest.java | 13 -- .../java/com/avaje/tests/lib/TestMessage.java | 7 +- .../OptimisticLockExceptionThrowingDao.java | 3 +- .../model/selfref/TestTextJsonSelfRef.java | 5 +- .../tests/query/TestDefaultFetchLazy.java | 3 +- .../TestInheritQuery.java | 3 +- .../tests/sp/TestManyToManySaveTwice.java | 3 +- .../json/TestTextJsonBeanReadVisitor.java | 3 +- ...TextJsonBeanReadVisitorWithCustomJson.java | 3 +- .../TestDeleteFromPersistenceContext.java | 3 +- .../avaje/tests/transaction/TestNested.java | 3 +- .../avaje/tests/unitinternal/TestBasics.java | 7 +- .../unitinternal/TestGlobalPropsEval.java | 37 ++-- .../tests/unitinternal/TestLocaleParse.java | 76 ++++---- .../tests/unitinternal/TestOrderByParse.java | 3 +- .../unitinternal/TestOriginIntEncoding.java | 3 +- .../unitinternal/TestSimpleEncryptor.java | 3 +- 79 files changed, 160 insertions(+), 436 deletions(-) delete mode 100644 src/test/java/com/avaje/tests/basic/MainFutureList.java delete mode 100644 src/test/java/com/avaje/tests/lib/SimpleTest.java diff --git a/src/test/java/com/avaje/ebean/TestDirtyProperties.java b/src/test/java/com/avaje/ebean/TestDirtyProperties.java index fc4646eb2..14dcff31b 100644 --- a/src/test/java/com/avaje/ebean/TestDirtyProperties.java +++ b/src/test/java/com/avaje/ebean/TestDirtyProperties.java @@ -3,8 +3,7 @@ package com.avaje.ebean; import java.util.Map; import java.util.Set; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.bean.EntityBean; diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/TestQueryLanguage.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/TestQueryLanguage.java index abad84114..9706fa4fc 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/TestQueryLanguage.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/TestQueryLanguage.java @@ -2,16 +2,18 @@ package com.avaje.ebeaninternal.server.querydefn; import java.util.Set; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; +import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebeaninternal.server.expression.DefaultExpressionFactory; import com.avaje.tests.model.basic.Order; -public class TestQueryLanguage extends TestCase { +public class TestQueryLanguage extends BaseTestCase { + @Test public void test() { DefaultOrmQuery q = check("find order join customer (id, name)"); diff --git a/src/test/java/com/avaje/ebeaninternal/server/util/ClassPathSearchTests.java b/src/test/java/com/avaje/ebeaninternal/server/util/ClassPathSearchTests.java index 2f28f9725..217a3f86d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/util/ClassPathSearchTests.java +++ b/src/test/java/com/avaje/ebeaninternal/server/util/ClassPathSearchTests.java @@ -1,9 +1,5 @@ package com.avaje.ebeaninternal.server.util; -import junit.framework.Assert; -import org.apache.commons.io.IOUtils; -import org.junit.Test; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -14,6 +10,10 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; +import org.apache.commons.io.IOUtils; +import org.junit.Assert; +import org.junit.Test; + /** * This ensures that the ClassPathSearch supports normal file:file.jar files as well as jar/war files * with bang paths. Bang paths typically look like this as a url: diff --git a/src/test/java/com/avaje/tests/basic/MainDbBoolean.java b/src/test/java/com/avaje/tests/basic/MainDbBoolean.java index a334edc11..57ca2674d 100644 --- a/src/test/java/com/avaje/tests/basic/MainDbBoolean.java +++ b/src/test/java/com/avaje/tests/basic/MainDbBoolean.java @@ -2,7 +2,7 @@ package com.avaje.tests.basic; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.EbeanServerFactory; diff --git a/src/test/java/com/avaje/tests/basic/MainFutureList.java b/src/test/java/com/avaje/tests/basic/MainFutureList.java deleted file mode 100644 index 3b9781fcf..000000000 --- a/src/test/java/com/avaje/tests/basic/MainFutureList.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.avaje.tests.basic; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.List; -import java.util.concurrent.Future; - -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.FutureList; -import com.avaje.ebean.Query; -import com.avaje.ebean.SqlFutureList; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.DataSourceConfig; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; -import com.avaje.tests.model.basic.TOne; - -public class MainFutureList { - - public static void main(String[] args) throws Exception { - - checkFutureRowCount(true); - //testSqlQueryFuture(); - //testOrmFuture(); - } - - public void executeDDL(EbeanServer server, String ddl) { - - Transaction t = server.createTransaction(); - try { - Connection connection = t.getConnection() - ; - - - } finally { - t.end(); - } - - } - - private void executeStmt(Connection c, String ddl) throws SQLException { - java.sql.PreparedStatement pstmt = null; - try { - pstmt = c.prepareStatement(ddl); - pstmt.execute(); - - } finally { - if (pstmt != null) { - pstmt.close(); - } - } - } - - private static EbeanServer createEbeanServer(boolean primary) { - - if (primary){ - return Ebean.getServer(null); - } - - ServerConfig c = new ServerConfig(); - c.setName("pgtest"); - -// // requires postgres driver in class path -// DataSourceConfig postgresDb = new DataSourceConfig(); -// postgresDb.setDriver("org.postgresql.Driver"); -// postgresDb.setUsername("test"); -// postgresDb.setPassword("test"); -// postgresDb.setUrl("jdbc:postgresql://127.0.0.1:5432/test"); -// postgresDb.setHeartbeatSql("select count(*) from t_one"); - - // requires oracle driver in class path - DataSourceConfig oraDb = new DataSourceConfig(); - oraDb.setDriver("oracle.jdbc.driver.OracleDriver"); - oraDb.setUsername("junk"); - oraDb.setPassword("junk"); - oraDb.setUrl("jdbc:oracle:thin:junk/junk@localhost:1521:XE"); - oraDb.setHeartbeatSql("select count(*) from dual"); - - - c.loadFromProperties(); - c.setDdlGenerate(true); - c.setDdlRun(true); - c.setDefaultServer(false); - c.setRegister(false); -// c.setDataSourceConfig(postgresDb); - c.setDataSourceConfig(oraDb); - - //c.setDatabaseBooleanTrue("1"); - //c.setDatabaseBooleanFalse("0"); - //c.setDatabaseBooleanTrue("T"); - //c.setDatabaseBooleanFalse("F"); - - //c.setDatabasePlatform(new Postgres83Platform()); - - c.addClass(TOne.class); - - return EbeanServerFactory.create(c); - - } - - public static void checkFutureRowCount(boolean primay) throws Exception { - - ResetBasicData.reset(); - - EbeanServer server = createEbeanServer(primay); - - Query query = server.find(Order.class); - Future futureRowCount = server.findFutureRowCount(query, null); - boolean done = futureRowCount.isDone(); - - System.out.println("done: "+done); - - Integer rowCount = futureRowCount.get(); - System.out.println("got rc:"+rowCount); - - - } - - public static void checkSqlQueryFuture(boolean primay) throws Exception { - - EbeanServer server = createEbeanServer(primay); - - String sql = "select o.* from all_tables o"; - SqlQuery sqlQuery = server.createSqlQuery(sql); - - SqlFutureList list = server.findFutureList(sqlQuery, null); - System.out.println("start done:"+list.isDone()); - Thread.sleep(200); - if (!list.isDone()){ - list.cancel(true); - } - - if (!list.isCancelled()){ - List list2 = list.get(); - System.out.println("got "+list2.size()); - } - - Thread.sleep(3000); - System.out.println("done sleeping"); - } - - public static void checkOrmFuture() throws Exception { - - - ResetBasicData.reset(); - - //EbeanServer server = Ebean.getServer(null); - - Query query = Ebean.find(Order.class); - - FutureList futureList = query.findFutureList(); - - Thread.sleep(3000); - System.out.println("end of sleep"); - - if (!futureList.isDone()){ - futureList.cancel(true); - } - - System.out.println("and... done:"+futureList.isDone()); - - if (!futureList.isCancelled()){ - //List l0 = futureList.get(30, TimeUnit.SECONDS); - List list = futureList.get(); - System.out.println("list:"+list); - } - - System.out.println("done"); - - } -} diff --git a/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java b/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java index 3fb67f0aa..50fb2fe99 100644 --- a/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java +++ b/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java b/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java index b9c6f61ed..98daf7776 100644 --- a/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java +++ b/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.sql.Date; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestFetchId.java b/src/test/java/com/avaje/tests/basic/TestFetchId.java index edd890e88..471b15fc4 100644 --- a/src/test/java/com/avaje/tests/basic/TestFetchId.java +++ b/src/test/java/com/avaje/tests/basic/TestFetchId.java @@ -3,8 +3,7 @@ package com.avaje.tests.basic; import java.util.List; import java.util.concurrent.ExecutionException; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java b/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java index 546e64837..0cb0b2b7d 100644 --- a/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java +++ b/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.sql.Timestamp; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestInEmpty.java b/src/test/java/com/avaje/tests/basic/TestInEmpty.java index aaecc0368..239ab9b78 100644 --- a/src/test/java/com/avaje/tests/basic/TestInEmpty.java +++ b/src/test/java/com/avaje/tests/basic/TestInEmpty.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestInheritRef.java b/src/test/java/com/avaje/tests/basic/TestInheritRef.java index 6f6f6c3bb..2604d61c8 100644 --- a/src/test/java/com/avaje/tests/basic/TestInheritRef.java +++ b/src/test/java/com/avaje/tests/basic/TestInheritRef.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestJodaType.java b/src/test/java/com/avaje/tests/basic/TestJodaType.java index 69e25397a..1bafb0dfd 100644 --- a/src/test/java/com/avaje/tests/basic/TestJodaType.java +++ b/src/test/java/com/avaje/tests/basic/TestJodaType.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java b/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java index 105338bcb..4a96d35c4 100644 --- a/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java +++ b/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java @@ -4,8 +4,7 @@ import java.sql.Timestamp; import java.util.Date; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java b/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java index a2c22f558..6b898c927 100644 --- a/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java +++ b/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java @@ -3,8 +3,7 @@ package com.avaje.tests.basic; import java.util.Map; import java.util.Set; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java b/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java index 2b87121f6..e688df5b1 100644 --- a/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java +++ b/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.util.Map; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java b/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java index 631170403..9f53c0f65 100644 --- a/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java +++ b/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java @@ -7,7 +7,6 @@ import org.junit.Test; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.EBasicVer; import com.avaje.tests.model.basic.Order; @@ -20,9 +19,9 @@ public class TestLogTransLogOnError extends BaseTestCase { ResetBasicData.reset(); - Transaction t = Ebean.beginTransaction(); + Ebean.beginTransaction(); try { - // t.log("--- hello"); + Ebean.find(Customer.class).findList(); Ebean.find(Order.class).where().gt("id", 1).findList(); @@ -52,9 +51,8 @@ public class TestLogTransLogOnError extends BaseTestCase { ResetBasicData.reset(); - Transaction t = Ebean.beginTransaction(); + Ebean.beginTransaction(); try { - // t.log("--- hello testPersistError"); Ebean.find(Customer.class).findList(); EBasicVer newBean = new EBasicVer(); diff --git a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java b/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java index 99505f080..a3dc99d59 100644 --- a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java +++ b/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java @@ -3,8 +3,7 @@ package com.avaje.tests.basic; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java b/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java index e519f0d58..3849706f5 100644 --- a/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java +++ b/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java @@ -3,8 +3,7 @@ package com.avaje.tests.basic; import java.sql.Date; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java b/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java index d60b8d6cf..9dbeb0516 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java +++ b/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java index 0712ff88e..0a7d53001 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java +++ b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java index c961bca87..2fa6ee997 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java +++ b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestPaging.java b/src/test/java/com/avaje/tests/basic/TestPaging.java index fb434fa9d..0c618caf0 100644 --- a/src/test/java/com/avaje/tests/basic/TestPaging.java +++ b/src/test/java/com/avaje/tests/basic/TestPaging.java @@ -3,8 +3,7 @@ package com.avaje.tests.basic; import java.util.List; import java.util.Random; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java b/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java index 845c2fceb..e28b0abce 100644 --- a/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java +++ b/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestQuery.java b/src/test/java/com/avaje/tests/basic/TestQuery.java index 4f7b4a653..23c1437c2 100644 --- a/src/test/java/com/avaje/tests/basic/TestQuery.java +++ b/src/test/java/com/avaje/tests/basic/TestQuery.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestQueryParse.java b/src/test/java/com/avaje/tests/basic/TestQueryParse.java index d1271aca5..1431f5082 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryParse.java +++ b/src/test/java/com/avaje/tests/basic/TestQueryParse.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java b/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java index 41d80e09c..ad66550d6 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java +++ b/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.sql.Timestamp; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java b/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java index 51b1357ea..d12f0cb24 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java +++ b/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java b/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java index 5f2265f72..11d5e05aa 100644 --- a/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java +++ b/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java @@ -4,8 +4,7 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java b/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java index b7ae86d8f..bb41f8f50 100644 --- a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java +++ b/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java b/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java index 122e4ed3d..27e6370ad 100644 --- a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestTransient.java b/src/test/java/com/avaje/tests/basic/TestTransient.java index 91f63887a..6ce8cfa61 100644 --- a/src/test/java/com/avaje/tests/basic/TestTransient.java +++ b/src/test/java/com/avaje/tests/basic/TestTransient.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java b/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java index 0e7c0150b..725701ae4 100644 --- a/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java +++ b/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java b/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java index cbffe808c..5b615d7d2 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java +++ b/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java @@ -2,8 +2,7 @@ package com.avaje.tests.basic.encrypt; import java.sql.Timestamp; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java b/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java index 1da628051..3aeed9058 100644 --- a/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java +++ b/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic.event; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java b/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java index cc7d14379..386016dcc 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -1,7 +1,6 @@ package com.avaje.tests.basic.one2one; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java index d39784443..92841c302 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java @@ -3,8 +3,7 @@ package com.avaje.tests.batchload; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java index d83268565..253a4f685 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java +++ b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java @@ -1,12 +1,10 @@ package com.avaje.tests.batchload; import java.util.List; -import java.util.UUID; import javax.persistence.EntityNotFoundException; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; @@ -57,7 +55,7 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { Assert.assertEquals(1, deletedCount); for (UUTwo u : list) { - UUOne master = u.getMaster(); + u.getMaster(); //BeanState beanState = Ebean.getBeanState(master); //Assert.assertTrue(beanState.isReference()); } diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java b/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java index 074062907..e0c220700 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java +++ b/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java @@ -2,8 +2,7 @@ package com.avaje.tests.batchload; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java b/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java index 1817c81fa..64ad56330 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java +++ b/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java @@ -2,8 +2,7 @@ package com.avaje.tests.batchload; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java b/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java index ccbcaa3a5..2431dae7f 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java @@ -4,8 +4,7 @@ import java.util.UUID; import javax.persistence.EntityNotFoundException; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java b/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java index adaeffc9b..3ae931e37 100644 --- a/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java +++ b/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java @@ -2,8 +2,7 @@ package com.avaje.tests.batchload; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java index 22630be9b..b93f49bc7 100644 --- a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java +++ b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java @@ -2,8 +2,7 @@ package com.avaje.tests.batchload; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java b/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java index 6ae9587ed..c9873bd22 100644 --- a/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java +++ b/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java @@ -1,7 +1,6 @@ package com.avaje.tests.batchload; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/cache/TestCacheBasic.java b/src/test/java/com/avaje/tests/cache/TestCacheBasic.java index 2aef9f56a..08a2af940 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheBasic.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheBasic.java @@ -1,7 +1,6 @@ package com.avaje.tests.cache; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; @@ -31,6 +30,7 @@ public class TestCacheBasic extends BaseTestCase { ServerCacheStatistics statistics = countryCache.getStatistics(false); int hc = statistics.getHitCount(); Assert.assertEquals(1, hc); + Assert.assertNotNull(c0); // Country c1 = Ebean.getReference(Country.class, "NZ"); // Assert.assertEquals(2, countryCache.getStatistics(false).getHitCount()); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java b/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java index 0e12db919..60d4d0be0 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java @@ -2,8 +2,7 @@ package com.avaje.tests.cache; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/cache/TestExternalNotification.java b/src/test/java/com/avaje/tests/cache/TestExternalNotification.java index 2a636aa7f..af2814e0f 100644 --- a/src/test/java/com/avaje/tests/cache/TestExternalNotification.java +++ b/src/test/java/com/avaje/tests/cache/TestExternalNotification.java @@ -1,7 +1,6 @@ package com.avaje.tests.cache; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java b/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java index 374996110..d56c38cdf 100644 --- a/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java +++ b/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java @@ -2,8 +2,7 @@ package com.avaje.tests.cache; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/cache/TestQueryCacheInsert.java b/src/test/java/com/avaje/tests/cache/TestQueryCacheInsert.java index 811bdee55..8a74e3e87 100644 --- a/src/test/java/com/avaje/tests/cache/TestQueryCacheInsert.java +++ b/src/test/java/com/avaje/tests/cache/TestQueryCacheInsert.java @@ -2,8 +2,7 @@ package com.avaje.tests.cache; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java b/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java index a7b0b392d..f932229a5 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java @@ -1,7 +1,6 @@ package com.avaje.tests.compositekeys; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java b/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java index 5d6a42be0..20ad270ea 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java @@ -3,8 +3,7 @@ package com.avaje.tests.compositekeys; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/config/TestTableName.java b/src/test/java/com/avaje/tests/config/TestTableName.java index 62f2118ed..a1ba89548 100644 --- a/src/test/java/com/avaje/tests/config/TestTableName.java +++ b/src/test/java/com/avaje/tests/config/TestTableName.java @@ -1,12 +1,14 @@ package com.avaje.tests.config; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; +import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.config.TableName; -public class TestTableName extends TestCase { +public class TestTableName extends BaseTestCase { + @Test public void test() { TableName t = new TableName("a"); diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java b/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java index 73c22d3f9..4ab83949c 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java +++ b/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java @@ -1,21 +1,9 @@ package com.avaje.tests.ddd.iud; -import java.util.Currency; - -import junit.framework.Assert; import junit.framework.TestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.config.GlobalProperties; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; import com.avaje.tests.model.ddd.DExhEntity; -import com.avaje.tests.model.ivo.CMoney; -import com.avaje.tests.model.ivo.ExhangeCMoneyRate; -import com.avaje.tests.model.ivo.Money; -import com.avaje.tests.model.ivo.Rate; public class TestDExhEntityEl extends TestCase { diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java index b42e5773c..3212e6653 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java +++ b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java @@ -1,19 +1,9 @@ package com.avaje.tests.ddd.iud; -import java.util.Currency; - -import junit.framework.Assert; import junit.framework.TestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.config.GlobalProperties; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; import com.avaje.tests.model.ddd.DPerson; -import com.avaje.tests.model.ivo.CMoney; -import com.avaje.tests.model.ivo.Money; public class TestDPersonEl extends TestCase { diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java index edc3ee214..1a39ada83 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java +++ b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java @@ -1,20 +1,9 @@ package com.avaje.tests.ddd.iud; -import java.util.Currency; -import java.util.List; - import junit.framework.TestCase; -import org.joda.time.Interval; -import org.junit.Assert; - -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; import com.avaje.ebean.config.GlobalProperties; import com.avaje.tests.model.ddd.DPerson; -import com.avaje.tests.model.ivo.CMoney; -import com.avaje.tests.model.ivo.Money; -import com.avaje.tests.model.ivo.Oid; public class TestDPersonIUD extends TestCase { diff --git a/src/test/java/com/avaje/tests/el/TestELBasic.java b/src/test/java/com/avaje/tests/el/TestELBasic.java index 22061e742..c73f54b7f 100644 --- a/src/test/java/com/avaje/tests/el/TestELBasic.java +++ b/src/test/java/com/avaje/tests/el/TestELBasic.java @@ -1,8 +1,9 @@ package com.avaje.tests.el; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; +import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; @@ -14,8 +15,9 @@ import com.avaje.ebeaninternal.server.el.ElPropertyChain; import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; import com.avaje.tests.model.basic.Customer; -public class TestELBasic extends TestCase { +public class TestELBasic extends BaseTestCase { + @Test public void testEl() { SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); diff --git a/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java b/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java index c7b8b77f3..ae1a6f6b8 100644 --- a/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java +++ b/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java @@ -1,7 +1,6 @@ package com.avaje.tests.enhancement; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java b/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java index 7c33e63ae..77d4eac8b 100644 --- a/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java +++ b/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java @@ -1,6 +1,6 @@ package com.avaje.tests.genkey; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.avaje.ebean.Ebean; diff --git a/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java b/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java index c052ad90a..0f450305f 100644 --- a/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java +++ b/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java @@ -1,16 +1,18 @@ package com.avaje.tests.genkey; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; +import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.tests.model.basic.TOne; -public class TestSeqBatch extends TestCase { +public class TestSeqBatch extends BaseTestCase { + @Test public void test() { EbeanServer server = Ebean.getServer(null); diff --git a/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java b/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java index 9fefcc014..2c09f6011 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java +++ b/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java @@ -9,7 +9,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import com.avaje.ebean.Ebean; import com.avaje.ebean.Transaction; import com.avaje.ebean.bean.EntityBean; import com.avaje.tests.idkeys.db.AuditLog; diff --git a/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java b/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java index ba3a1317b..c6daf54aa 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java +++ b/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java @@ -1,14 +1,16 @@ package com.avaje.tests.idkeys; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; +import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.config.GlobalProperties; import com.avaje.tests.model.basic.ESimple; -public class TestSimpleIdInsert extends TestCase { +public class TestSimpleIdInsert extends BaseTestCase { + @Test public void test() { GlobalProperties.put("datasource.default", "h2"); diff --git a/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java b/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java index b2e721e87..58fa4375c 100644 --- a/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java +++ b/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java @@ -2,8 +2,7 @@ package com.avaje.tests.iud; import java.util.Set; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java b/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java index 4e9ad305b..8d50beba1 100644 --- a/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java +++ b/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java @@ -1,7 +1,6 @@ package com.avaje.tests.iud; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/lib/SimpleTest.java b/src/test/java/com/avaje/tests/lib/SimpleTest.java deleted file mode 100644 index 20edebd2c..000000000 --- a/src/test/java/com/avaje/tests/lib/SimpleTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.avaje.tests.lib; - -import junit.framework.Assert; -import junit.framework.TestCase; - -public class SimpleTest extends TestCase { - - public void test() { - - Assert.assertTrue("Always Fail!", true); - } - -} diff --git a/src/test/java/com/avaje/tests/lib/TestMessage.java b/src/test/java/com/avaje/tests/lib/TestMessage.java index 3547481e8..00c0b9024 100644 --- a/src/test/java/com/avaje/tests/lib/TestMessage.java +++ b/src/test/java/com/avaje/tests/lib/TestMessage.java @@ -1,14 +1,13 @@ package com.avaje.tests.lib; -import junit.framework.TestCase; - import org.junit.Assert; +import org.junit.Test; import com.avaje.ebeaninternal.server.core.Message; -public class TestMessage extends TestCase { +public class TestMessage { - + @Test public void testMessage(){ String one = "one"; diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java index 46b74946c..071dbb646 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java @@ -2,8 +2,7 @@ package com.avaje.tests.model.basic.xtra; import javax.persistence.PersistenceException; -import junit.framework.Assert; - +import org.junit.Assert; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.SqlUpdate; diff --git a/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java b/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java index b7aca27da..a65eb9d56 100644 --- a/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java +++ b/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java @@ -2,16 +2,13 @@ package com.avaje.tests.model.selfref; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.ebean.TxRunnable; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.model.selfref.SelfRefCustomer; public class TestTextJsonSelfRef extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java b/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java index 0b9bfc318..82c7bf4fe 100644 --- a/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java +++ b/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java @@ -2,8 +2,7 @@ package com.avaje.tests.query; import java.util.Set; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java b/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java index 347b4ecc7..a0937e493 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java +++ b/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java @@ -2,8 +2,7 @@ package com.avaje.tests.singleTableInheritance; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java b/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java index 6dbd90cab..1c495cedc 100644 --- a/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java +++ b/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java @@ -3,8 +3,7 @@ package com.avaje.tests.sp; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java index 2bddf7dd2..27f10c23a 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java @@ -4,8 +4,7 @@ import java.io.StringReader; import java.util.List; import java.util.Map; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitorWithCustomJson.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitorWithCustomJson.java index 3f8bfa305..3c7dd7d48 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitorWithCustomJson.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitorWithCustomJson.java @@ -4,8 +4,7 @@ import java.io.StringReader; import java.util.List; import java.util.Map; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java b/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java index 9ac5aee33..52dbcb526 100644 --- a/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java @@ -1,7 +1,6 @@ package com.avaje.tests.transaction; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/transaction/TestNested.java b/src/test/java/com/avaje/tests/transaction/TestNested.java index d3ec83bd6..7b9ca74c6 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNested.java +++ b/src/test/java/com/avaje/tests/transaction/TestNested.java @@ -1,7 +1,6 @@ package com.avaje.tests.transaction; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestBasics.java b/src/test/java/com/avaje/tests/unitinternal/TestBasics.java index 3b311404a..520ec21ff 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestBasics.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestBasics.java @@ -1,11 +1,11 @@ package com.avaje.tests.unitinternal; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; -public class TestBasics extends TestCase { +public class TestBasics { private String parentPath(String path) { @@ -18,6 +18,7 @@ public class TestBasics extends TestCase { } } + @Test public void testParentPath() { Assert.assertTrue((parentPath("banana") == null)); diff --git a/src/test/java/com/avaje/tests/unitinternal/TestGlobalPropsEval.java b/src/test/java/com/avaje/tests/unitinternal/TestGlobalPropsEval.java index 33dee4374..a30bd7774 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestGlobalPropsEval.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestGlobalPropsEval.java @@ -1,28 +1,29 @@ package com.avaje.tests.unitinternal; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import com.avaje.ebean.config.GlobalProperties; -public class TestGlobalPropsEval extends TestCase { +public class TestGlobalPropsEval { - public void test() { - - GlobalProperties.put("unitevaltest.1", "one"); - Assert.assertEquals("one", GlobalProperties.get("unitevaltest.1","")); - GlobalProperties.put("unitevaltest.2", "a${unitevaltest.1}b"); - Assert.assertEquals("aoneb", GlobalProperties.get("unitevaltest.2","")); - - GlobalProperties.put("unitevaltest.3", "a${unitevaltest.4}b"); - Assert.assertEquals("a${unitevaltest.4}b", GlobalProperties.get("unitevaltest.3","")); + @Test + public void test() { - GlobalProperties.put("unitevaltest.4", "four"); - Assert.assertEquals("four", GlobalProperties.get("unitevaltest.4","")); - Assert.assertEquals("a${unitevaltest.4}b", GlobalProperties.get("unitevaltest.3","")); + GlobalProperties.put("unitevaltest.1", "one"); + Assert.assertEquals("one", GlobalProperties.get("unitevaltest.1", "")); + GlobalProperties.put("unitevaltest.2", "a${unitevaltest.1}b"); + Assert.assertEquals("aoneb", GlobalProperties.get("unitevaltest.2", "")); - GlobalProperties.evaluateExpressions(); - Assert.assertEquals("afourb", GlobalProperties.get("unitevaltest.3","")); + GlobalProperties.put("unitevaltest.3", "a${unitevaltest.4}b"); + Assert.assertEquals("a${unitevaltest.4}b", GlobalProperties.get("unitevaltest.3", "")); - } + GlobalProperties.put("unitevaltest.4", "four"); + Assert.assertEquals("four", GlobalProperties.get("unitevaltest.4", "")); + Assert.assertEquals("a${unitevaltest.4}b", GlobalProperties.get("unitevaltest.3", "")); + + GlobalProperties.evaluateExpressions(); + Assert.assertEquals("afourb", GlobalProperties.get("unitevaltest.3", "")); + + } } diff --git a/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java b/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java index aa703c185..24f065780 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java @@ -2,49 +2,49 @@ package com.avaje.tests.unitinternal; import java.util.Locale; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import com.avaje.ebeaninternal.server.type.ScalarTypeLocale; -public class TestLocaleParse extends TestCase { +public class TestLocaleParse { - public void test() { - - //Examples: "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr__MAC" - - Locale l = parse("en"); - Assert.assertEquals("en", l.getLanguage()); + @Test + public void test() { - l = parse("de_DE"); - Assert.assertEquals("de", l.getLanguage()); - Assert.assertEquals("DE", l.getCountry()); + // Examples: "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr__MAC" - l = parse("en_US_WIN"); - Assert.assertEquals("en", l.getLanguage()); - Assert.assertEquals("US", l.getCountry()); - Assert.assertEquals("WIN", l.getVariant()); - - l = parse("_GB"); - Assert.assertEquals("", l.getLanguage()); - Assert.assertEquals("GB", l.getCountry()); - Assert.assertEquals("", l.getVariant()); + Locale l = parse("en"); + Assert.assertEquals("en", l.getLanguage()); - l = parse("fr__MAC"); - Assert.assertEquals("fr", l.getLanguage()); - Assert.assertEquals("", l.getCountry()); - Assert.assertEquals("MAC", l.getVariant()); - - l = parse("de__POSIX"); - Assert.assertEquals("de", l.getLanguage()); - Assert.assertEquals("", l.getCountry()); - Assert.assertEquals("POSIX", l.getVariant()); - } - - - private Locale parse(String value){ - - ScalarTypeLocale st = new ScalarTypeLocale(); - return (Locale)st.parse(value); - } + l = parse("de_DE"); + Assert.assertEquals("de", l.getLanguage()); + Assert.assertEquals("DE", l.getCountry()); + + l = parse("en_US_WIN"); + Assert.assertEquals("en", l.getLanguage()); + Assert.assertEquals("US", l.getCountry()); + Assert.assertEquals("WIN", l.getVariant()); + + l = parse("_GB"); + Assert.assertEquals("", l.getLanguage()); + Assert.assertEquals("GB", l.getCountry()); + Assert.assertEquals("", l.getVariant()); + + l = parse("fr__MAC"); + Assert.assertEquals("fr", l.getLanguage()); + Assert.assertEquals("", l.getCountry()); + Assert.assertEquals("MAC", l.getVariant()); + + l = parse("de__POSIX"); + Assert.assertEquals("de", l.getLanguage()); + Assert.assertEquals("", l.getCountry()); + Assert.assertEquals("POSIX", l.getVariant()); + } + + private Locale parse(String value) { + + ScalarTypeLocale st = new ScalarTypeLocale(); + return (Locale) st.parse(value); + } } diff --git a/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java b/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java index d3f13d051..a7337c114 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java @@ -1,7 +1,6 @@ package com.avaje.tests.unitinternal; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java b/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java index d02cfccc5..f5e753ab6 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java @@ -1,7 +1,6 @@ package com.avaje.tests.unitinternal; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java b/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java index f5b254672..9f6d332b1 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java @@ -3,8 +3,7 @@ package com.avaje.tests.unitinternal; import java.sql.Timestamp; import java.util.Arrays; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase;