No effective change - update tests with EBasicVer new constructor

src/test/java/com/avaje/ebean/BaseTestCase.java

@@ -13,7 +13,7 @@ public class BaseTestCase {
   
   static {
     logger.debug("... preStart");
-    if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent","debug=0;packages=com.avaje.tests.**,org.avaje.test.**")) {
+    if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent","debug=1;packages=com.avaje.tests,org.avaje.test")) {
       logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
     }
   }

src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java

@@ -114,8 +114,6 @@ public class EbeanServer_deleteAllByIdTest {
   }
 
   private EBasicVer bean(String name) {
-    EBasicVer bean = new EBasicVer();
-    bean.setName(name);
-    return bean;
+    return new EBasicVer(name);
   }
 }

src/test/java/com/avaje/ebean/EbeanServer_deleteByIdTest.java

@@ -85,8 +85,6 @@ public class EbeanServer_deleteByIdTest {
   }
 
   private EBasicVer bean(String name) {
-    EBasicVer bean = new EBasicVer();
-    bean.setName(name);
-    return bean;
+    return new EBasicVer(name);
   }
 }

src/test/java/com/avaje/ebean/EbeanServer_deleteTest.java

@@ -48,8 +48,6 @@ public class EbeanServer_deleteTest {
   }
 
   private EBasicVer bean(String name) {
-    EBasicVer bean = new EBasicVer();
-    bean.setName(name);
-    return bean;
+    return new EBasicVer(name);
   }
 }

src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java

@@ -123,8 +123,6 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
   }
 
   private EBasicVer bean(String name) {
-    EBasicVer bean = new EBasicVer();
-    bean.setName(name);
-    return bean;
+    return new EBasicVer(name);
   }
 }

src/test/java/com/avaje/ebean/event/BeanPersistControllerTest.java

