Author: ppoddar
Date: Fri Apr 26 23:01:54 2013
New Revision: 1476446
URL: http://svn.apache.org/r1476446
Log:
improve StoredProcedure tests
Modified:
openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java
openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/StoredProcedure.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=1476446&r1=1476445&r2=1476446&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:01:54 2013
@@ -57,22 +57,17 @@ public class TestNativeQueryProcedures e
if (conf.getDBDictionaryInstance() instanceof DerbyDictionary) {
procedureList = new DerbyProcedureList();
}
-
-// if (procedureList != null) {
-// Collection<StoredProcedure> createList =
procedureList.getProcedureList();
-// for (StoredProcedure proc : createList) {
-// createProcedure(proc);
-// }
-// }
+ for (StoredProcedure proc : procedureList.getProcedureList()) {
+ createProcedure(proc);
+ }
}
public void tearDown() throws Exception {
-// if (procedureList != null) {
-// Collection<StoredProcedure> dropList =
procedureList.getProcedureList();
-// for (StoredProcedure proc : dropList) {
-// dropProcedure(proc);
-// }
-// }
+ if (procedureList != null) {
+ for (StoredProcedure proc : procedureList.getProcedureList()) {
+ dropProcedure(proc);
+ }
+ }
super.tearDown();
}
@@ -126,9 +121,9 @@ public class TestNativeQueryProcedures e
query.executeUpdate();
em.getTransaction().commit();
} catch (Exception e) {
+ e.printStackTrace();
em.getTransaction().rollback();
- fail("Caught unexpected exception executing stored procedure: "
- + e.getMessage());
+ fail("Caught unexpected exception executing stored procedure:
" + e.getMessage());
}
// refresh the data
@@ -377,22 +372,24 @@ public class TestNativeQueryProcedures e
protected void createProcedure(StoredProcedure sp) {
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
+ String sql = sp.getCreateSQL();
try {
- em.createNativeQuery(sp.getCreateSQL()).executeUpdate();
+ em.createNativeQuery(sql).executeUpdate();
em.getTransaction().commit();
} catch (Exception ex) {
- System.err.println(ex.toString());
+ System.err.println("Can not execute [" + sql + "] due to \r\n"
+ ex.getMessage());
}
}
protected void dropProcedure(StoredProcedure sp) {
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
+ String sql = sp.getDropSQL();
try {
- em.createNativeQuery(sp.getDropSQL()).executeUpdate();
+ em.createNativeQuery(sql).executeUpdate();
em.getTransaction().commit();
} catch (Exception ex) {
- System.err.println(ex.toString());
+ System.err.println("Can not execute [" + sql + "] due to \r\n"
+ ex.getMessage());
}
}
}
Modified:
openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/StoredProcedure.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/StoredProcedure.java?rev=1476446&r1=1476445&r2=1476446&view=diff
==============================================================================
---
openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/StoredProcedure.java
(original)
+++
openjpa/sandboxes/21/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/StoredProcedure.java
Fri Apr 26 23:01:54 2013
@@ -104,7 +104,8 @@ public class StoredProcedure {
*/
public StoredProcedure readSQL(int i, Class<?> cls, String method,
Class<?>... paramTypes) {
assertStaticMethod(cls, method, paramTypes);
- String fragment = "READS SQL DATA DYNAMIC RESULT SETS " + i + "
EXTERNAL NAME'" + cls + '.' + method + "'";
+ String fragment = "READS SQL DATA DYNAMIC RESULT SETS " + i
+ + " EXTERNAL NAME '" + cls.getName() + '.' +
method + "'";
return setSQL(fragment);
}
public StoredProcedure styleSQL(String lang) {
@@ -120,7 +121,8 @@ public class StoredProcedure {
*/
public StoredProcedure updateSQL(Class<?> cls, String method,
Class<?>... paramTypes) {
assertStaticMethod(cls, method, paramTypes);
- String fragment = "MODIFIES SQL DATA EXTERNAL NAME '" + cls +
'.' + method + "'";
+ String fragment = "MODIFIES SQL DATA "
+ + "EXTERNAL NAME '" + cls.getName() + '.' +
method + "'";
return setSQL(fragment);
}
/**
