#913 - IllegalArgumentException: No enum constant com.avaje.ebean.config.Platform.HSQLDB

This commit is contained in:
Rob Bygrave
2016-12-07 21:58:07 +13:00
parent 611bba272a
commit c3bc0c4975
18 changed files with 47 additions and 50 deletions
@@ -1,6 +1,7 @@
package com.avaje.tests.idkeys;
import com.avaje.ebean.Transaction;
import com.avaje.ebean.config.Platform;
import com.avaje.ebean.config.dbplatform.IdType;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
import com.avaje.tests.idkeys.db.GenKeyIdentity;
@@ -28,12 +29,11 @@ public class TestGeneratedKeys extends EbeanTestCase {
public void testSequence() throws SQLException {
SpiEbeanServer server = (SpiEbeanServer) getServer();
IdType idType = server.getDatabasePlatform().getDbIdentity().getIdType();
String platformName = server.getDatabasePlatform().getName();
if (!IdType.SEQUENCE.equals(idType)) {
// only run this test when SEQUENCE is being used
return;
}
if (!"h2".equals(platformName)) {
if (server.getDatabasePlatform().getPlatform() == Platform.H2) {
// readSequenceValue is H2 specific
return;
}
@@ -3,6 +3,7 @@ package com.avaje.tests.lib;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.Transaction;
import com.avaje.ebean.config.Platform;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
import junit.framework.TestCase;
import junit.framework.TestResult;
@@ -37,7 +38,7 @@ public abstract class EbeanTestCase extends TestCase {
*/
public boolean isMsSqlServer() {
SpiEbeanServer spi = (SpiEbeanServer) Ebean.getDefaultServer();
return spi.getDatabasePlatform().getName().startsWith("mssqlserver");
return spi.getDatabasePlatform().getPlatform() == Platform.SQLSERVER;
}
}
@@ -3,6 +3,7 @@ package com.avaje.tests.query.sqlquery;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.Query;
import com.avaje.ebean.config.Platform;
import com.avaje.ebean.plugin.SpiServer;
import com.avaje.tests.model.basic.Customer;
import com.avaje.tests.model.basic.ResetBasicData;
@@ -37,8 +38,8 @@ public class TestNativeILikeExpression extends BaseTestCase {
SpiServer pluginApi = server().getPluginApi();
boolean expressionNativeIlike = pluginApi.getServerConfig().isExpressionNativeIlike();
String platformName = pluginApi.getDatabasePlatform().getName();
Platform platform = pluginApi.getDatabasePlatform().getPlatform();
return expressionNativeIlike && platformName.equalsIgnoreCase("postgres");
return expressionNativeIlike && platform == Platform.POSTGRES;
}
}