@@ -24,8 +24,7 @@ public class BeanPersistControllerTest {
     EbeanServer ebeanServer = getEbeanServer(continuePersistingAdapter);
 
 
-    EBasicVer bean = new EBasicVer();
-    bean.setName("testController");
+    EBasicVer bean = new EBasicVer("testController");
 
     ebeanServer.save(bean);
     assertThat(continuePersistingAdapter.methodsCalled).hasSize(2);
@@ -49,8 +48,7 @@ public class BeanPersistControllerTest {
 
     EbeanServer ebeanServer = getEbeanServer(stopPersistingAdapter);
 
-    EBasicVer bean = new EBasicVer();
-    bean.setName("testController");
+    EBasicVer bean = new EBasicVer("testController");
 
     ebeanServer.save(bean);
     assertThat(stopPersistingAdapter.methodsCalled).hasSize(1);

src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java

@@ -24,8 +24,7 @@ public class BeanPostLoadTest extends BaseTestCase {
 
     EbeanServer ebeanServer = getEbeanServer();
 
-    EBasicVer bean = new EBasicVer();
-    bean.setName("testPostLoad");
+    EBasicVer bean = new EBasicVer("testPostLoad");
     bean.setDescription("someDescription");
     bean.setOther("other");
 

src/test/java/com/avaje/tests/basic/TestIUDVanilla.java

@@ -14,8 +14,7 @@ public class TestIUDVanilla extends BaseTestCase {
   @Test
   public void test() {
 
-    EBasicVer e0 = new EBasicVer();
-    e0.setName("vanilla");
+    EBasicVer e0 = new EBasicVer("vanilla");
 
     Ebean.save(e0);
 
@@ -39,9 +38,8 @@ public class TestIUDVanilla extends BaseTestCase {
     e2.setName("forcedUpdate");
     Ebean.update(e2);
 
-    EBasicVer e3 = new EBasicVer();
+    EBasicVer e3 = new EBasicVer("ModNoOCC");
     e3.setId(e0.getId());
-    e3.setName("ModNoOCC");
 
     Ebean.update(e3);
 

src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java

@@ -25,9 +25,8 @@ public class TestLogTransLogOnError extends BaseTestCase {
       Ebean.find(Customer.class).findList();
       Ebean.find(Order.class).where().gt("id", 1).findList();
 
-      EBasicVer newBean = new EBasicVer();
+      EBasicVer newBean = new EBasicVer("aName");
       newBean.setDescription("something");
-      newBean.setName("aName");
 
       // Ebean.save(newBean);
 
@@ -55,13 +54,12 @@ public class TestLogTransLogOnError extends BaseTestCase {
     try {
       Ebean.find(Customer.class).findList();
 
-      EBasicVer newBean = new EBasicVer();
+      EBasicVer newBean = new EBasicVer("aName");
       newBean
           .setDescription("something sdfjksdjflsjdflsjdflksjdfkjd fsjdfkjsdkfjsdkfjskdjfskjdf"
               + " sjdf sdjflksjdfkjsdlfkjsdkfjs ksjdfksjdlfjsldf something sdfjksdjflsjdflsjdflksjdfkjd"
               + "fsjdfkjsdkfjsdkfjskdjfskjdf sjdf sdjflksjdfkjsdlfkjsdkfjs ksjdfksjdlfjsldf something s"
               + "dfjksdjflsjdflsjdflksjdfkjd fsjdfkjsdkfjsdkfjskdjfskjdf sjdf sdjflksjdfkjsdlfkjsdkfjs ");
-      newBean.setName("aName");
 
       // t.log("--- next insert should error");
       Ebean.save(newBean);

src/test/java/com/avaje/tests/batchinsert/TestBatchInsertFlush.java

@@ -0,0 +1,47 @@
+package com.avaje.tests.batchinsert;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.Transaction;
+import com.avaje.ebean.config.PersistBatch;
+import com.avaje.tests.model.basic.EBasicVer;
+import org.junit.Test;
+
+import java.sql.Timestamp;
+
+public class TestBatchInsertFlush extends BaseTestCase {
+
+  @Test
+  public void testFlushOnGetId() {
+
+    EbeanServer server = Ebean.getDefaultServer();
+    Transaction txn = server.beginTransaction();
+    try {
+      txn.setBatch(PersistBatch.ALL);
+
+      EBasicVer b1 = new EBasicVer("b1");
+      server.save(b1, txn);
+
+      EBasicVer b2 = new EBasicVer("b2");
+      server.save(b2, txn);
+
+      //txn.flushBatch();
+
+      b1.setDescription("modify");
+      System.out.println("here");
+      Timestamp lastUpdate = b1.getLastUpdate();
+      Integer id = b1.getId();
+
+      EBasicVer b3 = new EBasicVer("b3");
+      server.save(b3, txn);
+
+      txn.commit();
+
+    } finally {
+      txn.end();
+    }
+
+
+  }
+}

src/test/java/com/avaje/tests/cache/TestQueryCacheInsert.java

@@ -17,12 +17,12 @@ public class TestQueryCacheInsert extends BaseTestCase {
 
     EbeanServer server = Ebean.getServer(null);
 
-    EBasicVer account = new EBasicVer();
+    EBasicVer account = new EBasicVer("junk");
     server.save(account);
 
     List<EBasicVer> alist0 = server.find(EBasicVer.class).setUseQueryCache(true).findList();
 
-    EBasicVer a2 = new EBasicVer();
+    EBasicVer a2 = new EBasicVer("junk2");
     server.save(a2);
     awaitL2Cache();
 

src/test/java/com/avaje/tests/delete/TestDeleteWithoutOptimisticLocking.java

@@ -31,8 +31,7 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase {
   @Test
   public void testSimpleBeanDelete_existingBean_returnsTrue() {
 
-    EBasicVer basic = new EBasicVer();
-    basic.setName("DelTest");
+    EBasicVer basic = new EBasicVer("DelTest");
     Ebean.save(basic);
 
     EBasicVer basicRef = Ebean.getReference(EBasicVer.class, basic.getId());
@@ -43,8 +42,7 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase {
   @Test
   public void testSimpleBeanDelete_existingBeanWithJdbcBatch_returnsTrue() {
 
-    EBasicVer basic = new EBasicVer();
-    basic.setName("DelTestBatch");
+    EBasicVer basic = new EBasicVer("DelTestBatch");
     Ebean.save(basic);
 
     EbeanServer server = Ebean.getDefaultServer();

src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java

@@ -15,8 +15,7 @@ public class TestInsertQueryUpdate extends BaseTestCase {
   @Test
   public void test() {
     
-    EBasicVer e0 = new EBasicVer();
-    e0.setName("name0");
+    EBasicVer e0 = new EBasicVer("name0");
     e0.setDescription("desc0");
     Ebean.save(e0);
     

src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java

@@ -15,8 +15,7 @@ public class TestInsertUpdateTrans extends BaseTestCase {
 		Ebean.beginTransaction();
 		try {
 
-			EBasicVer e0 = new EBasicVer();
-			e0.setName("onInsert");
+			EBasicVer e0 = new EBasicVer("onInsert");
 			e0.setDescription("something");
 			Ebean.save(e0);
 

src/test/java/com/avaje/tests/model/basic/EBasicVer.java

@@ -25,6 +25,10 @@ public class EBasicVer {
   @Version
   Timestamp lastUpdate;
 
+  public EBasicVer(String name) {
+    this.name = name;
+  }
+
   public Integer getId() {
     return id;
   }

src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextQueryScope.java

@@ -16,8 +16,7 @@ public class TestPersistenceContextQueryScope extends BaseTestCase {
   @Test
   public void test() {
 
-    EBasicVer bean = new EBasicVer();
-    bean.setName("first");
+    EBasicVer bean = new EBasicVer("first");
     Ebean.save(bean);
 
     //Ebean.getServerCacheManager().setCaching(EBasicVer.class, true);

src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java

@@ -18,9 +18,7 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase {
     
     ResetBasicData.reset();
     
-    EBasicVer bean = new EBasicVer();
-    bean.setName("Please Delete Me");
-    
+    EBasicVer bean = new EBasicVer("Please Delete Me");
     Ebean.save(bean);
     
     SpiTransaction transaction = (SpiTransaction)Ebean.beginTransaction();

src/test/java/com/avaje/tests/unitinternal/TestTxTypeOnTransactional.java

@@ -39,8 +39,7 @@ public class TestTxTypeOnTransactional extends BaseTestCase {
   public void testOptimisticException() {
 
     logger.info("-- testOptimisticException");
-    EBasicVer v = new EBasicVer();
-    v.setName("occ");
+    EBasicVer v = new EBasicVer("occ");
     v.setDescription("blah");
     Ebean.save(v);
 

src/test/java/com/avaje/tests/update/TestMarkAsDirty.java

@@ -14,9 +14,7 @@ public class TestMarkAsDirty extends BaseTestCase {
   @Test
   public void test() throws InterruptedException {
     
-    EBasicVer bean = new EBasicVer();
-    bean.setName("markAsDirty");
-    
+    EBasicVer bean = new EBasicVer("markAsDirty");
     Ebean.save(bean);
     
     Timestamp lastUpdate = bean.getLastUpdate();

src/test/java/com/avaje/tests/update/TestUpdateAllLoadedProperties.java

@@ -20,13 +20,11 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase {
   @Test
   public void test() {
 
-    EBasicVer basic1 = new EBasicVer();
-    basic1.setName("basic1");
+    EBasicVer basic1 = new EBasicVer("basic1");
     basic1.setDescription("aaa");
     Ebean.save(basic1);
 
-    EBasicVer basic2 = new EBasicVer();
-    basic1.setName("basic2");
+    EBasicVer basic2 = new EBasicVer("basic2");
     basic1.setDescription("bbb");
     Ebean.save(basic2);