From 562c6fafc92a4977a5fa9574dfe858b097860c4a Mon Sep 17 00:00:00 2001 From: rbygrave Date: Sat, 19 Jul 2014 19:41:57 +1200 Subject: [PATCH] Update maven-enhancer to 4.1.5, improve test - TestNotEnhancedMappedSuper --- pom.xml | 2 +- .../deploy/TestNotEnhancedMappedSuper.java | 27 ++++++++++++++----- .../mappedsuper/NotEnhancedMappedSuper.java | 2 +- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index e7bed8abf..2c7d123fc 100644 --- a/pom.xml +++ b/pom.xml @@ -186,7 +186,7 @@ org.avaje.ebeanorm avaje-ebeanorm-mavenenhancer - 4.1.2 + 4.1.5 diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java index 731883cd0..bf72ace1f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java @@ -6,24 +6,39 @@ import org.junit.Test; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.ResetBasicData; +import com.avaje.ebean.bean.EntityBean; +import com.avaje.ebean.config.GlobalProperties; import com.avaje.tests.model.mappedsuper.ASimpleBean; +import com.avaje.tests.model.mappedsuper.NotEnhancedMappedSuper; public class TestNotEnhancedMappedSuper extends BaseTestCase { @Test public void simpleBean_mappedSuperNotEnhanced_ok() { -// //GlobalProperties.put("ebean.search.packages", "com.avaje.tests.model.mappedsuper"); - - ResetBasicData.reset(); - + GlobalProperties.put("ebean.search.packages", "com.avaje.tests.model.mappedsuper"); + ASimpleBean bean = new ASimpleBean(); bean.setName("junk"); Ebean.save(bean); - Assert.assertNotNull(bean.getId()); + + bean.setName("junk mod"); + Ebean.save(bean); + + ASimpleBean fetched = Ebean.find(ASimpleBean.class, bean.getId()); + Assert.assertEquals("junk mod", fetched.getName()); + Assert.assertEquals(bean.getName(), fetched.getName()); + + Ebean.delete(bean); + ASimpleBean fetched2 = Ebean.find(ASimpleBean.class, bean.getId()); + Assert.assertNull(fetched2); + + NotEnhancedMappedSuper mappedSuper = new NotEnhancedMappedSuper(); + boolean enhanced = (mappedSuper instanceof EntityBean); + Assert.assertFalse(enhanced); + } } diff --git a/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java b/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java index 2f9405f3b..37d579f32 100644 --- a/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java +++ b/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java @@ -4,7 +4,7 @@ import javax.persistence.MappedSuperclass; import javax.persistence.Transient; @MappedSuperclass -public abstract class NotEnhancedMappedSuper { +public class NotEnhancedMappedSuper { public static String SOMETHING = "Hello";