Author: mikedd
Date: Wed Mar 18 16:03:18 2009
New Revision: 755624
URL: http://svn.apache.org/viewvc?rev=755624&view=rev
Log:
OPENJPA-947. Testcase cleanup for 1.3.x
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
openjpa/branches/1.3.x/openjpa-slice/pom.xml
openjpa/branches/1.3.x/openjpa-slice/src/test/resources/META-INF/persistence.xml
Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml Wed Mar 18 16:03:18
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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
Wed Mar 18 16:03:18 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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java
Wed Mar 18 16:03:18 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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
Wed Mar 18 16:03:18 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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
Wed Mar 18 16:03:18 2009
@@ -54,8 +54,7 @@
} else {
super.setUp(CLEAR_TABLES, PObjectNative.class,
"openjpa.jdbc.DBDictionary",
- "oracle(UseTriggersForAutoAssign=true)",
- "openjpa.Log", "SQL=TRACE");
+
"oracle(UseTriggersForAutoAssign=true)");
}
}
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java
Wed Mar 18 16:03:18 2009
@@ -40,6 +40,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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
Wed Mar 18 16:03:18 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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
Wed Mar 18 16:03:18 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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java
Wed Mar 18 16:03:18 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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
Wed Mar 18 16:03:18 2009
@@ -44,7 +44,6 @@
aid = a.getId ();
em.getTransaction ().commit ();
em.close ();
- System.out.println ("ChainEntityA id = " + aid);
}
public void testChainEntities () {
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java
Wed Mar 18 16:03:18 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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
Wed Mar 18 16:03:18 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/branches/1.3.x/openjpa-slice/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-slice/pom.xml?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-slice/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-slice/pom.xml Wed Mar 18 16:03:18 2009
@@ -34,11 +34,11 @@
<version>1.3.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>
@@ -148,12 +148,24 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </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/branches/1.3.x/openjpa-slice/src/test/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-slice/src/test/resources/META-INF/persistence.xml?rev=755624&r1=755623&r2=755624&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-slice/src/test/resources/META-INF/persistence.xml
(original)
+++
openjpa/branches/1.3.x/openjpa-slice/src/test/resources/META-INF/persistence.xml
Wed Mar 18 16:03:18 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>
@@ -120,7 +114,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>
@@ -141,7 +134,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"/>
