Author: dwoods
Date: Tue Oct 12 21:05:16 2010
New Revision: 1021921
URL: http://svn.apache.org/viewvc?rev=1021921&view=rev
Log:
make sure tests cleanup EMs and EMFs. add @AllowFailure to excluded tests
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheMultiThreadedLoad.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDistributedKodoDataCache.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEmbeddedCollection.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLRUCache.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLocalCache.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultTypes.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java
Tue Oct 12 21:05:16 2010
@@ -52,7 +52,9 @@ public class CacheLoadTest
protected int interationCount =
Integer.getInteger("cachetest.iterations", 1000).intValue();
- public void setUp() {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
Map propsMap = new HashMap();
propsMap.put("openjpa.DataCache", "true");
propsMap.put("openjpa.RemoteCommitProvider", "sjvm");
@@ -60,6 +62,12 @@ public class CacheLoadTest
emf = getEmf(propsMap);
}
+ @Override
+ public void tearDown() throws Exception {
+ closeEMF(emf);
+ super.tearDown();
+ }
+
public void testCacheLoad()
throws Exception {
mttest(Integer.getInteger("cachetest.threads", 30).intValue(),
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java
Tue Oct 12 21:05:16 2010
@@ -293,25 +293,29 @@ public abstract class CacheTest extends
public void tearDown() throws Exception {
endEm(em);
-
+ em = null;
+ repos = null;
try {
- factory.close();
+ closeEMF(factory);
}
catch (Exception e) {
}
+ factory = null;
try {
- factory2.close();
+ closeEMF(factory2);
}
catch (Exception e) {
}
- super.tearDown();
-
- factory = null;
factory2 = null;
+ try {
+ closeEMF(timeoutFactory);
+ }
+ catch (Exception e) {
+ }
+ super.tearDown();
timeoutFactory = null;
oid = null;
parentOid = null;
- em = null;
a = null;
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheMultiThreadedLoad.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheMultiThreadedLoad.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheMultiThreadedLoad.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheMultiThreadedLoad.java
Tue Oct 12 21:05:16 2010
@@ -18,11 +18,14 @@
*/
package org.apache.openjpa.persistence.datacache;
+import org.apache.openjpa.persistence.test.AllowFailure;
+
/**
* Multi-threaded cache load test for running in the autobuild.
*
* @author <a href="mailto:[email protected]";>Marc Prud'hommeaux</a>
*/
+...@allowfailure(message="surefire excluded")
public class TestCacheMultiThreadedLoad
extends CacheLoadTest {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java
Tue Oct 12 21:05:16 2010
@@ -18,10 +18,13 @@
*/
package org.apache.openjpa.persistence.datacache;
+import org.apache.openjpa.persistence.test.AllowFailure;
+
/**
* Test data caching across multiple factories in the same JVM, using
* the single-JVM commit provider to communicate updates..
*/
+...@allowfailure(message="surefire excluded")
public class TestConcurrentDataCache
extends CacheTest {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
Tue Oct 12 21:05:16 2010
@@ -64,7 +64,7 @@ public class TestDataCacheBehavesIdentic
private static final String MARKER_CACHE = "in Object Cache";
private static final String MARKER_DIRTY_CACHE = "in Object Cache (dirty)";
private static long ID_COUNTER = System.currentTimeMillis();
-
+ private static int TEST_COUNT = 0;
/**
* Sets up two EntityManagerFactory: one with DataCache another without.
@@ -99,6 +99,16 @@ public class TestDataCacheBehavesIdentic
assertTrue(isDataCacheActive(emfWithDataCache));
assertFalse(isDataCacheActive(emfWithoutDataCache));
}
+ TEST_COUNT++;
+ }
+
+ public void tearDown() throws Exception {
+ // HACK - need to manually close EMFs after all tests have run
+ if (TEST_COUNT >= 21) {
+ closeEMF(emfWithDataCache);
+ closeEMF(emfWithoutDataCache);
+ super.tearDown();
+ }
}
/**
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDistributedKodoDataCache.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDistributedKodoDataCache.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDistributedKodoDataCache.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDistributedKodoDataCache.java
Tue Oct 12 21:05:16 2010
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.openjpa.persistence.datacache.common.apps.RuntimeTest1;
import org.apache.openjpa.persistence.datacache.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
import org.apache.openjpa.datacache.DataCache;
import org.apache.openjpa.event.TCPRemoteCommitProvider;
@@ -35,6 +36,7 @@ import org.apache.openjpa.persistence.Op
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
import org.apache.openjpa.util.Id;
+...@allowfailure(message="surefire excluded")
public class TestDistributedKodoDataCache extends AbstractTestCase {
// We want more than 1 instance of each type of class.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEmbeddedCollection.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEmbeddedCollection.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEmbeddedCollection.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEmbeddedCollection.java
Tue Oct 12 21:05:16 2010
@@ -42,23 +42,20 @@ import org.apache.openjpa.persistence.te
public class TestEmbeddedCollection extends SingleEMFTestCase {
private static final int SIZE = 4;
- private static OpenJPAEntityManagerFactorySPI emf = null;
+
/**
* Sets up EntityManagerFactory: with DataCache.
*/
+ @Override
public void setUp() throws Exception {
- if (emf == null) {
- super.setUp("openjpa.jdbc.SynchronizeMappings", "buildSchema",
- "openjpa.RuntimeUnenhancedClasses", "unsupported",
- "openjpa.DataCache", "true",
"openjpa.RemoteCommitProvider",
- "sjvm", "openjpa.jdbc.UpdateManager", "constraint",
- EmbeddingOwnerEntity.class,
- EmbeddedEntity.class,
- CLEAR_TABLES);
- emf = super.emf;
-
- createData();
- }
+ super.setUp("openjpa.jdbc.SynchronizeMappings", "buildSchema",
+ "openjpa.RuntimeUnenhancedClasses", "unsupported",
+ "openjpa.DataCache", "true", "openjpa.RemoteCommitProvider",
+ "sjvm", "openjpa.jdbc.UpdateManager", "constraint",
+ EmbeddingOwnerEntity.class,
+ EmbeddedEntity.class,
+ CLEAR_TABLES);
+ createData();
assertNotNull(emf);
assertNotNull(emf.getStoreCache());
assertTrue(isDataCacheActive(emf));
@@ -70,11 +67,6 @@ public class TestEmbeddedCollection exte
.getSystemDataCache() != null;
}
- @Override
- public void tearDown() throws Exception {
-
- }
-
public void createData() {
EmbeddingOwnerEntity owner = new EmbeddingOwnerEntity();
for (int i = 0; i < SIZE; i++) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java
Tue Oct 12 21:05:16 2010
@@ -24,19 +24,26 @@ import java.util.Map;
import javax.persistence.EntityManager;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
-import org.apache.openjpa.persistence.test.PersistenceTestCase;
+import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
-public class TestEntitiesAsKeys extends AbstractCachedEMFTestCase {
+public class TestEntitiesAsKeys extends AbstractPersistenceTestCase {
- OpenJPAEntityManagerFactorySPI emf =
- createEMF(MapHolder.class, MapEmbeddable.class, "openjpa.DataCache",
"true", "openjpa.RemoteCommitProvider",
- "sjvm", "openjpa.RuntimeUnenhancedClasses", "unsupported");
+ private OpenJPAEntityManagerFactorySPI emf;
- public void setUp() {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ emf = createEMF(MapHolder.class, MapEmbeddable.class,
"openjpa.DataCache", "true",
+ "openjpa.RemoteCommitProvider", "sjvm",
"openjpa.RuntimeUnenhancedClasses", "unsupported");
populate();
}
+ @Override
+ public void tearDown() throws Exception {
+ closeEMF(emf);
+ emf = null;
+ }
+
public void populate() {
EntityManager em = emf.createEntityManager();
// clean up before execution
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java
Tue Oct 12 21:05:16 2010
@@ -27,8 +27,10 @@ import javax.persistence.EntityManagerFa
import org.apache.openjpa.persistence.datacache.common.apps.
FlushDataCacheObject;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+...@allowfailure(message="surefire excluded")
public class TestFlushDataCache
extends AbstractTestCase {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java
Tue Oct 12 21:05:16 2010
@@ -23,9 +23,9 @@ import java.util.HashMap;
import java.util.Map;
import javax.persistence.EntityManagerFactory;
-
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
import org.apache.openjpa.kernel.Broker;
@@ -33,8 +33,8 @@ import org.apache.openjpa.kernel.BrokerF
import org.apache.openjpa.kernel.Query;
import org.apache.openjpa.kernel.jpql.JPQLParser;
import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+...@allowfailure(message="surefire excluded")
public class TestJPQL2Queries
extends AbstractTestCase {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java
Tue Oct 12 21:05:16 2010
@@ -31,6 +31,7 @@ import org.apache.openjpa.persistence.da
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectB;
import org.apache.openjpa.persistence.datacache.common.apps.
CacheObjectWithExternalizedFields;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
import org.apache.openjpa.kernel.Broker;
@@ -39,6 +40,7 @@ import org.apache.openjpa.kernel.Query;
import org.apache.openjpa.kernel.jpql.JPQLParser;
import org.apache.openjpa.persistence.JPAFacadeHelper;
+...@allowfailure(message="surefire excluded")
public class TestJPQL2ResultsAndResultClasses
extends AbstractTestCase {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java
Tue Oct 12 21:05:16 2010
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.da
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectJ;
import org.apache.openjpa.persistence.datacache.common.apps.
SelfReferencingCacheTestObject;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
import org.apache.openjpa.kernel.Broker;
@@ -39,6 +40,7 @@ import org.apache.openjpa.kernel.jpql.JP
import org.apache.openjpa.persistence.JPAFacadeHelper;
import org.apache.openjpa.util.UserException;
+...@allowfailure(message="surefire excluded")
public class TestJPQLRelationProjections
extends AbstractTestCase {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLRUCache.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLRUCache.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLRUCache.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLRUCache.java
Tue Oct 12 21:05:16 2010
@@ -80,7 +80,7 @@ public class TestLRUCache extends Single
assertTrue(res);
}
}
-
+ em.close();
}
public void testDataCacheOverFlow() {
@@ -109,6 +109,7 @@ public class TestLRUCache extends Single
assertTrue(contains);
}
}
+ em.close();
}
private boolean contains(String needle, List<String> haystack) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLocalCache.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLocalCache.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLocalCache.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLocalCache.java
Tue Oct 12 21:05:16 2010
@@ -18,9 +18,12 @@
*/
package org.apache.openjpa.persistence.datacache;
+import org.apache.openjpa.persistence.test.AllowFailure;
+
/**
* Test the local cache. Tests only a single PMF.
*/
+...@allowfailure(message="surefire excluded")
public class TestLocalCache
extends CacheTest {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java
Tue Oct 12 21:05:16 2010
@@ -82,5 +82,6 @@ public class TestM2MInDataCache extends
} catch (Exception e) {
fail("Fail to get a Map field when DataCache is on");
}
+ em.close();
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
Tue Oct 12 21:05:16 2010
@@ -27,6 +27,7 @@ import javax.persistence.EntityManagerFa
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
import org.apache.openjpa.kernel.Broker;
@@ -35,6 +36,7 @@ import org.apache.openjpa.kernel.Query;
import org.apache.openjpa.kernel.jpql.JPQLParser;
import org.apache.openjpa.persistence.JPAFacadeHelper;
+...@allowfailure(message="surefire excluded")
public class TestMutableParameters
extends AbstractTestCase {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java
Tue Oct 12 21:05:16 2010
@@ -27,6 +27,7 @@ import javax.persistence.EntityManagerFa
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectE;
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectJ;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
import org.apache.openjpa.kernel.Broker;
@@ -38,6 +39,7 @@ import org.apache.openjpa.persistence.JP
/**
* New test case.
*/
+...@allowfailure(message="surefire excluded")
public class TestPCParametersInQueries extends AbstractTestCase {
public TestPCParametersInQueries(String test) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultTypes.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultTypes.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultTypes.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultTypes.java
Tue Oct 12 21:05:16 2010
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.d
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectB;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
import org.apache.openjpa.kernel.Broker;
@@ -32,6 +33,7 @@ import org.apache.openjpa.persistence.JP
* Test some assumptions about query result metadata that the query
* cache relies on.
*/
+...@allowfailure(message="surefire excluded")
public class TestQueryResultTypes extends AbstractTestCase {
public TestQueryResultTypes(String test) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java
Tue Oct 12 21:05:16 2010
@@ -26,8 +26,8 @@ import java.util.List;
import java.util.Map;
import javax.persistence.EntityManagerFactory;
-
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
import org.apache.openjpa.kernel.Broker;
@@ -35,11 +35,11 @@ import org.apache.openjpa.kernel.BrokerF
import org.apache.openjpa.kernel.Query;
import org.apache.openjpa.kernel.jpql.JPQLParser;
import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
/**
* Test that we marshall and unmarshall result types appropriately.
*/
+...@allowfailure(message="surefire excluded")
public class TestResultShapes extends AbstractTestCase {
public TestResultShapes(String test) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
Tue Oct 12 21:05:16 2010
@@ -62,18 +62,14 @@ public class TestStatistics extends Sing
em.clear();
}
- public void tearDown() throws Exception {
-
- }
-
/**
* Test that the CacheStatistics is disabled by default.
*/
public void testDefaultSettings() {
Object[] props = { "openjpa.DataCache", "true",
"openjpa.RemoteCommitProvider", "sjvm" };
OpenJPAEntityManagerFactory emf1 =
createNamedEMF("second-persistence-unit", props);
-
assertFalse(emf1.getStoreCache().getStatistics().isEnabled());
+ closeEMF(emf1);
}
/**
@@ -178,7 +174,8 @@ public class TestStatistics extends Sing
assertNotSame(emf1.getStoreCache().getStatistics(),
emf2.getStoreCache().getStatistics());
assertNotSame(((StoreCacheImpl) emf1.getStoreCache()).getDelegate(),
((StoreCacheImpl) emf2.getStoreCache())
.getDelegate());
-
+ closeEMF(emf1);
+ closeEMF(emf2);
}
public void testPersist() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java?rev=1021921&r1=1021920&r2=1021921&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java
Tue Oct 12 21:05:16 2010
@@ -26,11 +26,13 @@ import javax.persistence.EntityManagerFa
import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAQuery;
+...@allowfailure(message="surefire excluded")
public class TestUniteratedQueryResult
extends AbstractTestCase {
