From d95e16170d063c0b74d04e6636e8fddbfa120689 Mon Sep 17 00:00:00 2001 From: James Moger Date: Tue, 16 Aug 2011 15:32:56 -0400 Subject: Finished MySQL dialect; v5.0.51b 100% tested. Added Db.dropTable(T) --- tests/com/iciql/test/models/PrimitivesModel.java | 5 +++-- tests/com/iciql/test/models/ProductAnnotationOnly.java | 5 +---- tests/com/iciql/test/models/SupportedTypes.java | 5 +++-- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'tests/com/iciql/test/models') diff --git a/tests/com/iciql/test/models/PrimitivesModel.java b/tests/com/iciql/test/models/PrimitivesModel.java index 0affd28..44e8b9b 100644 --- a/tests/com/iciql/test/models/PrimitivesModel.java +++ b/tests/com/iciql/test/models/PrimitivesModel.java @@ -21,6 +21,7 @@ import java.util.Random; import com.iciql.Iciql.IQColumn; import com.iciql.Iciql.IQTable; +import com.iciql.test.IciqlSuite; /** * Primitive types model. @@ -67,8 +68,8 @@ public class PrimitivesModel { same &= myShort == p.myShort; same &= myByte == p.myByte; same &= myBoolean == p.myBoolean; - same &= myDouble == p.myDouble; - same &= myFloat == p.myFloat; + same &= IciqlSuite.equivalentTo(myDouble, p.myDouble); + same &= IciqlSuite.equivalentTo(myFloat, p.myFloat); return same; } diff --git a/tests/com/iciql/test/models/ProductAnnotationOnly.java b/tests/com/iciql/test/models/ProductAnnotationOnly.java index 80bf0a1..e4de22d 100644 --- a/tests/com/iciql/test/models/ProductAnnotationOnly.java +++ b/tests/com/iciql/test/models/ProductAnnotationOnly.java @@ -34,12 +34,9 @@ import com.iciql.Iciql.IndexType; @IQIndexes({ @IQIndex({ "name", "cat" }), @IQIndex(name = "nameidx", type = IndexType.HASH, value = "name") }) public class ProductAnnotationOnly { - @IQColumn(autoIncrement = true) - public Integer autoIncrement; - public String unmappedField; - @IQColumn(name = "id") + @IQColumn(name = "id", autoIncrement = true) public Integer productId; @IQColumn(name = "cat", length = 15, trim = true) diff --git a/tests/com/iciql/test/models/SupportedTypes.java b/tests/com/iciql/test/models/SupportedTypes.java index 596af74..1aaa833 100644 --- a/tests/com/iciql/test/models/SupportedTypes.java +++ b/tests/com/iciql/test/models/SupportedTypes.java @@ -32,6 +32,7 @@ import com.iciql.Iciql.IQIndexes; import com.iciql.Iciql.IQTable; import com.iciql.Iciql.IQVersion; import com.iciql.Iciql.IndexType; +import com.iciql.test.IciqlSuite; import com.iciql.test.models.EnumModels.Tree; import com.iciql.util.Utils; @@ -166,8 +167,8 @@ public class SupportedTypes { same &= myShort.equals(s.myShort); same &= myInteger.equals(s.myInteger); same &= myLong.equals(s.myLong); - same &= myFloat.equals(s.myFloat); - same &= myDouble.equals(s.myDouble); + same &= IciqlSuite.equivalentTo(myFloat, s.myFloat); + same &= IciqlSuite.equivalentTo(myDouble, s.myDouble); same &= myBigDecimal.compareTo(s.myBigDecimal) == 0; SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); same &= df.format(myUtilDate).equals(df.format(s.myUtilDate)); -- cgit v1.2.3