trying to fix repository connection test for hotrod
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/35cd6c6a Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/35cd6c6a Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/35cd6c6a Branch: refs/heads/develop Commit: 35cd6c6a1c336596413d4f35ec598ae0626cbb79 Parents: d04230a Author: Sebastian Schaffert <[email protected]> Authored: Tue Mar 4 22:44:43 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Tue Mar 4 22:44:43 2014 +0100 ---------------------------------------------------------------------- .../remote/InfinispanRemoteCacheManager.java | 9 ++++++-- .../kiwi/test/remote/HotRodRepositoryTest.java | 2 ++ .../kiwi/test/remote/HotRodServerRule.java | 24 -------------------- 3 files changed, 9 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/35cd6c6a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/InfinispanRemoteCacheManager.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/InfinispanRemoteCacheManager.java b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/InfinispanRemoteCacheManager.java index 39a20b6..0952706 100644 --- a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/InfinispanRemoteCacheManager.java +++ b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/InfinispanRemoteCacheManager.java @@ -199,9 +199,14 @@ public class InfinispanRemoteCacheManager implements CacheManager { @Override public void shutdown() { try { - log.info("shutting down cache manager ..."); + log.info("shutting down Infinispan remote cache manager ..."); cacheManager.stop(); - } catch (CacheException ex) { + + while(cacheManager.isStarted()) { + log.info("waiting 100ms for cache manager to come down ..."); + Thread.sleep(100); + } + } catch (CacheException | InterruptedException ex) { log.warn("error shutting down cache: {}", ex.getMessage()); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/35cd6c6a/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodRepositoryTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodRepositoryTest.java b/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodRepositoryTest.java index 6d1cc2f..a7ee8a4 100644 --- a/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodRepositoryTest.java +++ b/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodRepositoryTest.java @@ -58,6 +58,8 @@ public class HotRodRepositoryTest extends RepositoryTest { */ @Override protected Repository createRepository() throws Exception { + hotrod.clearAll(); + store = new KiWiStore(config); return new SailRepository(store); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/35cd6c6a/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodServerRule.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodServerRule.java b/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodServerRule.java index 0bef0ee..7029b1f 100644 --- a/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodServerRule.java +++ b/libraries/kiwi/kiwi-caching-infinispan/src/test/java/org/apache/marmotta/kiwi/test/remote/HotRodServerRule.java @@ -19,10 +19,7 @@ package org.apache.marmotta.kiwi.test.remote; import org.apache.marmotta.kiwi.caching.CacheManager; import org.apache.marmotta.kiwi.infinispan.embedded.InfinispanEmbeddedCacheManager; -import org.apache.marmotta.kiwi.infinispan.remote.CustomJBossMarshaller; import org.infinispan.Cache; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.commons.api.BasicCacheContainer; import org.infinispan.commons.equivalence.ByteArrayEquivalence; import org.infinispan.configuration.cache.CacheMode; @@ -35,7 +32,6 @@ import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.server.hotrod.HotRodServer; import org.infinispan.server.hotrod.configuration.HotRodServerConfiguration; import org.infinispan.server.hotrod.configuration.HotRodServerConfigurationBuilder; -import org.junit.Assert; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; @@ -152,26 +148,6 @@ public class HotRodServerRule implements TestRule { hotRodServer.start(hotrodConfig, cacheManager); - // test if cache is available - org.infinispan.client.hotrod.configuration.Configuration remoteCfg = new org.infinispan.client.hotrod.configuration.ConfigurationBuilder() - .addServer() - .host("127.0.0.1") - .port(port) - .marshaller(new CustomJBossMarshaller()) - .pingOnStartup(true) - .build(true); - - - RemoteCacheManager remoteCacheManager = new RemoteCacheManager(remoteCfg); - Assert.assertTrue(remoteCacheManager.isStarted()); - - RemoteCache<String, String> m = remoteCacheManager.getCache(); - - m.put("xyz", "abc"); - String n = m.get("xyz"); - - Assert.assertNotNull(n); - return hotRodServer; }
