From e0a173f17eaf2a0e3a76cd56213a2361bd16da55 Mon Sep 17 00:00:00 2001 From: Michael Dick Date: Fri, 8 Oct 2010 16:28:55 +0000 Subject: [PATCH] Exclude test for Sybase and minor update to SEmfTC git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1005883 13f79535-47bb-0310-9956-ffa450edef68 --- .../persistence/nullity/TestBasicFieldNullity.java | 13 ++++++++++--- .../openjpa/persistence/test/SingleEMFTestCase.java | 6 +++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java index c795986cc..497ef3262 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java @@ -27,6 +27,7 @@ import javax.persistence.RollbackException; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; import org.apache.openjpa.jdbc.sql.OracleDictionary; +import org.apache.openjpa.jdbc.sql.SybaseDictionary; import org.apache.openjpa.persistence.InvalidStateException; import org.apache.openjpa.persistence.OpenJPAPersistence; @@ -167,10 +168,16 @@ public class TestBasicFieldNullity extends AbstractNullityTestCase { List result = query.getResultList(); assertFalse(result.isEmpty()); for (NullValues n : result) { - if (dict instanceof OracleDictionary) + if (dict instanceof OracleDictionary) { assertNull(n.getUniqueNullable()); - else - assertEquals(EMPTY_STRING, n.getUniqueNullable()); + } + else if (dict instanceof SybaseDictionary) { + // Sybase converts empty strings to "" + assertEquals(" ", n.getUniqueNullable()); + } + else { + assertEquals(EMPTY_STRING, n.getUniqueNullable()); + } } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java index 5b141f048..bb176e08e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java @@ -203,7 +203,7 @@ public abstract class SingleEMFTestCase } protected String getForUpdateClause() { - DBDictionary dict = ((JDBCConfiguration) emf.getConfiguration()).getDBDictionaryInstance(); + DBDictionary dict = getDBDictionary(); if (dict.forUpdateClause != null) { return dict.forUpdateClause; } @@ -212,5 +212,9 @@ public abstract class SingleEMFTestCase } return ""; } + + protected DBDictionary getDBDictionary() { + return ((JDBCConfiguration) emf.getConfiguration()).getDBDictionaryInstance(); + } }