From 1d94611932b074f974c09843b14e95d56edf0e73 Mon Sep 17 00:00:00 2001 From: Michael Dick Date: Wed, 18 Mar 2009 12:37:31 +0000 Subject: [PATCH] OPENJPA-947. Reduce testcase logging git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@755580 13f79535-47bb-0310-9956-ffa450edef68 --- openjpa-persistence-jdbc/pom.xml | 3 +++ .../apache/openjpa/conf/TestBadJdbcUrl.java | 2 -- .../conf/TestSpecificationConfiguration.java | 6 ++--- .../conf/TestOpenJPAConfiguration.java | 1 - .../persistence/criteria/TestCriteria.java | 5 ---- .../datacache/stats/TestStatistics.java | 8 +------ .../persistence/embed/TestEmbeddable.java | 1 - .../persistence/embed/TestEmbeddableXml.java | 2 -- .../persistence/event/RemoteEventBase.java | 12 ---------- .../jdbc/oracle/TestAutoIncrement.java | 3 +-- .../jdbc/query/TestQueryParameterBinding.java | 1 + .../jdbc/sqlcache/TestFinderCache.java | 12 ---------- .../jdbc/sqlcache/TestPreparedQueryCache.java | 24 ------------------- .../persistence/kernel/TestEJBNullValues.java | 3 +-- ...joWithoutAnnotationsCannotBePersisted.java | 2 -- .../nullity/AbstractNullityTestCase.java | 11 +++------ .../relations/TestChainEntities.java | 1 - .../persistence/spring/LibServiceImpl.java | 2 -- .../persistence/spring/TestLibService.java | 2 -- .../persistence/test/PersistenceTestCase.java | 5 ++-- openjpa-slice/pom.xml | 22 +++++++++++++++-- .../test/resources/META-INF/persistence.xml | 8 ------- 22 files changed, 34 insertions(+), 102 deletions(-) diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml index 574bdf481..080611280 100644 --- a/openjpa-persistence-jdbc/pom.xml +++ b/openjpa-persistence-jdbc/pom.xml @@ -600,6 +600,9 @@ org/apache/openjpa/persistence/meta/TestSequenceAssigned.java org/apache/openjpa/persistence/meta/TestValueStrategies.java org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java + + + org/apache/openjpa/persistence/kernel/TestPMMemory.java diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java index b40f614a6..82c9d30b0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java @@ -159,7 +159,6 @@ public class TestBadJdbcUrl extends TestCase { 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 @@ public class TestBadJdbcUrl extends TestCase { nested = next; } } - actual.printStackTrace(); fail("No nested type " + nestedTargetType + " in " + actual); } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java index 6f34e64ad..870533b31 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java @@ -50,8 +50,7 @@ public class TestSpecificationConfiguration extends SingleEMFTestCase { } 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 class TestSpecificationConfiguration extends SingleEMFTestCase { } public void testDifferentSpecCanBeSet() { - super.setUp("openjpa.Specification", "jdo 3.0", - "openjpa.Log", "DefaultLevel=WARN"); + super.setUp("openjpa.Specification", "jdo 3.0"); } public void testSpecCanBeSetToNullString() { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java index eeb693c05..f2884d537 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java @@ -225,7 +225,6 @@ public class TestOpenJPAConfiguration 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")); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java index 9897aba4d..ed695c9d2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java @@ -572,11 +572,6 @@ public class TestCriteria extends SingleEMFTestCase { + "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); } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java index 6e20db8b5..8267123a4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java @@ -58,7 +58,6 @@ public class TestStatistics extends SingleEMFTestCase { */ @SuppressWarnings("unchecked") public void testPerfectCache() { - print(stats); // populate a bunch of customer and order int nCustomer = 20; int nOrder = 10; @@ -102,12 +101,7 @@ public class TestStatistics extends SingleEMFTestCase { } 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. } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java index cd0efbade..ab9bc11fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java @@ -1148,7 +1148,6 @@ public class TestEmbeddable extends SingleEMFTestCase { } 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++) { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java index 62b6f885c..901b015ce 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java @@ -696,8 +696,6 @@ public class TestEmbeddableXml extends SingleEMFTestCase { 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); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java index 47b7129fa..e8a6af750 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java @@ -125,10 +125,6 @@ public class RemoteEventBase extends AbstractTestCase { 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 @@ public class RemoteEventBase extends AbstractTestCase { 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 @@ public class RemoteEventBase extends AbstractTestCase { 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; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java index 358ffd6e6..3b6266ceb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java @@ -52,8 +52,7 @@ public class TestAutoIncrement extends SingleEMFTestCase { } else { super.setUp(CLEAR_TABLES, PObjectNative.class, "openjpa.jdbc.DBDictionary", - "oracle(UseTriggersForAutoAssign=true)", - "openjpa.Log", "SQL=TRACE"); + "oracle(UseTriggersForAutoAssign=true)"); } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java index 77216af46..c4ec2200a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java @@ -41,6 +41,7 @@ public class TestQueryParameterBinding extends SingleEMFTestCase { private static double DBL_VALUE = 3.0; private EntityManager em; + @Override public void setUp() throws Exception { super.setUp(CLEAR_TABLES, Binder.class); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java index fb09d6eeb..b99c1b296 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java @@ -67,25 +67,13 @@ public class TestFinderCache extends SQLListenerTestCase { } 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() { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java index 76edb41d6..699b3950e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java @@ -292,7 +292,6 @@ public class TestPreparedQueryCache extends SQLListenerTestCase { } QueryStatistics stats = getCache().getStatistics(); - stats.dump(System.out); assertEquals(N1, stats.getExecutionCount(jpql1)); assertEquals(N2, stats.getExecutionCount(jpql2)); @@ -339,8 +338,6 @@ public class TestPreparedQueryCache extends SQLListenerTestCase { 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 @@ public class TestPreparedQueryCache extends SQLListenerTestCase { 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 @@ public class TestPreparedQueryCache extends SQLListenerTestCase { */ 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 stats = new ArrayList(); sql.clear(); for (int i = 0; i < N; i++) { @@ -559,15 +544,6 @@ public class TestPreparedQueryCache extends SQLListenerTestCase { 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()) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java index 0d957e886..0ff7f4b8f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java @@ -43,8 +43,7 @@ public class TestEJBNullValues extends AbstractTestCase { fail("Null value allowed"); } catch (Exception jfe) { - System.out - .println("Exception expected...Null value not allowed..."); + // Exception expected...Null value not allowed... } endEm(pm); } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java index a0d6cfd74..e3c461900 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java @@ -38,8 +38,6 @@ public class TestPojoWithoutAnnotationsCannotBePersisted } public void setUp() { - System.out.println("Running test " + this.getName() + " of " + - this.getClass().getSimpleName()); pojo = new UnAnnotPojo(); pojo.setName("failure"); pojo.setNum(0); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java index 91ef92011..ebe5634bb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java @@ -43,8 +43,7 @@ public abstract class AbstractNullityTestCase extends SingleEMFTestCase { 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 @@ public abstract class AbstractNullityTestCase extends SingleEMFTestCase { em.persist(pc); else em.merge(pc); - try { - em.getTransaction().commit(); - } catch (RuntimeException e) { - e.printStackTrace(); - fail(); - } + + em.getTransaction().commit(); } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java index 2b32fff48..dd968486f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java @@ -44,7 +44,6 @@ public class TestChainEntities extends SingleEMFTestCase { aid = a.getId (); em.getTransaction ().commit (); em.close (); - System.out.println ("ChainEntityA id = " + aid); } public void testChainEntities () { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java index e6a1afdf5..6cac17b6e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java @@ -35,14 +35,12 @@ public class LibServiceImpl implements LibService { 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; } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java index 341cc1a87..0a869d097 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java @@ -81,7 +81,6 @@ public class TestLibService extends SingleEMFTestCase "unexpected number of subjects for the book " + qTitle, 2, subjects.size()); } catch (Exception e) { - e.printStackTrace(); fail("Unable to findBookByTitle"); } } @@ -98,7 +97,6 @@ public class TestLibService extends SingleEMFTestCase assertEquals("the borrower found is not " + bName, bName, harry.getName()); } catch (Exception e) { - e.printStackTrace(); fail("Unable to find borrower by name"); } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java index 45366744f..2dd4c640c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java @@ -47,6 +47,8 @@ import org.apache.openjpa.meta.ClassMetaData; 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 @@ public abstract class PersistenceTestCase // 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; } diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml index ce647f250..c64d41abb 100644 --- a/openjpa-slice/pom.xml +++ b/openjpa-slice/pom.xml @@ -34,11 +34,11 @@ 2.0.0-SNAPSHOT + -Xmx500m INFO - -Xmx500m @@ -147,6 +147,24 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + + ${test.jvm.arguments} + + + openjpa.Log + DefaultLevel=${openjpa.loglevel} + + + derby.stream.error.file + target/derby.log + + + + diff --git a/openjpa-slice/src/test/resources/META-INF/persistence.xml b/openjpa-slice/src/test/resources/META-INF/persistence.xml index 82480decc..0f23f8656 100644 --- a/openjpa-slice/src/test/resources/META-INF/persistence.xml +++ b/openjpa-slice/src/test/resources/META-INF/persistence.xml @@ -23,9 +23,6 @@ org.apache.openjpa.slice.Person org.apache.openjpa.slice.Address org.apache.openjpa.slice.Country - - - @@ -42,7 +39,6 @@ - @@ -70,7 +66,6 @@ - @@ -100,7 +95,6 @@ - @@ -123,7 +117,6 @@ - @@ -144,7 +137,6 @@ -