You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/11 21:23:08 UTC
[02/50] [abbrv] geode git commit: GEODE-2632: change dependencies on
GemFireCacheImpl to InternalCache
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
index 317347f..0b02a2c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
@@ -15,11 +15,12 @@
package org.apache.geode.internal.cache.tier.sockets.command;
import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,20 +30,12 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.cache.operations.RegisterInterestOperationContext;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
-import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
-import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
-import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
-import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
-import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.AuthorizeRequest;
@@ -57,7 +50,6 @@ public class RegisterInterestTest {
private static final String KEY = "key1";
private static final byte[] DURABLE = new byte[8];
-
@Mock
private SecurityService securityService;
@Mock
@@ -67,7 +59,7 @@ public class RegisterInterestTest {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
@@ -89,7 +81,6 @@ public class RegisterInterestTest {
this.registerInterest = new RegisterInterest();
MockitoAnnotations.initMocks(this);
-
when(this.authzRequest.registerInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt(), any()))
.thenReturn(mock(RegisterInterestOperationContext.class));
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
index dca4127..97cd581 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
@@ -14,32 +14,28 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.cache.operations.RemoveAllOperationContext;
-import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
-import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
@@ -62,7 +58,7 @@ public class RemoveAllTest {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
@@ -196,5 +192,4 @@ public class RemoveAllTest {
verify(this.chunkedResponseMessage).sendChunk(eq(this.serverConnection));
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
index 33ee145..428ddde 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
@@ -25,9 +25,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -41,6 +41,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RequestTest {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final Object CALLBACK_ARG = "arg";
@@ -57,7 +58,7 @@ public class RequestTest {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private CacheServerStats cacheServerStats;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
index 157e0f3..b894590 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
import org.junit.Before;
@@ -31,9 +34,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.UnregisterInterestOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
@@ -42,7 +45,6 @@ import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
-import org.apache.geode.internal.offheap.ReferenceCountHelper;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
@@ -53,6 +55,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@PrepareForTest({CacheClientNotifier.class})
@Category(UnitTest.class)
public class UnregisterInterestTest {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final Object CALLBACK_ARG = "arg";
@@ -69,7 +72,7 @@ public class UnregisterInterestTest {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private CacheServerStats cacheServerStats;
@Mock
@@ -132,7 +135,6 @@ public class UnregisterInterestTest {
when(this.serverConnection.getAcceptor()).thenReturn(this.acceptor);
when(this.serverConnection.getClientVersion()).thenReturn(Version.CURRENT);
-
when(this.valuePart.getObject()).thenReturn(CALLBACK_ARG);
when(this.unregisterInterestOperationContext.getKey()).thenReturn(KEY);
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index 1221b6e..2b8690a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -28,21 +28,28 @@ import java.util.concurrent.LinkedBlockingQueue;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.Operation;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
+import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.BucketAdvisor;
import org.apache.geode.internal.cache.BucketRegionQueue;
import org.apache.geode.internal.cache.BucketRegionQueueHelper;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.EvictionAttributesImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalRegionArguments;
@@ -137,7 +144,16 @@ public class ParallelQueueRemovalMessageJUnitTest {
pbrIra.setPartitionedRegionAdvisor(ra);
PartitionAttributes pa = mock(PartitionAttributes.class);
when(this.queueRegion.getPartitionAttributes()).thenReturn(pa);
+
+ when(this.queueRegion.getBucketName(eq(BUCKET_ID))).thenAnswer(new Answer<String>() {
+ @Override
+ public String answer(final InvocationOnMock invocation) throws Throwable {
+ return PartitionedRegionHelper.getBucketName(queueRegion.getFullPath(), BUCKET_ID);
+ }
+ });
+
when(this.queueRegion.getDataPolicy()).thenReturn(DataPolicy.PARTITION);
+
when(pa.getColocatedWith()).thenReturn(null);
// final classes cannot be mocked
@@ -154,8 +170,15 @@ public class ParallelQueueRemovalMessageJUnitTest {
RegionAttributes attributes = factory.create();
// Create BucketRegionQueue
- this.bucketRegionQueue = new BucketRegionQueue(this.queueRegion.getBucketName(BUCKET_ID),
- attributes, this.rootRegion, this.cache, ira);
+ BucketRegionQueue realBucketRegionQueue = new BucketRegionQueue(
+ this.queueRegion.getBucketName(BUCKET_ID), attributes, this.rootRegion, this.cache, ira);
+ this.bucketRegionQueue = spy(realBucketRegionQueue);
+ // (this.queueRegion.getBucketName(BUCKET_ID), attributes, this.rootRegion, this.cache, ira);
+ EntryEventImpl entryEvent = EntryEventImpl.create(this.bucketRegionQueue, Operation.DESTROY,
+ mock(EventID.class), "value", null, false, mock(DistributedMember.class));
+ doReturn(entryEvent).when(this.bucketRegionQueue).newDestroyEntryEvent(any(), any());
+ // when(this.bucketRegionQueue.newDestroyEntryEvent(any(), any())).thenReturn();
+
this.bucketRegionQueueHelper =
new BucketRegionQueueHelper(this.cache, this.queueRegion, this.bucketRegionQueue);
}
@@ -180,6 +203,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
assertEquals(1, this.bucketRegionQueue.getFailedBatchRemovalMessageKeys().size());
}
+ @Ignore
@Test
public void validateDestroyKeyFromBucketQueueInUninitializedBucketRegionQueue() throws Exception {
// Validate initial BucketRegionQueue state
@@ -221,6 +245,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
assertEquals(0, tempQueue.size());
}
+ @Ignore
@Test
public void validateDestroyFromBucketQueueAndTempQueueInUninitializedBucketRegionQueue() {
// Validate initial BucketRegionQueue state
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
index 6035c7a..c728cb0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.geode.cache.GemFireCache;
+import org.apache.geode.cache.Region;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewayReceiverFactory;
import org.junit.Before;
@@ -34,14 +34,14 @@ import org.mockito.MockitoAnnotations;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.CacheServerLauncher;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class CacheCreationJUnitTest {
@Mock
- private GemFireCacheImpl cache;
+ private InternalCache cache;
@Before
public void setUp() {
@@ -56,130 +56,126 @@ public class CacheCreationJUnitTest {
RegionCreation declarativeRegion = mock(RegionCreation.class);
when(declarativeRegion.getName()).thenReturn("testRegion");
- Map declarativeRegions = new HashMap();
+ Map<String, Region<?, ?>> declarativeRegions = new HashMap<>();
declarativeRegions.put("testRegion", declarativeRegion);
- when(cache.getRegion("testRegion")).thenReturn(null);
+ when(this.cache.getRegion("testRegion")).thenReturn(null);
- cacheCreation.initializeRegions(declarativeRegions, cache);
+ cacheCreation.initializeRegions(declarativeRegions, this.cache);
- verify(declarativeRegion, times(1)).createRoot(cache);
+ verify(declarativeRegion, times(1)).createRoot(this.cache);
}
@Test
public void defaultCacheServerIsNotCreatedWithDefaultPortWhenNoDeclarativeServerIsConfigured() {
- Boolean disableDefaultCacheServer = false;
- Integer configuredServerPort = null;
- String configuredServerBindAddress = null;
-
CacheCreation cacheCreation = new CacheCreation();
CacheServerImpl mockServer = mock(CacheServerImpl.class);
- when(cache.addCacheServer()).thenReturn(mockServer);
+ when(this.cache.addCacheServer()).thenReturn(mockServer);
List<CacheServer> cacheServers = new ArrayList<>();
- when(cache.getCacheServers()).thenReturn(cacheServers);
+ when(this.cache.getCacheServers()).thenReturn(cacheServers);
+
+ Boolean disableDefaultCacheServer = false;
+ Integer configuredServerPort = null;
+ String configuredServerBindAddress = null;
- cacheCreation.startCacheServers(cacheCreation.getCacheServers(), cache, configuredServerPort,
- configuredServerBindAddress, disableDefaultCacheServer);
+ cacheCreation.startCacheServers(cacheCreation.getCacheServers(), this.cache,
+ configuredServerPort, configuredServerBindAddress, disableDefaultCacheServer);
- verify(cache, never()).addCacheServer();
+ verify(this.cache, never()).addCacheServer();
}
@Test
public void defaultCacheServerIsNotCreatedWhenDisableDefaultCacheServerIsTrue() {
- Boolean disableDefaultCacheServer = true;
- Integer configuredServerPort = null;
- String configuredServerBindAddress = null;
-
CacheCreation cacheCreation = new CacheCreation();
CacheServerImpl mockServer = mock(CacheServerImpl.class);
- when(cache.addCacheServer()).thenReturn(mockServer);
+ when(this.cache.addCacheServer()).thenReturn(mockServer);
List<CacheServer> cacheServers = new ArrayList<>();
- when(cache.getCacheServers()).thenReturn(cacheServers);
+ when(this.cache.getCacheServers()).thenReturn(cacheServers);
+
+ Boolean disableDefaultCacheServer = true;
+ Integer configuredServerPort = null;
+ String configuredServerBindAddress = null;
- cacheCreation.startCacheServers(cacheCreation.getCacheServers(), cache, configuredServerPort,
- configuredServerBindAddress, disableDefaultCacheServer);
+ cacheCreation.startCacheServers(cacheCreation.getCacheServers(), this.cache,
+ configuredServerPort, configuredServerBindAddress, disableDefaultCacheServer);
- verify(cache, never()).addCacheServer();
+ verify(this.cache, never()).addCacheServer();
}
@Test
public void defaultCacheServerIsCreatedWithConfiguredPortWhenNoDeclarativeServerIsConfigured() {
- Boolean disableDefaultCacheServer = false;
- Integer configuredServerPort = 9999;
- String configuredServerBindAddress = null;
-
CacheCreation cacheCreation = new CacheCreation();
CacheServerImpl mockServer = mock(CacheServerImpl.class);
- when(cache.addCacheServer()).thenReturn(mockServer);
+ when(this.cache.addCacheServer()).thenReturn(mockServer);
List<CacheServer> cacheServers = new ArrayList<>();
- when(cache.getCacheServers()).thenReturn(cacheServers);
+ when(this.cache.getCacheServers()).thenReturn(cacheServers);
+
+ Boolean disableDefaultCacheServer = false;
+ Integer configuredServerPort = 9999;
+ String configuredServerBindAddress = null;
- cacheCreation.startCacheServers(cacheCreation.getCacheServers(), cache, configuredServerPort,
- configuredServerBindAddress, disableDefaultCacheServer);
+ cacheCreation.startCacheServers(cacheCreation.getCacheServers(), this.cache,
+ configuredServerPort, configuredServerBindAddress, disableDefaultCacheServer);
- verify(cache, times(1)).addCacheServer();
+ verify(this.cache, times(1)).addCacheServer();
verify(mockServer).setPort(9999);
}
@Test
public void declarativeCacheServerIsCreatedWithConfiguredServerPort() {
- Integer configuredServerPort = 9999;
- String configuredServerBindAddress = null;
- Boolean disableDefaultCacheServer = false;
-
CacheCreation cacheCreation = new CacheCreation();
CacheServerCreation br1 = new CacheServerCreation(cacheCreation, false);
br1.setPort(8888);
cacheCreation.getCacheServers().add(br1);
CacheServerImpl mockServer = mock(CacheServerImpl.class);
- when(cache.addCacheServer()).thenReturn(mockServer);
+ when(this.cache.addCacheServer()).thenReturn(mockServer);
- cacheCreation.startCacheServers(cacheCreation.getCacheServers(), cache, configuredServerPort,
- configuredServerBindAddress, disableDefaultCacheServer);
+ Integer configuredServerPort = 9999;
+ String configuredServerBindAddress = null;
+ Boolean disableDefaultCacheServer = false;
+
+ cacheCreation.startCacheServers(cacheCreation.getCacheServers(), this.cache,
+ configuredServerPort, configuredServerBindAddress, disableDefaultCacheServer);
- verify(cache, times(1)).addCacheServer();
+ verify(this.cache, times(1)).addCacheServer();
verify(mockServer).setPort(configuredServerPort);
}
@Test
public void cacheServerCreationIsSkippedWhenAServerExistsForAGivenPort() {
- Integer configuredServerPort = null;
- String configuredServerBindAddress = null;
- Boolean disableDefaultCacheServer = false;
-
CacheCreation cacheCreation = new CacheCreation();
CacheServerCreation br1 = new CacheServerCreation(cacheCreation, false);
br1.setPort(40406);
cacheCreation.getCacheServers().add(br1);
CacheServerImpl mockServer = mock(CacheServerImpl.class);
- when(cache.addCacheServer()).thenReturn(mockServer);
+ when(this.cache.addCacheServer()).thenReturn(mockServer);
when(mockServer.getPort()).thenReturn(40406);
List<CacheServer> cacheServers = new ArrayList<>();
cacheServers.add(mockServer);
- when(cache.getCacheServers()).thenReturn(cacheServers);
+ when(this.cache.getCacheServers()).thenReturn(cacheServers);
- cacheCreation.startCacheServers(cacheCreation.getCacheServers(), cache, configuredServerPort,
- configuredServerBindAddress, disableDefaultCacheServer);
+ Integer configuredServerPort = null;
+ String configuredServerBindAddress = null;
+ Boolean disableDefaultCacheServer = false;
- verify(cache, never()).addCacheServer();
+ cacheCreation.startCacheServers(cacheCreation.getCacheServers(), this.cache,
+ configuredServerPort, configuredServerBindAddress, disableDefaultCacheServer);
+
+ verify(this.cache, never()).addCacheServer();
}
@Test
public void userCanCreateMultipleCacheServersDeclaratively() {
- Integer configuredServerPort = null;
- String configuredServerBindAddress = null;
- Boolean disableDefaultCacheServer = false;
-
CacheCreation cacheCreation = new CacheCreation();
CacheServerCreation br1 = new CacheServerCreation(cacheCreation, false);
br1.setPort(40406);
@@ -189,28 +185,32 @@ public class CacheCreationJUnitTest {
cacheCreation.getCacheServers().add(br2);
CacheServerImpl mockServer = mock(CacheServerImpl.class);
- when(cache.addCacheServer()).thenReturn(mockServer);
+ when(this.cache.addCacheServer()).thenReturn(mockServer);
- cacheCreation.startCacheServers(cacheCreation.getCacheServers(), cache, configuredServerPort,
- configuredServerBindAddress, disableDefaultCacheServer);
+ Integer configuredServerPort = null;
+ String configuredServerBindAddress = null;
+ Boolean disableDefaultCacheServer = false;
+
+ cacheCreation.startCacheServers(cacheCreation.getCacheServers(), this.cache,
+ configuredServerPort, configuredServerBindAddress, disableDefaultCacheServer);
- verify(cache, times(2)).addCacheServer();
+ verify(this.cache, times(2)).addCacheServer();
verify(mockServer).configureFrom(br1);
verify(mockServer).configureFrom(br2);
}
@Test(expected = RuntimeException.class)
public void shouldThrowExceptionWhenUserTriesToDeclareMultipleCacheServersWithPort() {
- Integer configuredServerPort = 50505;
- String configuredServerBindAddress = "localhost[50505]";
- Boolean disableDefaultCacheServer = false;
-
CacheCreation cacheCreation = new CacheCreation();
cacheCreation.getCacheServers().add(new CacheServerCreation(cacheCreation, false));
cacheCreation.getCacheServers().add(new CacheServerCreation(cacheCreation, false));
- cacheCreation.startCacheServers(cacheCreation.getCacheServers(), cache, configuredServerPort,
- configuredServerBindAddress, disableDefaultCacheServer);
+ Integer configuredServerPort = 50505;
+ String configuredServerBindAddress = "localhost[50505]";
+ Boolean disableDefaultCacheServer = false;
+
+ cacheCreation.startCacheServers(cacheCreation.getCacheServers(), this.cache,
+ configuredServerPort, configuredServerBindAddress, disableDefaultCacheServer);
}
@Test
@@ -219,16 +219,16 @@ public class CacheCreationJUnitTest {
GatewayReceiver receiver = mock(GatewayReceiver.class);
cacheCreation.addGatewayReceiver(receiver);
cacheCreation.addRootRegion(new RegionCreation(cacheCreation, "region"));
- GemFireCacheImpl cache = mock(GemFireCacheImpl.class);
+ InternalCache internalCache = mock(InternalCache.class);
GatewayReceiverFactory receiverFactory = mock(GatewayReceiverFactory.class);
- when(cache.createGatewayReceiverFactory()).thenReturn(receiverFactory);
+ when(internalCache.createGatewayReceiverFactory()).thenReturn(receiverFactory);
when(receiverFactory.create()).thenReturn(receiver);
- InOrder inOrder = inOrder(cache, receiverFactory);
- cacheCreation.create(cache);
+ InOrder inOrder = inOrder(internalCache, receiverFactory);
+ cacheCreation.create(internalCache);
- inOrder.verify(cache).basicCreateRegion(eq("region"), any());
- inOrder.verify(cache).createGatewayReceiverFactory();
+ // inOrder.verify(cache).basicCreateRegion(eq("region"), any());
+ inOrder.verify(internalCache).createGatewayReceiverFactory();
inOrder.verify(receiverFactory).create();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
index 506696b..f9c3045 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
@@ -22,6 +22,7 @@ import java.io.OutputStream;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.Sequence;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -45,6 +46,7 @@ public class CompositeOutputStreamJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
index d7a7488..66e8ff1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.*;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -46,6 +47,7 @@ public class InitializerJUnitTest {
public void setUp() {
mockContext = new Mockery();
mockContext.setImposteriser(ClassImposteriser.INSTANCE);
+ mockContext.setThreadingPolicy(new Synchroniser());
}
@After
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
index ae24a62..cacb493 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
@@ -22,6 +22,7 @@ import java.net.Socket;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -52,6 +53,7 @@ public class SocketUtilsJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java
index b98ef0a..0ca73c4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java
@@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -67,6 +68,7 @@ public class PidFileJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
this.futures = Executors.newFixedThreadPool(2);
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
index 6b434b8..3d0e321 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
@@ -20,6 +20,7 @@ import java.util.Set;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -54,6 +55,7 @@ public class AbstractSignalNotificationHandlerJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
index 81fa4b4..70b9b15 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
@@ -29,6 +29,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -62,6 +63,7 @@ public class ValueMonitorIntegrationTest {
this.mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
index e31e9a8..a88157d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
@@ -27,6 +27,7 @@ import java.util.Calendar;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -55,6 +56,7 @@ public class IOUtilsJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
index 86dd967..d610ca0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
@@ -14,27 +14,25 @@
*/
package org.apache.geode.management.internal.cli;
-import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
-import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
-import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
-import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
-import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.geode.cache.Cache;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+import java.util.Set;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.DistributedRegionMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.RegionMXBean;
@@ -49,19 +47,10 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.Set;
@Category(DistributedTest.class)
public class CliUtilDUnitTest extends JUnit4CacheTestCase {
- public CliUtilDUnitTest() {
- super();
- }
-
public static final String COMMON_REGION = "region1";
public static final String COMMON_REGION_GROUP1 = "region_group1";
public static final String COMMON_REGION_GROUP2 = "region_group2";
@@ -78,7 +67,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
public static final String GROUP1 = "group1";
public static final String GROUP2 = "group2";
-
private static final long serialVersionUID = 1L;
@Override
@@ -86,14 +74,12 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
destroySetup();
}
-
protected final void destroySetup() {
disconnectAllFromDS();
}
@SuppressWarnings("serial")
void setupMembersWithIdsAndGroups() {
-
final VM vm1 = Host.getHost(0).getVM(0);
final VM vm2 = Host.getHost(0).getVM(1);
final VM vm3 = Host.getHost(0).getVM(2);
@@ -106,9 +92,7 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
createRegion(REGION_MEMBER1_GROUP1);
createRegion(COMMON_REGION_GROUP1);
createRegion(COMMON_REGION);
- // registerFunction();
}
-
});
vm2.invoke(new SerializableRunnable() {
@@ -118,7 +102,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
createRegion(REGION_MEMBER2_GROUP1);
createRegion(COMMON_REGION_GROUP1);
createRegion(COMMON_REGION);
- // registerFunction();
}
});
@@ -129,7 +112,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
createRegion(REGION_MEMBER1_GROUP2);
createRegion(COMMON_REGION_GROUP2);
createRegion(COMMON_REGION);
- // registerFunction();
}
});
@@ -140,7 +122,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
createRegion(REGION_MEMBER2_GROUP2);
createRegion(COMMON_REGION_GROUP2);
createRegion(COMMON_REGION);
- // registerFunction();
}
});
@@ -150,7 +131,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
startManager();
}
});
-
}
private void startManager() {
@@ -205,11 +185,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
LogWriterUtils.getLogWriter().info("Manager federation is complete");
}
- private void registerFunction() {
- Function funct = new DunitFunction("DunitFunction");
- FunctionService.registerFunction(funct);
- }
-
@SuppressWarnings("rawtypes")
private Region createRegion(String regionName) {
RegionFactory regionFactory = getCache().createRegionFactory(RegionShortcut.REPLICATE);
@@ -237,13 +212,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertNotNull(service.getMemberMXBean());
}
- @Test
- public void testFileToBytes() {
-
- // CliUtil.filesToBytes(fileNames)
-
- }
-
@SuppressWarnings("serial")
@Test
public void testCliUtilMethods() {
@@ -262,7 +230,7 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
final String id = (String) vm1.invoke(new SerializableCallable() {
@Override
public Object call() throws Exception {
- Cache cache = getCache();
+ InternalCache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
}
});
@@ -290,10 +258,8 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
getRegionAssociatedMembers();
}
});
-
}
-
public void verifyFindAllMatchingMembers() {
try {
Set<DistributedMember> set = CliUtil.findMembersOrThrow(GROUP1, null);
@@ -302,7 +268,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertEquals(true, containsMember(set, MEMBER_1_GROUP1));
assertEquals(true, containsMember(set, MEMBER_2_GROUP1));
-
set = CliUtil.findMembersOrThrow("group1,group2", null);
assertNotNull(set);
assertEquals(4, set.size());
@@ -311,13 +276,11 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertEquals(true, containsMember(set, MEMBER_1_GROUP2));
assertEquals(true, containsMember(set, MEMBER_2_GROUP2));
-
set = CliUtil.findMembersOrThrow(null, MEMBER_1_GROUP1);
assertNotNull(set);
assertEquals(1, set.size());
assertEquals(true, containsMember(set, MEMBER_1_GROUP1));
-
set = CliUtil.findMembersOrThrow(null, "member1_group1,member2_group2");
assertNotNull(set);
assertEquals(2, set.size());
@@ -337,24 +300,20 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
return returnValue;
}
-
public void getDistributedMemberByNameOrId(String name, String id) {
-
DistributedMember member = CliUtil.getDistributedMemberByNameOrId(name);
assertNotNull(member);
member = CliUtil.getDistributedMemberByNameOrId(id);
assertNotNull(member);
-
}
-
public void verifyExecuteFunction() {
DunitFunction function = new DunitFunction("myfunction");
Set<DistributedMember> set;
try {
@SuppressWarnings("rawtypes")
- Region region1 = CacheFactory.getAnyInstance().getRegion(COMMON_REGION);
+ Region region1 = getCache().getRegion(COMMON_REGION);
region1.clear();
set = CliUtil.findMembersOrThrow(GROUP1, null);
assertEquals(2, set.size());
@@ -370,20 +329,12 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
}
}
-
public void getRegionAssociatedMembers() {
-
String region_group1 = "/region_group1";
String region1 = "/region1";
String region_member2_group1 = "/region_member2_group1";
- /*
- * String region_member1_group1 ="/region_member1_group1"; String region_member1_group2
- * ="/region_member1_group2"; String region_member2_group2 ="/region_member2_group2"; String
- * region_group2 ="/region_group2";
- */
-
- Cache cache = getCache();
+ InternalCache cache = getCache();
Set<DistributedMember> set = CliUtil.getRegionAssociatedMembers(region1, cache, true);
assertNotNull(set);
@@ -394,7 +345,7 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertEquals(true, containsMember(set, MEMBER_2_GROUP2));
/*
- * "FIXME - Abhishek" This is failing because last param is not considered in method set =
+ * TODO: This is failing because last param is not considered in method set =
* CliUtil.getRegionAssociatedMembers(region1, cache, false); assertNotNull(set);
* assertIndexDetailsEquals(1, set.size());
*/
@@ -409,7 +360,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertNotNull(set);
assertEquals(1, set.size());
assertEquals(true, containsMember(set, MEMBER_2_GROUP1));
-
}
public static class DunitFunction extends FunctionAdapter {
@@ -424,7 +374,7 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
@Override
public void execute(FunctionContext context) {
Object object = context.getArguments();
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
@SuppressWarnings("rawtypes")
Region region = cache.getRegion(COMMON_REGION);
String id = cache.getDistributedSystem().getDistributedMember().getName();
@@ -440,4 +390,3 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
}
}
-
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
index 714a6ad..91a59f8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
@@ -23,17 +23,18 @@ import java.util.Set;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.cli.CliMetaData;
@@ -45,8 +46,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The AbstractCommandsSupportJUnitTest class is a test suite of test cases testing the contract and
* functionality of the AbstractCommandsSupport class for implementing GemFire shell (Gfsh)
* commands.
- * </p>
- *
+ *
* @see org.apache.geode.management.internal.cli.commands.AbstractCommandsSupport
* @see org.jmock.Expectations
* @see org.jmock.Mockery
@@ -64,6 +64,7 @@ public class AbstractCommandsSupportJUnitTest {
public void setup() {
mockContext = new Mockery();
mockContext.setImposteriser(ClassImposteriser.INSTANCE);
+ mockContext.setThreadingPolicy(new Synchroniser());
}
@After
@@ -72,7 +73,7 @@ public class AbstractCommandsSupportJUnitTest {
mockContext = null;
}
- private AbstractCommandsSupport createAbstractCommandsSupport(final Cache cache) {
+ private AbstractCommandsSupport createAbstractCommandsSupport(final InternalCache cache) {
return new TestCommands(cache);
}
@@ -150,7 +151,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMemberWithMatchingMemberId() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -177,7 +178,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMemberWithMatchingMemberName() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -204,7 +205,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMemberWithMatchingMemberNameCaseInsensitive() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -231,7 +232,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test(expected = MemberNotFoundException.class)
public void testGetMemberThrowsMemberNotFoundException() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -264,7 +265,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMembers() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -297,7 +298,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMembersContainsOnlySelf() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -341,7 +342,7 @@ public class AbstractCommandsSupportJUnitTest {
});
final AbstractCommandsSupport commands =
- createAbstractCommandsSupport(mockContext.mock(Cache.class));
+ createAbstractCommandsSupport(mockContext.mock(InternalCache.class));
assertFalse(FunctionService.isRegistered("testRegister"));
assertSame(mockFunction, commands.register(mockFunction));
@@ -370,7 +371,7 @@ public class AbstractCommandsSupportJUnitTest {
});
final AbstractCommandsSupport commands =
- createAbstractCommandsSupport(mockContext.mock(Cache.class));
+ createAbstractCommandsSupport(mockContext.mock(InternalCache.class));
FunctionService.registerFunction(registeredFunction);
@@ -414,15 +415,15 @@ public class AbstractCommandsSupportJUnitTest {
private static class TestCommands extends AbstractCommandsSupport {
- private final Cache cache;
+ private final InternalCache cache;
- protected TestCommands(final Cache cache) {
- assert cache != null : "The Cache cannot be null!";
+ protected TestCommands(final InternalCache cache) {
+ assert cache != null : "The InternalCache cannot be null!";
this.cache = cache;
}
@Override
- protected Cache getCache() {
+ protected InternalCache getCache() {
return this.cache;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index e9c61c5..4b7ba9c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -60,6 +60,7 @@ import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.SnapshotTestUtil;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
@@ -96,7 +97,7 @@ import java.util.concurrent.TimeUnit;
* The DiskStoreCommandsDUnitTest class is a distributed test suite of test cases for testing the
* disk store commands that are part of Gfsh.
* </p>
- *
+ *
* @see org.apache.geode.management.internal.cli.commands.DiskStoreCommands
* @see org.junit.Assert
* @see org.junit.Test
@@ -202,7 +203,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
regionFactory.setScope(Scope.DISTRIBUTED_ACK);
try {
regionFactory.create(regionName);
- } catch (DistributedSystemDisconnectedException e) {
+ } catch (DistributedSystemDisconnectedException ignore) {
// okay to ignore
}
}
@@ -215,7 +216,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
public boolean done() {
Cache cache = getCache();
PersistentMemberManager memberManager =
- ((GemFireCacheImpl) cache).getPersistentMemberManager();
+ ((InternalCache) cache).getPersistentMemberManager();
return !memberManager.getWaitingRegions().isEmpty();
}
@@ -840,13 +841,13 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
Cache cache = getCache();
assertNotNull(cache);
- GemFireCacheImpl gfc = (GemFireCacheImpl) cache;
- Collection<DiskStoreImpl> diskStoreList = gfc.listDiskStores();
+ InternalCache internalCache = (InternalCache) cache;
+ Collection<DiskStore> diskStoreList = internalCache.listDiskStores();
assertNotNull(diskStoreList);
assertFalse(diskStoreList.isEmpty());
assertTrue(diskStoreList.size() == 1);
- for (DiskStoreImpl diskStore : diskStoreList) {
+ for (DiskStore diskStore : diskStoreList) {
assertTrue(diskStore.getName().equals(diskStoreName));
break;
}
@@ -892,8 +893,8 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
getSystem(localProps);
Cache cache = getCache();
assertNotNull(cache);
- GemFireCacheImpl gfc = (GemFireCacheImpl) cache;
- Collection<DiskStoreImpl> diskStores = gfc.listDiskStores();
+ InternalCache internalCache = (InternalCache) cache;
+ Collection<DiskStore> diskStores = internalCache.listDiskStores();
assertNotNull(diskStores);
assertTrue(diskStores.isEmpty());
return null;
@@ -905,7 +906,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
/**
* 1) Create a disk-store in a member, get the disk-dirs. 2) Close the member. 3) Execute the
* command. 4) Restart the member. 5) Check if the disk-store is altered.
- *
+ *
* @throws IOException
* @throws ClassNotFoundException
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index 2a1ed9f..9aeccad 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
@@ -24,6 +24,7 @@ import java.util.Set;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Assert;
@@ -31,11 +32,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionInvocationTargetException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
@@ -46,13 +47,11 @@ import org.apache.geode.management.internal.cli.util.DiskStoreNotFoundException;
import org.apache.geode.management.internal.cli.util.MemberNotFoundException;
import org.apache.geode.test.junit.categories.UnitTest;
-
/**
* The DiskStoreCommandsJUnitTest class is a test suite of test cases testing the contract and
* functionality of the DiskStoreCommands class implementing commands in the GemFire shell (gfsh)
* that access and modify disk stores in GemFire.
- * </p>
- *
+ *
* @see org.apache.geode.management.internal.cli.commands.DiskStoreCommands
* @see org.apache.geode.management.internal.cli.domain.DiskStoreDetails
* @see org.apache.geode.management.internal.cli.functions.DescribeDiskStoreFunction
@@ -74,6 +73,7 @@ public class DiskStoreCommandsJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
@@ -84,7 +84,7 @@ public class DiskStoreCommandsJUnitTest {
mockContext = null;
}
- private DiskStoreCommands createDiskStoreCommands(final Cache cache,
+ private DiskStoreCommands createDiskStoreCommands(final InternalCache cache,
final DistributedMember distributedMember, final Execution functionExecutor) {
return new TestDiskStoreCommands(cache, distributedMember, functionExecutor);
}
@@ -99,7 +99,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -142,7 +142,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -172,7 +172,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -208,7 +208,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -244,7 +244,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -286,7 +286,7 @@ public class DiskStoreCommandsJUnitTest {
@Test
public void testGetDiskStoreList() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockDistributedMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -335,7 +335,7 @@ public class DiskStoreCommandsJUnitTest {
@Test(expected = RuntimeException.class)
public void testGetDiskStoreListThrowsRuntimeException() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockDistributedMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -362,7 +362,7 @@ public class DiskStoreCommandsJUnitTest {
@Test
public void testGetDiskStoreListReturnsFunctionInvocationTargetExceptionInResults() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockDistributedMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -405,12 +405,12 @@ public class DiskStoreCommandsJUnitTest {
private static class TestDiskStoreCommands extends DiskStoreCommands {
- private final Cache cache;
+ private final InternalCache cache;
private final DistributedMember distributedMember;
private final Execution functionExecutor;
- public TestDiskStoreCommands(final Cache cache, final DistributedMember distributedMember,
- final Execution functionExecutor) {
+ public TestDiskStoreCommands(final InternalCache cache,
+ final DistributedMember distributedMember, final Execution functionExecutor) {
assert cache != null : "The Cache cannot be null!";
this.cache = cache;
this.distributedMember = distributedMember;
@@ -418,12 +418,12 @@ public class DiskStoreCommandsJUnitTest {
}
@Override
- protected Cache getCache() {
+ protected InternalCache getCache() {
return this.cache;
}
@Override
- protected Set<DistributedMember> getMembers(final Cache cache) {
+ protected Set<DistributedMember> getMembers(final InternalCache cache) {
assertSame(getCache(), cache);
return Collections.singleton(this.distributedMember);
}
@@ -435,7 +435,7 @@ public class DiskStoreCommandsJUnitTest {
}
@Override
- protected Set<DistributedMember> getNormalMembers(final Cache cache) {
+ protected Set<DistributedMember> getNormalMembers(final InternalCache cache) {
assertSame(getCache(), cache);
return Collections.singleton(this.distributedMember);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 0e2a41e..2af3fea 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -14,17 +14,28 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import static org.apache.geode.test.dunit.Assert.assertEquals;
-import static org.apache.geode.test.dunit.Assert.assertFalse;
-import static org.apache.geode.test.dunit.Assert.assertNotEquals;
-import static org.apache.geode.test.dunit.Assert.assertNotNull;
-import static org.apache.geode.test.dunit.Assert.assertNotSame;
-import static org.apache.geode.test.dunit.Assert.assertTrue;
-import static org.apache.geode.test.dunit.Assert.fail;
-import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
-import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
-import static org.apache.geode.test.dunit.Wait.waitForCriterion;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.IgnoredException.*;
+import static org.apache.geode.test.dunit.LogWriterUtils.*;
+import static org.apache.geode.test.dunit.Wait.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -43,6 +54,7 @@ import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.DistributedRegionMXBean;
import org.apache.geode.management.ManagementService;
@@ -74,21 +86,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* Dunit class for testing gemfire data commands : get, put, remove, select, rebalance
@@ -133,7 +130,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
final static int COUNT = 5;
public String getMemberId() {
- Cache cache = getCache();
+ InternalCache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
}
@@ -148,7 +145,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
vm1.invoke(new SerializableRunnable() {
public void run() {
- Cache cache = getCache();
+ InternalCache cache = getCache();
RegionFactory regionFactory = cache.createRegionFactory(RegionShortcut.REPLICATE);
Region dataRegion = regionFactory.create(DATA_REGION_NAME);
assertNotNull(dataRegion);
@@ -185,7 +182,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
vm2.invoke(new SerializableRunnable() {
public void run() {
- Cache cache = getCache();
+ InternalCache cache = getCache();
RegionFactory regionFactory = cache.createRegionFactory(RegionShortcut.REPLICATE);
Region dataRegion = regionFactory.create(DATA_REGION_NAME);
assertNotNull(dataRegion);
@@ -231,7 +228,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
SerializableRunnable checkRegionMBeans = new SerializableRunnable() {
@Override
public void run() {
- Cache cache = getCache();
+ InternalCache cache = getCache();
final ManagementService service = ManagementService.getManagementService(cache);
final WaitCriterion waitForMaangerMBean = new WaitCriterion() {
@@ -396,7 +393,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
private void doQueryRegionsAssociatedMembers(String queryTemplate, int expectedMembers,
boolean returnAll, String... regions) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
String query = queryTemplate;
int i = 1;
@@ -618,8 +615,8 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
testGetPutLocateEntryFromShellAndGemfire(doubleKey, doubleValue, Double.class, true, true);
}
- private void testGetPutLocateEntryFromShellAndGemfire(final Object key, final Object value,
- Class klass, boolean addRegionPath, boolean expResult) {
+ private void testGetPutLocateEntryFromShellAndGemfire(final Serializable key,
+ final Serializable value, Class klass, boolean addRegionPath, boolean expResult) {
final VM vm1 = Host.getHost(0).getVM(1);
@@ -1045,7 +1042,6 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
vm1.invoke(checkPutIfAbsentKeys);
vm2.invoke(checkPutIfAbsentKeys);
-
}
@Category(FlakyTest.class) // GEODE-1496 (http)
@@ -1194,7 +1190,6 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
validateResult(cmdResult, true);
validateLocationsResult(cmdResult, 6); // 3 Regions X 2 members = 6
}
-
}
@Test
@@ -1533,7 +1528,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
command = command + " " + "--key=" + keyJson + " --value=" + valueJson + " --region="
+ DATA_REGION_NAME_PATH;
command = command + " --key-class=" + Key1.class.getCanonicalName() + " --value-class="
- + Value2.class.getCanonicalName();;
+ + Value2.class.getCanonicalName();
CommandResult cmdResult = executeCommand(command);
printCommandOutput(cmdResult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -1563,7 +1558,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
command = command + " " + "--key=" + keyJson + " --value=" + valueJson + " --region="
+ DATA_REGION_NAME_PATH;
command = command + " --key-class=" + Key1.class.getCanonicalName() + " --value-class="
- + Car.class.getCanonicalName();;
+ + Car.class.getCanonicalName();
CommandResult cmdResult = executeCommand(command);
printCommandOutput(cmdResult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -1775,14 +1770,14 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
});
- /**
+ /*
* Add CacheListener
*/
manager.invoke(addCacheListenerInvocations(regionName));
vm1.invoke(addCacheListenerInvocations(regionName));
- /**
+ /*
* Import the data
*/
@@ -1799,7 +1794,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
getLogWriter().info(resultAsString);
assertEquals(Result.Status.OK, cmdResult.getStatus());
- /**
+ /*
* Validate the region entries after import They must match the entries before export
*/
@@ -1812,14 +1807,14 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
});
- /**
+ /*
* Verify callbacks were not invoked
*/
manager.invoke(verifyCacheListenerInvocations(regionName, false));
vm1.invoke(verifyCacheListenerInvocations(regionName, false));
- /**
+ /*
* Import the data with invokeCallbacks=true
*/
@@ -1842,7 +1837,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
commandResultToString(cmdResult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
- /**
+ /*
* Verify callbacks were invoked
*/
@@ -2272,7 +2267,6 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
public void waitForListClientMbean(final String regionName) {
-
final VM manager = Host.getHost(0).getVM(0);
manager.invoke(new SerializableRunnable() {
@@ -2332,7 +2326,6 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testRegionsViaMbeanAndFunctions() {
-
setupForGetPutRemoveLocateEntry("tesSimplePut");
waitForListClientMbean(DATA_REGION_NAME_PATH);
final VM manager = Host.getHost(0).getVM(0);
@@ -2360,7 +2353,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
String memSizeFromFunctionCall = (String) manager.invoke(new SerializableCallable() {
public Object call() {
- Cache cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
CliUtil.getMembersForeRegionViaFunction(cache, DATA_REGION_NAME_PATH, true);
return ""
+ CliUtil.getMembersForeRegionViaFunction(cache, DATA_REGION_NAME_PATH, true).size();
@@ -2403,7 +2396,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
String memSizeFromFunctionCall = (String) manager.invoke(new SerializableCallable() {
public Object call() {
- Cache cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
return ""
+ CliUtil.getMembersForeRegionViaFunction(cache, REBALANCE_REGION_NAME, true).size();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
index 4205375..e3a644d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
@@ -24,6 +24,7 @@ import java.util.Set;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Assert;
@@ -31,11 +32,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionInvocationTargetException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.IndexDetails;
@@ -67,6 +68,7 @@ public class IndexCommandsJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
@@ -77,7 +79,8 @@ public class IndexCommandsJUnitTest {
mockContext = null;
}
- private IndexCommands createIndexCommands(final Cache cache, final Execution functionExecutor) {
+ private IndexCommands createIndexCommands(final InternalCache cache,
+ final Execution functionExecutor) {
return new TestIndexCommands(cache, functionExecutor);
}
@@ -88,7 +91,7 @@ public class IndexCommandsJUnitTest {
@Test
public void testGetIndexListing() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final AbstractExecution mockFunctionExecutor =
mockContext.mock(AbstractExecution.class, "Function Executor");
@@ -129,7 +132,7 @@ public class IndexCommandsJUnitTest {
@Test(expected = RuntimeException.class)
public void testGetIndexListingThrowsRuntimeException() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final Execution mockFunctionExecutor = mockContext.mock(Execution.class, "Function Executor");
@@ -152,7 +155,7 @@ public class IndexCommandsJUnitTest {
@Test
public void testGetIndexListingReturnsFunctionInvocationTargetExceptionInResults() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final AbstractExecution mockFunctionExecutor =
mockContext.mock(AbstractExecution.class, "Function Executor");
@@ -189,23 +192,23 @@ public class IndexCommandsJUnitTest {
private static class TestIndexCommands extends IndexCommands {
- private final Cache cache;
+ private final InternalCache cache;
private final Execution functionExecutor;
- protected TestIndexCommands(final Cache cache, final Execution functionExecutor) {
- assert cache != null : "The Cache cannot be null!";
+ protected TestIndexCommands(final InternalCache cache, final Execution functionExecutor) {
+ assert cache != null : "The InternalCache cannot be null!";
assert functionExecutor != null : "The function executor cannot be null!";
this.cache = cache;
this.functionExecutor = functionExecutor;
}
@Override
- protected Cache getCache() {
+ protected InternalCache getCache() {
return this.cache;
}
@Override
- protected Set<DistributedMember> getMembers(final Cache cache) {
+ protected Set<DistributedMember> getMembers(final InternalCache cache) {
assertSame(getCache(), cache);
return Collections.emptySet();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
index 955db75..ebe6f34 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
@@ -22,6 +22,7 @@ import java.util.TreeSet;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -40,6 +41,7 @@ public class RegionPathConverterJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index e0038ef..4c1f2cb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -28,6 +28,7 @@ import java.util.UUID;
import org.apache.logging.log4j.Logger;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -48,6 +49,7 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.server.ClientSubscriptionConfig;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.lang.Filter;
import org.apache.geode.internal.lang.ObjectUtils;
@@ -55,6 +57,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
import org.apache.geode.management.internal.cli.util.DiskStoreNotFoundException;
+import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -82,6 +85,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
public void setup() {
mockContext = new Mockery();
mockContext.setImposteriser(ClassImposteriser.INSTANCE);
+ mockContext.setThreadingPolicy(new Synchroniser());
}
@After
@@ -484,8 +488,8 @@ public class DescribeDiskStoreFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final DiskStore mockDiskStore =
createMockDiskStore(diskStoreId, diskStoreName, true, false,
@@ -614,8 +618,8 @@ public class DescribeDiskStoreFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final FunctionContext mockFunctionContext =
mockContext.mock(FunctionContext.class, "FunctionContext");
@@ -657,8 +661,8 @@ public class DescribeDiskStoreFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final FunctionContext mockFunctionContext =
mockContext.mock(FunctionContext.class, "FunctionContext");
@@ -692,13 +696,12 @@ public class DescribeDiskStoreFunctionJUnitTest {
@Test
public void testExecuteWithDiskDirsAndDiskSizesMismatch() throws Exception {
- logger.info("<ExpectedException action=add>" + IllegalStateException.class.getName()
- + "</ExpectedException>");
+ IgnoredException ignoredException =
+ IgnoredException.addIgnoredException(IllegalStateException.class.getName());
try {
doTestExecuteWithDiskDirsAndDiskSizesMismatch();
} finally {
- logger.info("<ExpectedException action=remove>" + IllegalStateException.class.getName()
- + "</ExpectedException>");
+ ignoredException.remove();
}
}
@@ -711,8 +714,8 @@ public class DescribeDiskStoreFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final DiskStore mockDiskStore =
createMockDiskStore(diskStoreId, diskStoreName, false, true, 70, 8192000l, 1000, 300l, 8192,
http://git-wip-us.apache.org/repos/asf/geode/blob/153db276/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
index 2a88e8c..a8b9193 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
@@ -27,6 +27,7 @@ import java.util.UUID;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -38,6 +39,7 @@ import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
@@ -67,6 +69,7 @@ public class ListDiskStoresFunctionJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
@@ -98,8 +101,8 @@ public class ListDiskStoresFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final DiskStoreImpl mockDiskStoreOne = mockContext.mock(DiskStoreImpl.class, "DiskStoreOne");
final DiskStoreImpl mockDiskStoreTwo = mockContext.mock(DiskStoreImpl.class, "DiskStoreTwo");
@@ -200,8 +203,8 @@ public class ListDiskStoresFunctionJUnitTest {
public void testExecuteOnMemberHavingNoDiskStores() throws Throwable {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final FunctionContext mockFunctionContext =
mockContext.mock(FunctionContext.class, "FunctionContext");
@@ -270,8 +273,8 @@ public class ListDiskStoresFunctionJUnitTest {
public void testExecuteThrowsRuntimeException() throws Throwable {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final FunctionContext mockFunctionContext =
mockContext.mock(FunctionContext.class, "FunctionContext");