Update tests to ensure ResetBasicData.reset() was called early

ebean-orm · Aug 4, 2024 · b0ec23e · b0ec23e
1 parent 20caae5
commit b0ec23e
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 88 deletions.
diff --git a/ebean-test/src/test/java/org/tests/basic/TestTransient.java b/ebean-test/src/test/java/org/tests/basic/TestTransient.java
@@ -5,6 +5,7 @@
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 import java.sql.Types;
 import java.util.Optional;
@@ -16,7 +17,7 @@ public class TestTransient extends BaseTestCase {
 
   @Test
   public void testTransient() {
-
+    ResetBasicData.reset();
     Customer cnew = new Customer();
     cnew.setName("testTrans");
 

diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java
@@ -2,6 +2,7 @@
 
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
@@ -13,11 +14,13 @@
 
 public class TestBasicNavOnEmpty extends BaseTestCase {
 
-  @Test
-  public void test() {
-
+  @BeforeAll
+  static void before() {
     ResetBasicData.reset();
+  }
 
+  @Test
+  public void test() {
     Customer c = new Customer();
     c.setName("HelloRob");
 

diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java
@@ -5,6 +5,7 @@
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.xtest.BaseTestCase;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
@@ -18,14 +19,18 @@
 
 class TestBeanState extends BaseTestCase {
 
+  @BeforeAll
+  static void before() {
+    ResetBasicData.reset();
+  }
+
   @Test
   void invalid() {
     assertThrows(IllegalArgumentException.class, () -> DB.beanState(new Object()));
   }
 
   @Test
   void loadErrors_when_empty() {
-    ResetBasicData.reset();
     Customer one = DB.find(Customer.class).setMaxRows(1).findOne();
     BeanState beanState = DB.beanState(one);
 
@@ -34,8 +39,6 @@ void loadErrors_when_empty() {
 
   @Test
   void test() {
-    ResetBasicData.reset();
-
     List<Customer> custs = DB.find(Customer.class).findList();
 
     Customer customer = DB.find(Customer.class).setId(custs.get(0).getId()).select("name")
@@ -69,8 +72,6 @@ void test() {
 
   @Test
   void setDisableLazyLoad_expect_lazyLoadingDisabled() {
-    ResetBasicData.reset();
-
     List<Customer> custs = DB.find(Customer.class).order("id").findList();
 
     Customer customer = DB.find(Customer.class)
@@ -86,7 +87,6 @@ void setDisableLazyLoad_expect_lazyLoadingDisabled() {
 
   @Test
   void changedProps_when_setManyProperty() {
-    ResetBasicData.reset();
 
     Customer customer = DB.find(Customer.class).order("id").setMaxRows(1).findOne();
 

diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
@@ -2,9 +2,11 @@
 
 import io.ebean.DB;
 import io.ebean.xtest.base.TransactionalTestCase;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 

diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
@@ -2,6 +2,7 @@
 
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
@@ -11,11 +12,13 @@
 
 public class TestSecondQueryNoRows extends BaseTestCase {
 
-  @Test
-  public void test() {
-
+  @BeforeAll
+  static void before() {
     ResetBasicData.reset();
+  }
 
+  @Test
+  public void test() {
     Customer cnew = new Customer();
     cnew.setName("testSecQueryNoRows");
 

diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java
@@ -3,9 +3,11 @@
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.test.LoggedSql;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 import java.sql.Date;
 import java.time.LocalDate;
@@ -18,6 +20,11 @@
  */
 public class TestBeanCacheContactLazyLoad extends BaseTestCase {
 
+  @BeforeAll
+  static void before() {
+    ResetBasicData.reset();
+  }
+
   /**
    * This test shows a wrong behaviour of the bean cache up to at least Ebean 12.4.*:
    * <ul>

diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
@@ -15,7 +15,6 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase {
 
   @Test
   public void test() {
-
     ResetBasicData.reset();
 
     Customer customer = new Customer();

diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
@@ -4,6 +4,7 @@
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.cache.ServerCache;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.Contact;
@@ -18,11 +19,14 @@
 
 public class TestQueryCacheTableDependency extends BaseTestCase {
 
+  @BeforeAll
+  static void before() {
+    ResetBasicData.reset();
+  }
+
   @Test
   public void testFindCountOnDependent() {
 
-    ResetBasicData.reset();
-
     ServerCache customerCache = DB.cacheManager().queryCache(Customer.class);
     customerCache.clear();
 
@@ -95,8 +99,6 @@ public void testFindCountOnDependent() {
   @Test
   public void testFindCountOnOtherL2Cached() {
 
-    ResetBasicData.reset();
-
     Customer fi = DB.find(Customer.class).where().eq("name", "Fiona").findOne();
 
     int custCount0 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true)

diff --git a/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java
@@ -3,6 +3,7 @@
 
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.text.json.JsonReadOptions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Product;
@@ -16,19 +17,19 @@
 
 public class CustomerReportTest extends BaseTestCase {
 
-  @Test
-  public void testToJson() throws Exception {
+  @BeforeAll
+  static void before() {
     ResetBasicData.reset();
+  }
 
-
-
+  @Test
+  public void testToJson() {
     String json = server().json().toJson(getCustomerReport());
     assertThat(json).isEqualTo("{\"dtype\":\"CR\",\"friends\":[{\"id\":2},{\"id\":3}],\"customer\":{\"id\":1}}");
   }
 
   @Test
-  public void testFromJson() throws Exception {
-    ResetBasicData.reset();
+  public void testFromJson() {
     String json = "{\"dtype\":\"CR\",\"friends\":[{\"id\":2},{\"id\":3}],\"customer\":{\"id\":1}}";
 
     JsonReadOptions opts = new JsonReadOptions();
@@ -43,9 +44,7 @@ public void testFromJson() throws Exception {
 
 
   @Test
-  public void testEmbeddedDocs() throws Exception {
-    ResetBasicData.reset();
-
+  public void testEmbeddedDocs() {
     CustomerReport report = getCustomerReport();
     report.getEmbeddedReports().add(getProductReport());
 

diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -7,6 +7,7 @@
 import io.ebean.annotation.Platform;
 import io.ebean.meta.*;
 import io.ebean.test.LoggedSql;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasic;
@@ -19,11 +20,13 @@
 
 public class TestCustomerFinder extends BaseTestCase {
 
-  @Test
-  public void a_runFirst_metricsAsJson_sqlInInitialCollectionOnly() {
-
+  @BeforeAll
+  static void before() {
     ResetBasicData.reset();
+  }
 
+  @Test
+  public void a_runFirst_metricsAsJson_sqlInInitialCollectionOnly() {
     runQueries();
 
     StringBuilder buffer0 = new StringBuilder();
@@ -55,18 +58,12 @@ public void a_runFirst_metricsAsJson_sqlInInitialCollectionOnly() {
 
   @Test
   public void test_ref() {
-
-    ResetBasicData.reset();
-
     Customer customer = Customer.find.ref(1);
     assertThat(customer.getId()).isEqualTo(1);
   }
 
   @Test
   public void test_all_byId_byName() {
-
-    ResetBasicData.reset();
-
     List<Customer> all = Customer.find.all();
     List<Customer> list = DB.find(Customer.class).findList();
 
@@ -93,7 +90,6 @@ public void currentTransaction() {
 
   @Test
   public void flush() {
-
     Transaction transaction = DB.beginTransaction();
     try {
       Customer.find.currentTransaction().setBatchMode(true);
@@ -114,7 +110,6 @@ public void flush() {
 
   @Test
   public void test_byName_deleteById() {
-
     Customer customer = new Customer();
     customer.setName("Newbie-879879897");
 
@@ -134,16 +129,12 @@ public void test_byName_deleteById() {
 
   @Test
   public void test_update() {
-
     int rowsUpdated = Customer.find.updateToInactive("Frankie Who");
     logger.debug("updated {}", rowsUpdated);
   }
 
   @Test
   public void test_ormQuery() {
-
-    ResetBasicData.reset();
-
     List<Customer> customers =
       Customer.find.byNameStatus("R", Customer.Status.NEW);
 
@@ -152,19 +143,13 @@ public void test_ormQuery() {
 
   @Test
   public void test_nativeSingleAttribute() {
-
-    ResetBasicData.reset();
-
     List<String> names = Customer.find.namesStartingWith("F");
     assertThat(names).isNotEmpty();
   }
 
   @Test
   @IgnorePlatform(Platform.DB2) // no query plans yet, for DB2
   public void test_finders_queryPlans() {
-
-    ResetBasicData.reset();
-
     // change default collect query plan threshold to 20 micros
     QueryPlanInit init0 = new QueryPlanInit();
     init0.setAll(true);
@@ -219,9 +204,6 @@ public void test_finders_queryPlans() {
 
   @Test
   public void test_metricsAsJson_withAll() {
-
-    ResetBasicData.reset();
-
     runQueries();
 
     String metricsJson = server().metaInfo()
@@ -243,9 +225,6 @@ public void test_metricsAsJson_withAll() {
 
   @Test
   public void test_metricsAsJson_minimal() {
-
-    ResetBasicData.reset();
-
     runQueries();
 
     String metricsJson = server().metaInfo()
@@ -265,9 +244,6 @@ public void test_metricsAsJson_minimal() {
 
   @Test
   public void test_metricsAsJson_write() {
-
-    ResetBasicData.reset();
-
     runQueries();
 
     StringBuilder buffer = new StringBuilder();
@@ -283,9 +259,6 @@ public void test_metricsAsJson_write() {
 
   @Test
   public void test_metricsAsJson_writeWithHeader() {
-
-    ResetBasicData.reset();
-
     runQueries();
 
     StringBuilder buffer = new StringBuilder();
-Original file line number
+Diff line change
@@ Expand Up @@
       @Test
       public void test() {
         ResetBasicData.reset();
         Customer customer = new Customer();
@@ Expand Down @@