You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2009/03/18 13:37:32 UTC
svn commit: r755580 - in /openjpa/trunk: openjpa-persistence-jdbc/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/
openjpa-persistence-jdbc/src/test/java/org/ap...
Author: mikedd
Date: Wed Mar 18 12:37:31 2009
New Revision: 755580
URL: http://svn.apache.org/viewvc?rev=755580&view=rev
Log:
OPENJPA-947. Reduce testcase logging
Modified:
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java
openjpa/trunk/openjpa-slice/pom.xml
openjpa/trunk/openjpa-slice/src/test/resources/META-INF/persistence.xml
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Wed Mar 18 12:37:31 2009
@@ -600,6 +600,9 @@
<exclude>org/apache/openjpa/persistence/meta/TestSequenceAssigned.java</exclude>
<exclude>org/apache/openjpa/persistence/meta/TestValueStrategies.java</exclude>
<exclude>org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java</exclude>
+
+ <!-- TestPMMemory creates heapdumps etc and there's no real asserts within the test. -->
+ <exclude>org/apache/openjpa/persistence/kernel/TestPMMemory.java</exclude>
</excludes>
<systemProperties>
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java Wed Mar 18 12:37:31 2009
@@ -159,7 +159,6 @@
assertNotNull(actual);
Class actualType = actual.getClass();
if (!targetType.isAssignableFrom(actualType)) {
- actual.printStackTrace();
fail(targetType.getName() + " is not assignable from "
+ actualType.getName());
}
@@ -178,7 +177,6 @@
nested = next;
}
}
- actual.printStackTrace();
fail("No nested type " + nestedTargetType + " in " + actual);
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java Wed Mar 18 12:37:31 2009
@@ -50,8 +50,7 @@
}
public void testLowerVersionCanBeSet() {
- super.setUp("openjpa.Specification", "JPA 1.0",
- "openjpa.Log", "DefaultLevel=WARN");
+ super.setUp("openjpa.Specification", "JPA 1.0");
Specification spec = getSpecifcation();
assertNotNull(spec);
@@ -69,8 +68,7 @@
}
public void testDifferentSpecCanBeSet() {
- super.setUp("openjpa.Specification", "jdo 3.0",
- "openjpa.Log", "DefaultLevel=WARN");
+ super.setUp("openjpa.Specification", "jdo 3.0");
}
public void testSpecCanBeSetToNullString() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java Wed Mar 18 12:37:31 2009
@@ -225,7 +225,6 @@
config.setConnectionFactoryMode("aoeu");
fail("setting the ConnectionFactoryMode to aoeu should fail");
} catch (RuntimeException re) {
- re.printStackTrace();
// as expected ... make sure the exception suggests the
// valid names in the message.
assertTrue(-1 != re.getMessage().indexOf("managed"));
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java Wed Mar 18 12:37:31 2009
@@ -572,11 +572,6 @@
+ "JPQL [" + jpql + "]\r\n"
+ "error : " + jpqlError.getMessage());
} else {
- System.err.println("WARN: Both JPQL and QueryDefinition are invalid"
- + "\r\nJPQL " + jpql + "\r\n"
- + "error :" + jpqlError.getMessage() + "\r\n"
- + "Criteria " + qb.toJPQL(q) + "\r\n"
- + "error : " + criteriaError.getMessage());
compareLiterally(jpql, q);
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java Wed Mar 18 12:37:31 2009
@@ -58,7 +58,6 @@
*/
@SuppressWarnings("unchecked")
public void testPerfectCache() {
- print(stats);
// populate a bunch of customer and order
int nCustomer = 20;
int nOrder = 10;
@@ -102,12 +101,7 @@
}
void print(CacheStatistics stats) {
- System.err
- .print("r:" + stats.getTotalReadCount() + " w:"
- + stats.getTotalWriteCount() + " h:"
- + stats.getTotalHitCount());
- System.err.println(" since last reset r:" + stats.getReadCount()
- + " w:" + stats.getWriteCount() + " h:" + stats.getHitCount());
+ // TODO log instead of printing to stderr.
}
}
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=755580&r1=755579&r2=755580&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 Wed Mar 18 12:37:31 2009
@@ -1148,7 +1148,6 @@
}
public void createItem3(EntityManager em, int id) {
- System.out.println("In CreateItem3, id = " + id);
Item3 item = new Item3();
item.setId(id);
for (int i = 0; i < numImagesPerItem; i++) {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java Wed Mar 18 12:37:31 2009
@@ -696,8 +696,6 @@
createOrphanRemoval();
EntityManager em = emf.createEntityManager();
CustomerXml c = em.find(CustomerXml.class, 1);
- System.err.println("C name = " + c.getName());
- System.err.println("size before = " + c.getOrders().size());
c.setOrders(null);
em.getTransaction().begin();
em.persist(c);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java Wed Mar 18 12:37:31 2009
@@ -125,10 +125,6 @@
for (Iterator iter = listener2.added.iterator(); iter.hasNext();) {
Id roid = Id.newInstance(RuntimeTest1.class, oid);
Id it = (Id) iter.next();
- System.out.println("===ROID: " + roid.getId() + " +++== ITER: " +
- it.getId() + " Content: " + listener2.added + "ROID Cont: " +
- roid);
- System.out.println("Result of COMP " + it.equals(roid));
//FixMe --det. why it.equals(roid) fails when the are actually equal
if (it.toString().equals(roid.toString())) {
pass = true;
@@ -162,10 +158,6 @@
pass = false;
for (Iterator iter = listener2.updated.iterator(); iter.hasNext();) {
Id it = (Id) iter.next();
- System.out.println("===ROID: " + roid.getId() + "+++== ITER: " +
- it.getId() + "Content: " + listener2.added);
- System.out.println("Result of COMP " + it.equals(roid));
-
if (it.toString().equals(roid.toString())) {
pass = true;
break;
@@ -198,10 +190,6 @@
pass = false;
for (Iterator iter = listener2.deleted.iterator(); iter.hasNext();) {
Id it = (Id) iter.next();
- System.out.println("===ROID: " + roid.getId() + "+++== ITER: " +
- it.getId() + "Content: " + listener2.added);
- System.out.println("Result of COMP " + it.equals(roid));
-
if (it.toString().equals(roid.toString())) {
pass = true;
break;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java Wed Mar 18 12:37:31 2009
@@ -52,8 +52,7 @@
} else {
super.setUp(CLEAR_TABLES, PObjectNative.class,
"openjpa.jdbc.DBDictionary",
- "oracle(UseTriggersForAutoAssign=true)",
- "openjpa.Log", "SQL=TRACE");
+ "oracle(UseTriggersForAutoAssign=true)");
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java Wed Mar 18 12:37:31 2009
@@ -41,6 +41,7 @@
private static double DBL_VALUE = 3.0;
private EntityManager em;
+
@Override
public void setUp() throws Exception {
super.setUp(CLEAR_TABLES, Binder.class);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java Wed Mar 18 12:37:31 2009
@@ -67,25 +67,13 @@
}
public void testFinder() {
- int N = 200;
-
emf = createEMF("openjpa.jdbc.FinderCache", "false");
run(1, Book.class, BOOK_IDS); // for warmup
assertNull(getCache());
- long without = run(N, Book.class, BOOK_IDS);
emf = createEMF("openjpa.jdbc.FinderCache", "true");
assertNotNull(getCache());
- long with = run(N, Book.class, BOOK_IDS);
-
- getCache().getStatistics().dump(System.out);
-
- long pct = (without-with)*100/without;
- System.err.println(BOOK_IDS.length*N + " find");
- System.err.println("with " + with);
- System.err.println("without " + without);
- System.err.println("delta " + (pct > 0 ? "+" : "") + pct + "%");
}
public void testSQLEventListener() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java Wed Mar 18 12:37:31 2009
@@ -292,7 +292,6 @@
}
QueryStatistics stats = getCache().getStatistics();
- stats.dump(System.out);
assertEquals(N1, stats.getExecutionCount(jpql1));
assertEquals(N2, stats.getExecutionCount(jpql2));
@@ -339,8 +338,6 @@
q2.getResultList();
}
- stats.dump(System.out);
-
assertEquals(N11, stats.getExecutionCount(jpql1));
assertEquals(N21, stats.getExecutionCount(jpql2));
assertEquals(N11+N21, stats.getExecutionCount());
@@ -464,21 +461,10 @@
long delta = (without == 0) ? 0 : (without - with) * 100 / without;
- String sql = getSQL(realJPQL);
- log("Execution time in nanos for " + SAMPLE_SIZE
- + " query execution with and without SQL cache:" + with + " "
- + without + " (" + delta + "%)");
- log("JPQL: " + realJPQL);
- log("SQL : " + sql);
if (delta < 0) {
if (FAIL_ON_PERF_DEGRADE)
assertFalse("change in execution time = " + delta + "%",
delta < 0);
- else
- log("*** WARN: Perforamce regression with cache." +
- " Execution time degrades by " + delta + "%");
- } else {
- log("change in execution time = +" + delta + "%");
}
}
@@ -495,7 +481,6 @@
*/
long run(String jpql, Object[] params, boolean useCache, int N,
boolean isNamedQuery, int expectedCount, boolean checkHits) {
- trace("Executing " + N + " times " + (useCache ? " with " : "without") + " cache");
List<Long> stats = new ArrayList<Long>();
sql.clear();
for (int i = 0; i < N; i++) {
@@ -559,15 +544,6 @@
return "'"+s+"'";
}
- void log(String s) {
- System.err.println(s);
- }
-
- void trace(String s) {
- if (Boolean.getBoolean("trace"))
- System.err.println(s);
- }
-
void walk(List list) {
Iterator i = list.iterator();
while (i.hasNext())
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java Wed Mar 18 12:37:31 2009
@@ -43,8 +43,7 @@
fail("Null value allowed");
}
catch (Exception jfe) {
- System.out
- .println("Exception expected...Null value not allowed...");
+ // Exception expected...Null value not allowed...
}
endEm(pm);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java Wed Mar 18 12:37:31 2009
@@ -38,8 +38,6 @@
}
public void setUp() {
- System.out.println("Running test " + this.getName() + " of " +
- this.getClass().getSimpleName());
pojo = new UnAnnotPojo();
pojo.setName("failure");
pojo.setNum(0);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java Wed Mar 18 12:37:31 2009
@@ -43,8 +43,7 @@
fail();
} catch (Exception e) {
if (!expected.isAssignableFrom(e.getClass())) {
- e.printStackTrace();
- fail("Expected " + expected.getName());
+ fail("Expected " + expected.getName() + " receieved " + e);
}
}
}
@@ -56,11 +55,7 @@
em.persist(pc);
else
em.merge(pc);
- try {
- em.getTransaction().commit();
- } catch (RuntimeException e) {
- e.printStackTrace();
- fail();
- }
+
+ em.getTransaction().commit();
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java Wed Mar 18 12:37:31 2009
@@ -44,7 +44,6 @@
aid = a.getId ();
em.getTransaction ().commit ();
em.close ();
- System.out.println ("ChainEntityA id = " + aid);
}
public void testChainEntities () {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java Wed Mar 18 12:37:31 2009
@@ -35,14 +35,12 @@
private void closeEM(EntityManager em) {
if (em != null && em.isOpen()) {
- System.out.println("Closing EM: " + em);
em.close();
}
}
private EntityManager openEM() {
EntityManager em = txEMF.getTransactionalEntityManager();
- System.out.println("Opening EM: " + em);
return em;
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java Wed Mar 18 12:37:31 2009
@@ -81,7 +81,6 @@
"unexpected number of subjects for the book " + qTitle, 2,
subjects.size());
} catch (Exception e) {
- e.printStackTrace();
fail("Unable to findBookByTitle");
}
}
@@ -98,7 +97,6 @@
assertEquals("the borrower found is not " + bName, bName,
harry.getName());
} catch (Exception e) {
- e.printStackTrace();
fail("Unable to find borrower by name");
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java Wed Mar 18 12:37:31 2009
@@ -47,6 +47,8 @@
import org.apache.openjpa.persistence.JPAFacadeHelper;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import sun.security.action.GetLongAction;
+
/**
* Base test class providing persistence utilities.
*
@@ -508,9 +510,6 @@
// swallow;
}
}
- System.err.println("WARN: " + getClass().getName() + " not run " +
- "in the current platform because none of the specified " +
- " driver(s) " + Arrays.toString(drivers) + " can be loaded");
}
return false;
}
Modified: openjpa/trunk/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Wed Mar 18 12:37:31 2009
@@ -34,11 +34,11 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
+ <test.jvm.arguments>-Xmx500m</test.jvm.arguments>
<openjpa.loglevel>INFO</openjpa.loglevel>
<!-- to set debug arguments, you might set the following at the command line:
- -Dsurefire.jvm.args="-Xmx500m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000"
+ -Dtest.jvm.args="-Xmx500m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000"
-->
- <surefire.jvm.args>-Xmx500m</surefire.jvm.args>
</properties>
<dependencies>
<dependency>
@@ -147,6 +147,24 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${test.jvm.arguments}</argLine>
+ <systemProperties>
+ <property>
+ <name>openjpa.Log</name>
+ <value>DefaultLevel=${openjpa.loglevel}</value>
+ </property>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: openjpa/trunk/openjpa-slice/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/src/test/resources/META-INF/persistence.xml?rev=755580&r1=755579&r2=755580&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/src/test/resources/META-INF/persistence.xml (original)
+++ openjpa/trunk/openjpa-slice/src/test/resources/META-INF/persistence.xml Wed Mar 18 12:37:31 2009
@@ -23,9 +23,6 @@
<class>org.apache.openjpa.slice.Person</class>
<class>org.apache.openjpa.slice.Address</class>
<class>org.apache.openjpa.slice.Country</class>
- <properties>
- <property name="openjpa.Log" value="DefaultLevel=WARN, Enhance=TRACE"/>
- </properties>
</persistence-unit>
@@ -42,7 +39,6 @@
<property name="openjpa.slice.DistributionPolicy" value="org.apache.openjpa.slice.policy.UserDistributionPolicy"/>
<property name="openjpa.slice.ThreadingPolicy" value="fixed"/>
- <property name="openjpa.Log" value="DefaultLevel=INFO, Enhance=TRACE, SQL=TRACE"/>
<property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="openjpa.ConnectionUserName" value=""/>
<property name="openjpa.ConnectionPassword" value=""/>
@@ -70,7 +66,6 @@
<property name="openjpa.slice.Two.ConnectionURL" value="jdbc:derby:target/database/openjpa-slice2;create=true"/>
<property name="openjpa.Multithreaded" value="false"/>
- <property name="openjpa.Log" value="DefaultLevel=INFO, Enhance=TRACE, SQL=TRACE"/>
<property name="openjpa.jdbc.SynchronizeMappings" value="refresh"/>
<property name="openjpa.jdbc.MappingDefaults" value="DefaultMissingInfo=true"/>
<property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>
@@ -100,7 +95,6 @@
<property name="openjpa.Connection2URL" value="jdbc:derby:target/database/openjpa-slice1;create=true"/>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
<property name="openjpa.QueryCompilationCache" value="false"/>
- <property name="openjpa.Log" value="DefaultLevel=WARN, Enhance=TRACE, SQL=TRACE"/>
<property name="openjpa.jdbc.MappingDefaults" value="DefaultMissingInfo=true"/>
<property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>
</properties>
@@ -123,7 +117,6 @@
<property name="openjpa.Connection2URL" value="jdbc:derby:target/database/openjpa-slice1;create=true"/>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
- <property name="openjpa.Log" value="DefaultLevel=WARN, Enhance=TRACE, SQL=TRACE"/>
<property name="openjpa.jdbc.MappingDefaults" value="DefaultMissingInfo=true"/>
</properties>
</persistence-unit>
@@ -144,7 +137,6 @@
<property name="openjpa.slice.Two.ConnectionURL" value="jdbc:mysql://localhost/slice2"/>
<property name="openjpa.Multithreaded" value="false"/>
- <property name="openjpa.Log" value="DefaultLevel=INFO, Enhance=TRACE, SQL=TRACE"/>
<property name="openjpa.jdbc.SynchronizeMappings" value="refresh"/>
<property name="openjpa.jdbc.MappingDefaults" value="DefaultMissingInfo=true"/>
<property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>