Fixed tests that modify BasicData (#1530)

src/test/java/org/tests/text/csv/TestCsvReader.java

@@ -1,7 +1,7 @@
 package org.tests.text.csv;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.TransactionalTestCase;
 import io.ebean.text.csv.CsvReader;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
@@ -12,7 +12,7 @@ import java.io.FileReader;
 import java.net.URL;
 import java.util.Locale;
 
-public class TestCsvReader extends BaseTestCase {
+public class TestCsvReader extends TransactionalTestCase {
 
   @Test
   public void test() {

src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java

@@ -1,26 +1,26 @@
 package org.tests.text.csv;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import io.ebean.TransactionalTestCase;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.csv.DefaultCsvCallback;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.File;
 import java.io.FileReader;
 import java.net.URL;
 import java.util.Locale;
 
-public class TestCsvReaderWithCallback extends BaseTestCase {
+public class TestCsvReaderWithCallback extends TransactionalTestCase {
 
   @Test
   public void test() throws Throwable {
 
-    ResetBasicData.reset();
-
     URL resource = TestCsvReaderWithCallback.class.getResource("/test1.csv");
     File f = new File(resource.getFile());
 
@@ -43,6 +43,8 @@ public class TestCsvReaderWithCallback extends BaseTestCase {
     // processor.addReference("billingAddress.country.code");
     csvReader.addProperty("billingAddress.country.code");
 
+    int before = Ebean.find(Customer.class).findCount();
+
     csvReader.process(reader, new DefaultCsvCallback<Customer>() {
 
       @Override
@@ -50,10 +52,14 @@ public class TestCsvReaderWithCallback extends BaseTestCase {
 
         server.save(cust.getBillingAddress(), transaction);
         server.save(cust, transaction);
+
       }
 
     });
 
+    int after = Ebean.find(Customer.class).findCount();
+    assertThat(after).isEqualTo(before + 9);
+
   }
 
 }

src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java

@@ -36,5 +36,8 @@ public class TestTextJsonInsertUpdate extends BaseTestCase {
     Customer c2 = jsonContext.toBean(Customer.class, j2);
     Ebean.update(c2);
 
+    // cleanup
+    Ebean.delete(Customer.class, c0.getId());
+
   }
 }