svn commit: r997894 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java

[mi...@apache.org]

Author: mikedd
Date: Thu Sep 16 19:47:47 2010
New Revision: 997894

URL: http://svn.apache.org/viewvc?rev=997894&view=rev
Log:
reverting 997888 - committed wrong testcase

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java?rev=997894&r1=997893&r2=997894&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java Thu Sep 16 19:47:47 2010
@@ -20,15 +20,10 @@ package org.apache.openjpa.persistence.j
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
 import javax.persistence.Query;
+import javax.persistence.EntityManager;
 
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.common.apps.Address;
-import org.apache.openjpa.persistence.common.apps.CompUser;
-import org.apache.openjpa.persistence.common.apps.FemaleUser;
-import org.apache.openjpa.persistence.common.apps.MaleUser;
+import org.apache.openjpa.persistence.common.apps.*;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestJPQLScalarExpressions extends AbstractTestCase {
@@ -194,12 +189,7 @@ public class TestJPQLScalarExpressions e
         List rs3 = em.createQuery(query3).getResultList();
         Object[] result3 = (Object[]) rs3.get(0);
         assertEquals("the result is not female", "Female", result3[1]);
-        if (((JDBCConfiguration) ((OpenJPAEntityManager) em).getConfiguration()).
-                        getDBDictionaryInstance().trimsTrailingWhitespace) {
-            assertEquals("the name is not shannon", "Shannon", result3[0]);
-        } else {
-            assertEquals("the name is not shannon", "Shannon ", result3[0]);
-        }
+        assertEquals("the name is not shannon", "Shannon ", result3[0]);
         result3 = (Object[]) rs3.get(2);
         assertEquals("the result is not male", "Male", result3[1]);
         assertEquals("the name is not seetha", "Seetha", result3[0]);