aboutsummaryrefslogtreecommitdiffstats
path: root/tests/com/iciql/test/models
diff options
context:
space:
mode:
authorJames Moger <james.moger@gmail.com>2011-08-16 15:32:56 -0400
committerJames Moger <james.moger@gmail.com>2011-08-16 15:32:56 -0400
commitd95e16170d063c0b74d04e6636e8fddbfa120689 (patch)
treea8157992ef14cb8f4392b847fbc8892cb30245d5 /tests/com/iciql/test/models
parent8193609af00aa9529ed7b3090b5739c4e95b12c4 (diff)
downloadiciql-d95e16170d063c0b74d04e6636e8fddbfa120689.tar.gz
iciql-d95e16170d063c0b74d04e6636e8fddbfa120689.zip
Finished MySQL dialect; v5.0.51b 100% tested. Added Db.dropTable(T)
Diffstat (limited to 'tests/com/iciql/test/models')
-rw-r--r--tests/com/iciql/test/models/PrimitivesModel.java5
-rw-r--r--tests/com/iciql/test/models/ProductAnnotationOnly.java5
-rw-r--r--tests/com/iciql/test/models/SupportedTypes.java5
3 files changed, 7 insertions, 8 deletions
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));