diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java index e463261bd..9595cad5a 100644 --- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java +++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java @@ -134,8 +134,6 @@ public class DatabasePlatformFactory { String dbProductName = metaData.getDatabaseProductName(); dbProductName = dbProductName.toLowerCase(); - int majorVersion = metaData.getDatabaseMajorVersion(); - if (dbProductName.contains("oracle")) { return new OraclePlatform(); } else if (dbProductName.contains("microsoft")) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java index 944d980d2..0e02e805f 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java @@ -85,7 +85,7 @@ public class BeanDescriptorJsonHelp { return null; } if (JsonToken.START_OBJECT != token) { - throw new JsonParseException("Unexpected token " + token + " - expecting start_object", parser.getCurrentLocation()); + throw new JsonParseException(parser, "Unexpected token " + token + " - expecting start_object", parser.getCurrentLocation()); } } @@ -98,7 +98,7 @@ public class BeanDescriptorJsonHelp { if (parser.nextToken() != JsonToken.FIELD_NAME) { String msg = "Error reading inheritance discriminator - expected [" + discColumn + "] but no json key?"; - throw new JsonParseException(msg, parser.getCurrentLocation()); + throw new JsonParseException(parser, msg, parser.getCurrentLocation()); } String propName = parser.getCurrentName(); @@ -111,7 +111,7 @@ public class BeanDescriptorJsonHelp { return jsonReadProperties(jsonRead, bean, path); } String msg = "Error reading inheritance discriminator, expected property [" + discColumn + "] but got [" + propName + "] ?"; - throw new JsonParseException(msg, parser.getCurrentLocation()); + throw new JsonParseException(parser, msg, parser.getCurrentLocation()); } String discValue = parser.nextTextValue(); diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java index 12796771c..ffcb90591 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java @@ -49,8 +49,6 @@ public class DeployUtil { private static final int DEFAULT_JSON_VARCHAR_LENGTH = 3000; - private static final int DEFAULT_ARRAY_VARCHAR_LENGTH = 1000; - private final NamingConvention namingConvention; private final TypeManager typeManager; diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java index 02cb166c7..81490f5a8 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java @@ -189,17 +189,4 @@ public class OrmUpdateProperties { return sb.toString(); } - /** - * Return a logical set clause to use for isSameByPlan() use. - */ - private String logicalSetClause() { - - StringBuilder sb = new StringBuilder(); - for (Map.Entry entry : values.entrySet()) { - sb.append(", "); - sb.append(entry.getKey()).append(entry.getValue().bindClause()); - } - return sb.toString(); - } - } diff --git a/src/test/java/io/ebean/dbmigration/DbMigrationTest.java b/src/test/java/io/ebean/dbmigration/DbMigrationTest.java index b5ee3afb5..27f4504fb 100644 --- a/src/test/java/io/ebean/dbmigration/DbMigrationTest.java +++ b/src/test/java/io/ebean/dbmigration/DbMigrationTest.java @@ -8,8 +8,6 @@ import io.ebean.Transaction; import io.ebean.migration.ddl.DdlRunner; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static org.assertj.core.api.Assertions.assertThat; @@ -24,9 +22,6 @@ import javax.persistence.PersistenceException; public class DbMigrationTest extends BaseTestCase { - private static final Logger logger = LoggerFactory.getLogger(DbMigrationTest.class); - - private int runScript(boolean expectErrors, String scriptName) throws IOException { try (InputStream stream = getClass().getResourceAsStream("/dbmigration/migrationtest/" + server().getPluginApi().getDatabasePlatform().getName()+"/" + scriptName); java.util.Scanner s = new java.util.Scanner(stream)) { diff --git a/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index bcfdfeaeb..57c31da2b 100644 --- a/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -54,11 +54,11 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { } @Override - public void insert(Object idValue, PersistRequestBean persistRequest, DocStoreUpdateContext txn) throws IOException { + public void insert(Object idValue, PersistRequestBean persistRequest, DocStoreUpdateContext txn) throws IOException { } @Override - public void update(Object idValue, PersistRequestBean persistRequest, DocStoreUpdateContext txn) throws IOException { + public void update(Object idValue, PersistRequestBean persistRequest, DocStoreUpdateContext txn) throws IOException { } @Override diff --git a/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index e155bc821..b51b1b125 100644 --- a/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -53,8 +53,6 @@ public class TestEncrypt extends BaseTestCase { Ebean.save(e); - Date earlyDob = new Date(System.currentTimeMillis() - 500000); - SqlQuery q = Ebean.createSqlQuery("select * from e_basicenc where id = :id"); q.setParameter("id", e.getId()); diff --git a/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index 1fbcf2cf2..1720d33c6 100644 --- a/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -7,6 +7,7 @@ import io.ebean.Transaction; import org.junit.Test; import org.tests.model.basic.L2CachedLazyDirtFlagResetBean; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -32,6 +33,7 @@ public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase { Transaction tx1 = Ebean.beginTransaction(); // load (and dont touch any related entity) L2CachedLazyDirtFlagResetBean bean1 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId()); + assertThat(bean1).isNotNull(); tx1.commit(); diff --git a/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 13bd6e1c2..237b4c66b 100644 --- a/src/test/java/org/tests/ddd/iud/TestDPersonEl.java +++ b/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -13,6 +13,7 @@ import org.junit.Test; import java.io.IOException; import java.util.Currency; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.*; public class TestDPersonEl { @@ -21,7 +22,8 @@ public class TestDPersonEl { public void test() throws IOException { Currency NZD = Currency.getInstance("NZD"); - + assertThat(NZD).isNotNull(); + DPerson p = new DPerson(); p.setFirstName("first"); p.setLastName("last"); diff --git a/src/test/java/org/tests/lib/EbeanTestCase.java b/src/test/java/org/tests/lib/EbeanTestCase.java deleted file mode 100644 index 5adb2b604..000000000 --- a/src/test/java/org/tests/lib/EbeanTestCase.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.tests.lib; - -import io.ebean.Ebean; -import io.ebean.EbeanServer; -import io.ebean.Transaction; -import io.ebean.Platform; -import io.ebeaninternal.api.SpiEbeanServer; -import junit.framework.TestCase; -import junit.framework.TestResult; - -/** - * The base class for all Ebean test to get access to the Ebean server and do - * some cleanup stuff after a test has run - */ -public abstract class EbeanTestCase extends TestCase { - - @Override - public void run(TestResult testResult) { - try { - super.run(testResult); - } finally { - Transaction tx = getServer().currentTransaction(); - if (tx != null && tx.isActive()) { - // transaction left running after the test, rollback it to make - // the environment ready for the next test - tx.rollback(); - } - } - } - - public EbeanServer getServer() { - return Ebean.getServer(null); - } - - /** - * MS SQL Server does not allow setting explicit values on identity columns - * so tests that do this need to be skipped for SQL Server. - */ - public boolean isMsSqlServer() { - SpiEbeanServer spi = (SpiEbeanServer) Ebean.getDefaultServer(); - return spi.getDatabasePlatform().getPlatform() == Platform.SQLSERVER; - } - -} diff --git a/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index dbffd38dd..8d368a9c8 100644 --- a/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -12,6 +12,8 @@ import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.List; public class TestAutofetchTuneWithJoin extends BaseTestCase { @@ -51,7 +53,7 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase { SpiQuery sq = (SpiQuery) q; ObjectGraphNode parentNode = sq.getParentNode(); ObjectGraphOrigin origin = parentNode.getOriginQueryPoint(); - + assertThat(origin).isNotNull(); // MetaAutoFetchStatistic metaAutoFetchStatistic = // ((DefaultOrmQuery)q).getMetaAutoFetchStatistic(); // if (metaAutoFetchStatistic != null) { diff --git a/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java b/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java index 10062a1a3..263de866b 100644 --- a/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java +++ b/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java @@ -10,6 +10,8 @@ import org.tests.model.embedded.EEmbDatePeriod; import org.tests.model.embedded.EEmbInner; import org.tests.model.embedded.EEmbOuter; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Date; import java.util.List; @@ -40,6 +42,8 @@ public class TestFilteringByEmbeddedInJoinedTable extends BaseTestCase { EEmbOuter outer1 = createOuter("outer1", new Date(11111), new Date(12222)); // Unused outer2 just to populate the DB EEmbOuter outer2 = createOuter("outer2", new Date(21111), new Date(22222)); + assertThat(outer2).isNotNull(); + EEmbOuter outer3 = createOuter("outer3", new Date(31111), new Date(32222)); diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index f84445529..2bc51aa76 100644 --- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -334,6 +334,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { .orderBy().desc("customer.billingAddress.id"); List ids = query.findSingleAttributeList(); + assertThat(ids).isNotEmpty(); assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 " + "join o_customer t1 on t1.id = t0.customer_id " // two spaces! @@ -354,6 +355,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { .orderBy().desc("customer.billingAddress.id"); List ids = query.findSingleAttributeList(); + assertThat(ids).isNotEmpty(); assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 " + "join o_customer t1 on t1.id = t0.customer_id " @@ -374,6 +376,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { .orderBy().desc("customer.billingAddress.id"); List ids = query.findSingleAttributeList(); + assertThat(ids).isNotEmpty(); assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 " + "join o_customer t1 on t1.id = t0.customer_id " @@ -394,6 +397,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { .orderBy().desc("customer.billingAddress.id"); List ids = query.findSingleAttributeList(); + assertThat(ids).isNotEmpty(); assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 " + "join o_customer t1 on t1.id = t0.customer_id " diff --git a/src/test/java/org/tests/text/json/TestJsonSimple.java b/src/test/java/org/tests/text/json/TestJsonSimple.java index 8954a126f..d64a4b702 100644 --- a/src/test/java/org/tests/text/json/TestJsonSimple.java +++ b/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -7,6 +7,8 @@ import io.ebean.text.json.JsonContext; import org.junit.Assert; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -37,7 +39,8 @@ public class TestJsonSimple extends BaseTestCase { String jsonText = sb.toString(); Object el = EJson.parse(jsonText); - + assertThat(el).isNotNull(); + Map e2 = EJson.parseObject("{\"a\":12, \"name\":{\"first\":\"rob\", \"last\":\"byg\"}}"); Assert.assertEquals(12L, e2.get("a")); diff --git a/src/test/java/org/tests/timezone/TimezoneTests.java b/src/test/java/org/tests/timezone/TimezoneTests.java index 98110f807..a0b3e4db0 100644 --- a/src/test/java/org/tests/timezone/TimezoneTests.java +++ b/src/test/java/org/tests/timezone/TimezoneTests.java @@ -70,6 +70,7 @@ public class TimezoneTests { TimeZone.setDefault(TimeZone.getTimeZone(zone)); } + @SuppressWarnings("unused") private void insert(String zone) throws SQLException { String insert = "insert into tztest (zone, ts, tstz, ts1, tstz1) values (?,?,?,?,?)"; diff --git a/src/test/java/org/tests/transaction/TestNested.java b/src/test/java/org/tests/transaction/TestNested.java index 63dd16298..d2ba0423b 100644 --- a/src/test/java/org/tests/transaction/TestNested.java +++ b/src/test/java/org/tests/transaction/TestNested.java @@ -33,9 +33,6 @@ public class TestNested extends BaseTestCase { private void willFail() { Ebean.executeCall(() -> { - if (false) { - return 123; - } throw new RuntimeException("test runnable rollback"); }); } diff --git a/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java b/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java index 3a9745922..439b68020 100644 --- a/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java +++ b/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java @@ -7,6 +7,8 @@ import org.tests.basic.encrypt.BasicEncryptKey; import org.junit.Assert; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + import java.sql.Timestamp; public class TestSimpleEncryptor extends BaseTestCase { @@ -23,6 +25,8 @@ public class TestSimpleEncryptor extends BaseTestCase { byte[] ecData = e.encrypt(data, key); byte[] deData = e.decrypt(ecData, key); + + assertThat(data).containsExactly(deData); Timestamp t = new Timestamp(System.currentTimeMillis()); byte[] ecTimestamp = e.encryptString(t.toString(), key);