svn commit: r1476447 - /openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java

[ppoddar]

Author: ppoddar
Date: Fri Apr 26 23:04:09 2013
New Revision: 1476447

URL: http://svn.apache.org/r1476447
Log:
improve StoredProcedure tests

Modified:
    
openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java

Modified: 
openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java
URL: 
http://svn.apache.org/viewvc/openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java?rev=1476447&r1=1476446&r2=1476447&view=diff
==============================================================================
--- 
openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java
 (original)
+++ 
openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java
 Fri Apr 26 23:04:09 2013
@@ -58,14 +58,14 @@ public class TestNativeQueryProcedures e
             procedureList = new DerbyProcedureList();
         }
         for (StoredProcedure proc : procedureList.getProcedureList()) {
-            createProcedure(proc);
-    }
+            executeSQL(proc.getCreateSQL());
+        }
     }
 
     public void tearDown() throws Exception {
         if (procedureList != null) {
             for (StoredProcedure proc : procedureList.getProcedureList()) {
-                    dropProcedure(proc);
+                executeSQL(proc.getDropSQL());
             }
         }
         super.tearDown();
@@ -369,22 +369,14 @@ public class TestNativeQueryProcedures e
         }
     }
     
-    protected void createProcedure(StoredProcedure sp) {
-               EntityManager em = emf.createEntityManager();
-               em.getTransaction().begin();
-               String sql = sp.getCreateSQL();
-       try {
-               em.createNativeQuery(sql).executeUpdate();
-               em.getTransaction().commit();
-       } catch (Exception ex) {
-               System.err.println("Can not execute [" + sql + "] due to \r\n" 
+ ex.getMessage());
-       }
-    }
+    /**
+     * Execute the given non-select SQL via NativeQuery in a transaction.
+     * @param sp
+     */
     
-    protected void dropProcedure(StoredProcedure sp) {
+    protected void executeSQL(String sql) {
                EntityManager em = emf.createEntityManager();
                em.getTransaction().begin();
-               String sql = sp.getDropSQL();
        try {
                em.createNativeQuery(sql).executeUpdate();
                em.getTransaction().commit();
@@ -392,4 +384,5 @@ public class TestNativeQueryProcedures e
                System.err.println("Can not execute [" + sql + "] due to \r\n" 
+ ex.getMessage());
        }
     }
+    
 }