svn commit: r1029821 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed: Department2.java TestEmbeddable.java

[allee8285]

Author: allee8285
Date: Mon Nov  1 20:19:32 2010
New Revision: 1029821

URL: http://svn.apache.org/viewvc?rev=1029821&view=rev
Log:
OPENJPA-1793 - New test case testEntityA_Embed_Single_Coll caused "ORA-01861: 
literal does not match format string" when run against Oracle due to default 
DATE column format differences. (See 
http://download.oracle.com/docs/cd/B19306_01/server.102/b14200/sql_elements004.htm)

Modified:
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java?rev=1029821&r1=1029820&r2=1029821&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java
 Mon Nov  1 20:19:32 2010
@@ -49,6 +49,6 @@ public class Department2 {
     }
     
     public void addEmployee(Employee2 emp) {
-        empMap.put(emp.getEmpPK(), emp);
+        getEmpMap().put(emp.getEmpPK(), emp);
     }
 }

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java?rev=1029821&r1=1029820&r2=1029821&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
 Mon Nov  1 20:19:32 2010
@@ -60,8 +60,7 @@ public class TestEmbeddable extends SQLL
     public int numEmployeesPerPhoneNumber = 1;
     public int numPhoneNumbersPerEmployee = 2;
     public int numEmployeesPerProgramManager = 2;
-    public int numEmployees = numProgramManagers
-        * numEmployeesPerProgramManager;
+    public int numEmployees = numProgramManagers * 
numEmployeesPerProgramManager;
     public int numPhoneNumbers = numEmployees * numPhoneNumbersPerEmployee;
     public int numDepartments = 2;
     public int numEmployeesPerDept = 2;
@@ -79,8 +78,7 @@ public class TestEmbeddable extends SQLL
     public int phoneId = 1;
     public int pmId = 1;
     public int parkingSpotId = 1;
-    public Map<Integer, PhoneNumber> phones =
-        new HashMap<Integer, PhoneNumber>();
+    public Map<Integer, PhoneNumber> phones = new HashMap<Integer, 
PhoneNumber>();
     public Map<Integer, Employee> employees = new HashMap<Integer, Employee>();
 
     public void setUp() {
@@ -108,7 +106,7 @@ public class TestEmbeddable extends SQLL
             EntityA_Embed_Complex.class, A.class, CLEAR_TABLES);
             sql.clear();
             DBDictionary dict = 
((JDBCConfiguration)emf.getConfiguration()).getDBDictionaryInstance();
-            if (dict.getClass().getName().indexOf("oracle") != -1) {
+            if (dict.getClass().getName().toLowerCase().indexOf("oracle") != 
-1) {
                 ((OracleDictionary)dict).useTriggersForAutoAssign = true;
             }
     }
@@ -188,7 +186,8 @@ public class TestEmbeddable extends SQLL
         //string (even the simplest string will do).
         em = emf.createEntityManager();
         Query query1 = em.createQuery("SELECT e FROM EntityA_Embed_Single_Coll 
e "
-            + "where e.embed.date = '" + date + "'");
+            + "where e.embed.date = :wheredate");
+        query1.setParameter("wheredate", date);
         eesc = (EntityA_Embed_Single_Coll) query1.getSingleResult();
         assertEquals(eesc.getEmbed().getDate().toString(), date.toString());
         em.close();