FIX: introduced TransactionalTestCase, so that changes to DB are not persisted (#1298)

* FIX: introduced TransactionalTestCase, so that changes to DB are not persisted

* removed license header
This commit is contained in:
Roland Praml
2018-03-02 09:10:21 +13:00
committed by Rob Bygrave
parent 9e2ddc9f8c
commit 11e180aa3f
22 changed files with 142 additions and 89 deletions
@@ -1,7 +1,8 @@
package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.TransactionalTestCase;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
@@ -11,7 +12,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
public class TestDeleteByIdCollection extends BaseTestCase {
public class TestDeleteByIdCollection extends TransactionalTestCase {
@Test
public void test() {
@@ -1,8 +1,9 @@
package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Query;
import io.ebean.TransactionalTestCase;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
@@ -11,12 +12,11 @@ import org.junit.Test;
import java.util.List;
public class TestOrderByAnnotation extends BaseTestCase {
public class TestOrderByAnnotation extends TransactionalTestCase {
@Test
public void testOrderBy() {
ResetBasicData.reset();
Customer custTest = ResetBasicData.createCustAndOrder("testOrderByAnn");
Customer customer = Ebean.find(Customer.class, custTest.getId());
@@ -52,14 +52,13 @@ public class TestPersistenceContext extends BaseTestCase {
Assert.assertTrue(oAfter != oBefore);
Assert.assertTrue(oAfter != order);
Order testOrder = ResetBasicData.createOrderCustAndOrder("testPC");
Integer id = testOrder.getCustomer().getId();
Integer orderId = testOrder.getId();
// start a persistence context
Ebean.beginTransaction();
try {
Order testOrder = ResetBasicData.createOrderCustAndOrder("testPC");
Integer id = testOrder.getCustomer().getId();
Integer orderId = testOrder.getId();
Customer customer = Ebean.find(Customer.class)
.setUseCache(false)
.setId(id)
@@ -1,8 +1,9 @@
package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Query;
import io.ebean.TransactionalTestCase;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
@@ -11,12 +12,11 @@ import org.junit.Test;
import java.util.List;
public class TestWhereAnnotation extends BaseTestCase {
public class TestWhereAnnotation extends TransactionalTestCase {
@Test
public void testWhere() {
ResetBasicData.reset();
Customer custTest = ResetBasicData.createCustAndOrder("testWhereAnn");
Customer customer = Ebean.find(Customer.class, custTest.getId());
@@ -33,6 +33,8 @@ public class TestDeleteByIdList extends BaseTestCase {
Assert.assertEquals(2, orderIds.size());
Ebean.deleteAll(Order.class, orderIds);
Ebean.delete(c0);
Ebean.delete(c1);
}
}
@@ -32,7 +32,9 @@ public class TestDeleteCascadeById extends BaseTestCase {
Order o = orders.get(0);
Assert.assertNotNull(o);
// cleanup
Ebean.delete(o);
Ebean.delete(cust);
}
}
@@ -1,7 +1,8 @@
package org.tests.basic.join;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.TransactionalTestCase;
import org.tests.model.basic.Order;
import org.tests.model.basic.Order.Status;
import org.tests.model.basic.ResetBasicData;
@@ -9,7 +10,7 @@ import org.junit.Test;
import java.util.List;
public class TestSecondaryJoin extends BaseTestCase {
public class TestSecondaryJoin extends TransactionalTestCase {
@Test
public void test() {
@@ -2,6 +2,7 @@ package org.tests.basic.one2one;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import org.junit.Assert;
import org.junit.Test;
@@ -42,5 +43,13 @@ public class TestOne2OneBookingInvoice extends BaseTestCase {
Assert.assertEquals(b1.getId(), b2.getId());
Assert.assertSame(b1, b2);
// cleanup
ai.setBooking(null);
ci.setBooking(null);
Ebean.save(ai);
Ebean.save(ci);
Ebean.delete(b);
}
}
@@ -1,7 +1,8 @@
package org.tests.basic.type;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.TransactionalTestCase;
import org.tests.model.basic.EWithInetAddr;
import org.junit.Assert;
import org.junit.Test;
@@ -9,7 +10,7 @@ import org.junit.Test;
import java.net.InetAddress;
import java.net.UnknownHostException;
public class TestInetAddressType extends BaseTestCase {
public class TestInetAddressType extends TransactionalTestCase {
@Test
public void testIp4() throws UnknownHostException {