diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index dffdd6672..7f584c378 100644 --- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -4,6 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.CacheMode; import io.ebean.Ebean; import io.ebean.Pairs; +import io.ebean.annotation.IgnorePlatform; +import io.ebean.annotation.Platform; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; @@ -249,6 +251,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { assertBeanCacheHitMiss(0, 0); } + @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER}) @Test public void findList_inPairs_standardConcat() { @@ -284,6 +287,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { } + @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER}) @Test public void findList_inPairs_userConcat() { diff --git a/src/test/java/org/tests/model/onetoone/OtoThTop.java b/src/test/java/org/tests/model/onetoone/OtoThTop.java index 970e3da71..099a7aca8 100644 --- a/src/test/java/org/tests/model/onetoone/OtoThTop.java +++ b/src/test/java/org/tests/model/onetoone/OtoThTop.java @@ -10,17 +10,17 @@ import java.util.List; @Entity public class OtoThTop extends BaseModel { - String top; + String topp; @OneToMany(cascade = CascadeType.ALL) List manies; - public String getTop() { - return top; + public String getTopp() { + return topp; } - public void setTop(String top) { - this.top = top; + public void setTopp(String topp) { + this.topp = topp; } public List getManies() { diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java b/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java index 8803fa542..6ba85879a 100644 --- a/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java +++ b/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java @@ -9,7 +9,7 @@ public class TestOneToOneManyDelete { public void test() { OtoThTop top = new OtoThTop(); - top.setTop("top"); + top.setTopp("top"); for (int i = 0; i < 4; i++) { OtoThMany many = new OtoThMany();