From 68a470a086e6531f24acda2fd17db2e3ff1cf120 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Feb 2018 15:00:13 +1300
Subject: [PATCH] Test change only - No effective change, remove noop
 ServerConfig.loadTestProperties()

---
 .../io/ebean/EbeanServerFactory_MultiTenancy_Test.java | 10 ++++++----
 src/test/java/io/ebean/config/ServerConfigTest.java    |  2 --
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java
index 8d1669e56..a12db5bbb 100644
--- a/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java
+++ b/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java
@@ -1,6 +1,11 @@
 package io.ebean;
 
-import io.ebean.config.*;
+import io.ebean.config.CurrentTenantProvider;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.TenantCatalogProvider;
+import io.ebean.config.TenantDataSourceProvider;
+import io.ebean.config.TenantMode;
+import io.ebean.config.TenantSchemaProvider;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import org.junit.Test;
@@ -27,7 +32,6 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     ServerConfig config = new ServerConfig();
     config.setName("multiTenantDb");
     config.loadFromProperties();
-    config.loadTestProperties();
     config.setRegister(false);
     config.setDefaultServer(false);
 
@@ -62,7 +66,6 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     ServerConfig config = new ServerConfig();
     config.setName("h2");
     config.loadFromProperties();
-    config.loadTestProperties();
     config.setRegister(false);
     config.setDefaultServer(false);
 
@@ -92,7 +95,6 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     ServerConfig config = new ServerConfig();
     config.setName("h2");
     config.loadFromProperties();
-    config.loadTestProperties();
     config.setRegister(false);
     config.setDefaultServer(false);
 
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index 0eea08122..fcf62fee5 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -83,8 +83,6 @@ public class ServerConfigTest {
     assertFalse(serverConfig.isDisableL2Cache());
     assertFalse(serverConfig.isNotifyL2CacheInForeground());
 
-    serverConfig.loadTestProperties();
-
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
   }