[infinispan-commits] Infinispan SVN: r2400 - in trunk/core/src/test/java/org/infinispan/test: fwk and 1 other directory.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Sep 16 12:20:06 EDT 2010
Author: manik.surtani at jboss.com
Date: 2010-09-16 12:20:05 -0400 (Thu, 16 Sep 2010)
New Revision: 2400
Modified:
trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
Log:
Only clear the cache manager if it is running
Modified: trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java 2010-09-16 16:18:26 UTC (rev 2399)
+++ trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java 2010-09-16 16:20:05 UTC (rev 2400)
@@ -82,7 +82,7 @@
@AfterMethod(alwaysRun=true)
protected void clearContent() throws Throwable {
if (cleanup == CleanupPhase.AFTER_TEST) {
- assertSupportedConfig();
+// assertSupportedConfig();
log.debug("*** Test method complete; clearing contents on all caches.");
if (cacheManagers.isEmpty())
throw new IllegalStateException("No caches registered! Use registerCacheManager(Cache... caches) do that!");
@@ -106,10 +106,10 @@
for (Cache cache : TestingUtil.getRunningCaches(cm)) {
Configuration config = cache.getConfiguration();
try {
- assert config.isSyncCommitPhase();
- assert config.isSyncRollbackPhase();
+ assert config.isSyncCommitPhase() : "Must use a sync commit phase!";
+ assert config.isSyncRollbackPhase(): "Must use a sync rollback phase!";
} catch (AssertionError e) {
- log.error("Invalid config for cache: " + getClass().getName());
+ log.error("Invalid config for cache in test: " + getClass().getName());
throw e;
}
}
@@ -213,7 +213,7 @@
Cache<K, V> cache = cm.getCache(cacheName);
caches.add(cache);
}
- TestingUtil.blockUntilViewsReceived(10000, caches);
+ TestingUtil.blockUntilViewsReceived(30000, caches);
return caches;
}
Modified: trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2010-09-16 16:18:26 UTC (rev 2399)
+++ trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2010-09-16 16:20:05 UTC (rev 2400)
@@ -428,12 +428,14 @@
}
public static void clearContent(EmbeddedCacheManager cacheContainer) {
- if (cacheContainer != null) {
+ if (cacheContainer != null && cacheContainer.getStatus().allowInvocations()) {
Set<Cache> runningCaches = getRunningCaches(cacheContainer);
for (Cache cache : runningCaches) {
clearRunningTx(cache);
}
- if (!((EmbeddedCacheManager) cacheContainer).getStatus().allowInvocations()) return;
+
+ if (!cacheContainer.getStatus().allowInvocations()) return;
+
for (Cache cache : runningCaches) {
removeInMemoryData(cache);
clearCacheLoader(cache);
@@ -450,6 +452,9 @@
if (c.getStatus().allowInvocations()) running.add(c);
}
+ Cache defaultCache = ((DefaultCacheManager) cacheContainer).getCache();
+ if (defaultCache.getStatus().allowInvocations()) running.add(defaultCache);
+
return running;
}
Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java 2010-09-16 16:18:26 UTC (rev 2399)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java 2010-09-16 16:20:05 UTC (rev 2400)
@@ -101,10 +101,15 @@
* @param transactional if true, the cache manager will support transactions by default.
*/
public static EmbeddedCacheManager createLocalCacheManager(boolean transactional) {
+ return createLocalCacheManager(transactional, -1);
+ }
+
+ public static EmbeddedCacheManager createLocalCacheManager(boolean transactional, long lockAcquisitionTimeout) {
GlobalConfiguration globalConfiguration = GlobalConfiguration.getNonClusteredDefault();
amendMarshaller(globalConfiguration);
minimizeThreads(globalConfiguration);
Configuration c = new Configuration();
+ if (lockAcquisitionTimeout > -1) c.setLockAcquisitionTimeout(lockAcquisitionTimeout);
if (transactional) amendJTA(c);
return newDefaultCacheManager(true, globalConfiguration, c, false);
}
More information about the infinispan-commits
mailing list