You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ev...@apache.org on 2010/01/14 13:54:51 UTC

svn commit: r899186 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java

Author: evgeny
Date: Thu Jan 14 12:54:51 2010
New Revision: 899186

URL: http://svn.apache.org/viewvc?rev=899186&view=rev
Log:
CAY-1354
Hide some test asserts to be Derby compatible. Derby doesn't have this types: BIT, BOOLEAN and TINYINT.

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java?rev=899186&r1=899185&r2=899186&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java Thu Jan 14 12:54:51 2010
@@ -125,8 +125,9 @@
         DataRow testRead = (DataRow) context.performQuery(q).get(0);
         Object columnValue = testRead.get(columnName);
         assertNotNull(columnValue);
-        assertEquals(Boolean.class, columnValue.getClass());
-        assertEquals(bitValue, columnValue);
+        assertTrue(Boolean.class.equals(columnValue.getClass())
+                || Short.class.equals(columnValue.getClass()));
+        assertTrue(bitValue.equals(columnValue) || ((Number) columnValue).intValue() == 1);
     }
 
     public void testBIT2() throws Exception {
@@ -191,8 +192,10 @@
         DataRow testRead = (DataRow) context.performQuery(q).get(0);
         Object columnValue = testRead.get(columnName);
         assertNotNull(columnValue);
-        assertEquals(Boolean.class, columnValue.getClass());
-        assertEquals(booleanValue, columnValue);
+        assertTrue(Boolean.class.equals(columnValue.getClass())
+                || Short.class.equals(columnValue.getClass()));
+        assertTrue(booleanValue.equals(columnValue)
+                || ((Number) columnValue).intValue() == 1);
     }
 
     public void testBOOLEAN2() throws Exception {
@@ -711,8 +714,9 @@
         DataRow testRead = (DataRow) context.performQuery(q).get(0);
         Object columnValue = testRead.get(columnName);
         assertNotNull(columnValue);
-        assertEquals(Byte.class, columnValue.getClass());
-        assertEquals(tinyintValue, columnValue);
+        assertTrue(Byte.class.equals(columnValue.getClass())
+                || Short.class.equals(columnValue.getClass()));
+        assertEquals(tinyintValue.intValue(), ((Number)columnValue).intValue());
     }
 
     public void testTINYINT2() throws Exception {