ISPN-3297 RemoteCaches cannot be assigned to BasicCaches anymore in t…

…he CDI module
Cotton-Ben · Jul 5, 2013 · 87d3709 · 87d3709
1 parent dc194bc
commit 87d3709
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 31 deletions.
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/DefaultCacheTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/DefaultCacheTest.java
@@ -1,6 +1,5 @@
 package org.infinispan.cdi.test.cache.remote;
 
-import org.infinispan.api.BasicCache;
 import org.infinispan.cdi.Remote;
 import org.infinispan.client.hotrod.RemoteCache;
 import org.infinispan.client.hotrod.RemoteCacheManager;
@@ -46,7 +45,7 @@ public static Archive<?> deployment() {
 
    @Inject
    @Remote
-   private BasicCache<String, String> cache;
+   private RemoteCache<String, String> cache;
 
    @Inject
    private RemoteCache<String, String> remoteCache;

diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/NamedCacheTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/NamedCacheTest.java
@@ -1,6 +1,5 @@
 package org.infinispan.cdi.test.cache.remote;
 
-import org.infinispan.api.BasicCache;
 import org.infinispan.cdi.Remote;
 import org.infinispan.client.hotrod.RemoteCache;
 import org.infinispan.client.hotrod.RemoteCacheManager;
@@ -45,19 +44,11 @@ public static Archive<?> deployment() {
 
    @Inject
    @Remote("small")
-   private BasicCache<String, String> cache;
-
-   @Inject
-   @Remote("small")
-   private RemoteCache<String, String> remoteCache;
-
-   @Inject
-   @Small
-   private BasicCache<String, String> cacheWithQualifier;
+   private RemoteCache<String, String> cache;
 
    @Inject
    @Small
-   private RemoteCache<String, String> remoteCacheWithQualifier;
+   private RemoteCache<String, String> cacheWithQualifier;
 
    @BeforeTest
    public void beforeMethod() {
@@ -82,20 +73,12 @@ public void testNamedCache() {
       assertEquals(cache.get("pete"), "British");
       assertEquals(cache.get("manik"), "Sri Lankan");
 
-      assertEquals(remoteCache.getName(), "small");
-      assertEquals(remoteCache.get("pete"), "British");
-      assertEquals(remoteCache.get("manik"), "Sri Lankan");
-
       // here we check that the cache injection with the @Small qualifier works
       // like the injection with the @Remote qualifier
 
       assertEquals(cacheWithQualifier.getName(), "small");
       assertEquals(cacheWithQualifier.get("pete"), "British");
       assertEquals(cacheWithQualifier.get("manik"), "Sri Lankan");
-
-      assertEquals(remoteCacheWithQualifier.getName(), "small");
-      assertEquals(remoteCacheWithQualifier.get("pete"), "British");
-      assertEquals(remoteCacheWithQualifier.get("manik"), "Sri Lankan");
    }
 
    /**

diff --git a/...xtension/src/test/java/org/infinispan/cdi/test/cache/remote/SpecificCacheManagerTest.java b/...xtension/src/test/java/org/infinispan/cdi/test/cache/remote/SpecificCacheManagerTest.java
@@ -1,6 +1,5 @@
 package org.infinispan.cdi.test.cache.remote;
 
-import org.infinispan.api.BasicCache;
 import org.infinispan.client.hotrod.RemoteCache;
 import org.infinispan.client.hotrod.RemoteCacheManager;
 import org.infinispan.manager.EmbeddedCacheManager;
@@ -44,11 +43,7 @@ public static Archive<?> deployment() {
 
    @Inject
    @Small
-   private BasicCache<String, String> cache;
-
-   @Inject
-   @Small
-   private RemoteCache<String, String> remoteCache;
+   private RemoteCache<String, String> cache;
 
    @BeforeTest
    public void beforeMethod() {
@@ -72,10 +67,6 @@ public void testSpecificCacheManager() {
       assertEquals(cache.getName(), "small");
       assertEquals(cache.get("pete"), "British");
       assertEquals(cache.get("manik"), "Sri Lankan");
-
-      assertEquals(remoteCache.getName(), "small");
-      assertEquals(remoteCache.get("pete"), "British");
-      assertEquals(remoteCache.get("manik"), "Sri Lankan");
    }
 
    /**