github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-22 13:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy tests - tidy up TestCsvReader and TestCsvReaderWithCallback

Browse Source
This commit is contained in:
rob bygrave
2020-05-12 21:28:31 +12:00
parent 55a2cb12bb
commit 21a5efa9b9
3 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/org/tests/text/csv/TestCsvReader.java
+3 -4
View File
@@ -1,6 +1,6 @@
package org.tests.text.csv;
import io.ebean.Ebean;
import io.ebean.DB;
import io.ebean.TransactionalTestCase;
import io.ebean.text.csv.CsvReader;
import org.junit.Test;
@@ -10,7 +10,6 @@ import org.tests.model.basic.ResetBasicData;
import java.io.File;
import java.io.FileReader;
import java.net.URL;
import java.util.Locale;
public class TestCsvReader extends TransactionalTestCase {
@@ -25,7 +24,7 @@ public class TestCsvReader extends TransactionalTestCase {
FileReader reader = new FileReader(f);
CsvReader<Customer> csvReader = Ebean.createCsvReader(Customer.class);
CsvReader<Customer> csvReader = DB.getDefault().createCsvReader(Customer.class);
csvReader.setPersistBatchSize(2);
@@ -33,7 +32,7 @@ public class TestCsvReader extends TransactionalTestCase {
// csvReader.addProperty("id");
csvReader.addProperty("status");
csvReader.addProperty("name");
csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.GERMAN);
csvReader.addDateTime("anniversary", "dd-MMM-yyyy");
csvReader.addProperty("billingAddress.line1");
csvReader.addProperty("billingAddress.city");
csvReader.addProperty("billingAddress.country.code");
src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
+5 -10
View File
@@ -1,7 +1,6 @@
package org.tests.text.csv;
import io.ebean.Ebean;
import io.ebean.EbeanServer;
import io.ebean.DB;
import io.ebean.TransactionalTestCase;
import io.ebean.text.csv.CsvReader;
import io.ebean.text.csv.DefaultCsvCallback;
@@ -11,7 +10,6 @@ import org.tests.model.basic.Customer;
import java.io.File;
import java.io.FileReader;
import java.net.URL;
import java.util.Locale;
import static org.assertj.core.api.Assertions.assertThat;
@@ -25,9 +23,7 @@ public class TestCsvReaderWithCallback extends TransactionalTestCase {
FileReader reader = new FileReader(f);
final EbeanServer server = Ebean.getServer(null);
CsvReader<Customer> csvReader = server.createCsvReader(Customer.class);
CsvReader<Customer> csvReader = DB.getDefault().createCsvReader(Customer.class);
csvReader.setPersistBatchSize(2);
csvReader.setLogInfoFrequency(3);
@@ -36,13 +32,13 @@ public class TestCsvReaderWithCallback extends TransactionalTestCase {
// csvReader.addProperty("id");
csvReader.addProperty("status");
csvReader.addProperty("name");
csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.GERMAN);
csvReader.addDateTime("anniversary", "dd-MMM-yyyy");
csvReader.addProperty("billingAddress.line1");
csvReader.addProperty("billingAddress.city");
// processor.addReference("billingAddress.country.code");
csvReader.addProperty("billingAddress.country.code");
int before = Ebean.find(Customer.class).findCount();
int before = DB.find(Customer.class).findCount();
csvReader.process(reader, new DefaultCsvCallback<Customer>() {
@@ -56,9 +52,8 @@ public class TestCsvReaderWithCallback extends TransactionalTestCase {
});
int after = Ebean.find(Customer.class).findCount();
int after = DB.find(Customer.class).findCount();
assertThat(after).isEqualTo(before + 9);
}
}
src/test/resources/test1.csv
+9 -9
View File
@@ -1,9 +1,9 @@
10000,NEW,"Roland",01-JAN-2009,"12 someplace",Auckland,NZ
,ACTIVE,"Greg",14-FEB-2009,"13 someplace",Sydney,AU
,INACTIVE,"Dan",29-SEP-2009,"14 someplace",Auckland,NZ
,NEW,"ARob",01-JAN-2009,"12 someplace",Auckland,NZ
,ACTIVE,"BGreg",14-FEB-2009,"13 someplace",Sydney,AU
,INACTIVE,"CDan",29-SEP-2009,"14 someplace",Auckland,NZ
,NEW,"DRob",01-JAN-2009,"12 someplace",Auckland,NZ
,ACTIVE,"EGreg",14-FEB-2009,"13 someplace",Sydney,AU
,INACTIVE,"FDan",29-SEP-2009,"14 someplace",Auckland,NZ
10000,NEW,"Roland",01-Jan-2009,"12 someplace",Auckland,NZ
,ACTIVE,"Greg",14-Feb-2009,"13 someplace",Sydney,AU
,INACTIVE,"Dan",29-Sep-2009,"14 someplace",Auckland,NZ
,NEW,"ARob",01-Jan-2009,"12 someplace",Auckland,NZ
,ACTIVE,"BGreg",14-Feb-2009,"13 someplace",Sydney,AU
,INACTIVE,"CDan",29-Sep-2009,"14 someplace",Auckland,NZ
,NEW,"DRob",01-Jan-2009,"12 someplace",Auckland,NZ
,ACTIVE,"EGreg",14-Feb-2009,"13 someplace",Sydney,AU
,INACTIVE,"FDan",29-Sep-2009,"14 someplace",Auckland,NZ
1 10000 NEW Roland 01-JAN-2009 01-Jan-2009 12 someplace Auckland NZ
2 ACTIVE Greg 14-FEB-2009 14-Feb-2009 13 someplace Sydney AU
3 INACTIVE Dan 29-SEP-2009 29-Sep-2009 14 someplace Auckland NZ
4 NEW ARob 01-JAN-2009 01-Jan-2009 12 someplace Auckland NZ
5 ACTIVE BGreg 14-FEB-2009 14-Feb-2009 13 someplace Sydney AU
6 INACTIVE CDan 29-SEP-2009 29-Sep-2009 14 someplace Auckland NZ
7 NEW DRob 01-JAN-2009 01-Jan-2009 12 someplace Auckland NZ
8 ACTIVE EGreg 14-FEB-2009 14-Feb-2009 13 someplace Sydney AU
9 INACTIVE FDan 29-SEP-2009 29-Sep-2009 14 someplace Auckland NZ