You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2018/01/26 17:34:31 UTC
[geode] branch develop updated: GEODE-4387: Removing
GemFireCacheImpl.setInstanceForTests
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 16f2d53 GEODE-4387: Removing GemFireCacheImpl.setInstanceForTests
16f2d53 is described below
commit 16f2d53df5de08ecda663176f618529ae8bc8839
Author: Dan Smith <ds...@pivotal.io>
AuthorDate: Fri Jan 26 09:34:28 2018 -0800
GEODE-4387: Removing GemFireCacheImpl.setInstanceForTests
These calls were trying to set the instance variable to a mock instance.
None of them were actually needed. Removing the method.
---
.../geode/cache/query/internal/index/CompactRangeIndex.java | 3 ++-
.../geode/cache/query/internal/index/MemoryIndexStore.java | 7 +------
.../java/org/apache/geode/internal/cache/GemFireCacheImpl.java | 9 ---------
.../geode/management/internal/beans/DistributedSystemBridge.java | 4 ++--
.../geode/management/internal/beans/ManagementAdapter.java | 2 +-
.../cache/query/internal/index/MemoryIndexStoreJUnitTest.java | 9 +--------
.../org/apache/geode/internal/cache/ColocationHelperTest.java | 9 ---------
.../internal/cache/control/RebalanceOperationDUnitTest.java | 6 +-----
.../cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java | 6 ------
.../internal/beans/DistributedSystemBridgeJUnitTest.java | 6 ++----
.../cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java | 1 -
.../geode/internal/cache/wan/AckReaderThreadJUnitTest.java | 6 ------
12 files changed, 10 insertions(+), 58 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java
index ca6c420..054e8b0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java
@@ -104,7 +104,8 @@ public class CompactRangeIndex extends AbstractIndex {
indexStore = new MapIndexStore(
((LocalRegion) region).getIndexMap(indexName, indexedExpression, origFromClause), region);
} else {
- indexStore = new MemoryIndexStore(region, internalIndexStats);
+ indexStore =
+ new MemoryIndexStore(region, internalIndexStats, (InternalCache) region.getCache());
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java
index 116262b..c682a9b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java
@@ -83,12 +83,7 @@ public class MemoryIndexStore implements IndexStore {
// new collection
private final Object TRANSITIONING_TOKEN = new IndexElemArray(1);
- MemoryIndexStore(Region region, InternalIndexStatistics internalIndexStats) {
- this(region, internalIndexStats, GemFireCacheImpl.getInstance());
- }
-
- private MemoryIndexStore(Region region, InternalIndexStatistics internalIndexStats,
- InternalCache cache) {
+ MemoryIndexStore(Region region, InternalIndexStatistics internalIndexStats, InternalCache cache) {
this.region = region;
RegionAttributes ra = region.getAttributes();
// Initialize the reverse-map if in-place modification is set by the
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index b8895f7..2eb56c6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -688,15 +688,6 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
}
/**
- * Used for testing, retain the old instance in the test and re-set the value when test completes
- */
- public static GemFireCacheImpl setInstanceForTests(GemFireCacheImpl cache) {
- GemFireCacheImpl oldInstance = instance;
- instance = cache;
- return oldInstance;
- }
-
- /**
* Returns an existing instance. If a cache does not exist throws a cache closed exception.
*
* @return the existing cache
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
index 7103416..09403a9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
@@ -240,7 +240,7 @@ public class DistributedSystemBridge {
*
* @param service Management service
*/
- public DistributedSystemBridge(SystemManagementService service) {
+ public DistributedSystemBridge(SystemManagementService service, InternalCache cache) {
this.distrLockServiceMap = new ConcurrentHashMap<>();
this.distrRegionMap = new ConcurrentHashMap<>();
this.mapOfMembers = new ConcurrentHashMap<>();
@@ -248,7 +248,7 @@ public class DistributedSystemBridge {
this.mapOfGatewayReceivers = new ConcurrentHashMap<>();
this.mapOfGatewaySenders = new ConcurrentHashMap<>();
this.service = service;
- this.cache = GemFireCacheImpl.getInstance();
+ this.cache = cache;
this.system = cache.getInternalDistributedSystem();
this.dm = system.getDistributionManager();
this.alertLevel = ManagementConstants.DEFAULT_ALERT_LEVEL;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
index 6071591..405cb02 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
@@ -200,7 +200,7 @@ public class ManagementAdapter {
MBeanJMXAdapter jmxAdapter = service.getJMXAdapter();
Map<ObjectName, Object> registeredMBeans = jmxAdapter.getLocalGemFireMBean();
- DistributedSystemBridge dsBridge = new DistributedSystemBridge(service);
+ DistributedSystemBridge dsBridge = new DistributedSystemBridge(service, internalCache);
this.aggregator = new MBeanAggregator(dsBridge);
// register the aggregator for Federation framework to use
service.addProxyListener(aggregator);
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
index 873c67a..662b86e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
@@ -58,10 +58,9 @@ public class MemoryIndexStoreJUnitTest {
subclassPreSetup();
region = createRegion();
cache = mock(GemFireCacheImpl.class);
- actualInstance = GemFireCacheImpl.setInstanceForTests(cache);
mockStats = mock(AbstractIndex.InternalIndexStatistics.class);
- store = new MemoryIndexStore(region, mockStats);
+ store = new MemoryIndexStore(region, mockStats, cache);
store.setIndexOnValues(true);
mockEntries = new RegionEntry[numMockEntries];
IntStream.range(0, numMockEntries).forEach(i -> {
@@ -69,14 +68,8 @@ public class MemoryIndexStoreJUnitTest {
});
}
- @After
- public void teardown() {
- GemFireCacheImpl.setInstanceForTests(actualInstance);
- }
-
@Test
public void createIteratorWhenCacheNulledWhenShuttingDownShouldNotThrowNPE() {
- GemFireCacheImpl.setInstanceForTests(null);
store.get("T");
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
index b841867..ff2ce25 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
@@ -94,15 +94,6 @@ public class ColocationHelperTest {
pa = mock(PartitionAttributes.class);
prc = mock(PartitionRegionConfig.class);
cache = Fakes.cache();
- oldCacheInstance = GemFireCacheImpl.setInstanceForTests(cache);
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- GemFireCacheImpl.setInstanceForTests(oldCacheInstance);
}
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
index a1da0bc..4695a52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -1029,8 +1029,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
@Override
public void run() {
GemFireCacheImpl cache = spy(getGemfireCache());
- // set the spied cache instance
- GemFireCacheImpl origCache = GemFireCacheImpl.setInstanceForTests(cache);
PartitionedRegion origRegion = (PartitionedRegion) cache.getRegion("region1");
PartitionedRegion spyRegion = spy(origRegion);
@@ -1044,6 +1042,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
doReturn(parRegions).when(cache).getPartitionedRegions();
doReturn(redundancyProvider).when(spyRegion).getRedundancyProvider();
+
// simulate create bucket fails on member2 and test if it creates on member3
doReturn(false).when(redundancyProvider).createBackupBucketOnMember(anyInt(),
eq((InternalDistributedMember) member2), anyBoolean(), anyBoolean(), any(),
@@ -1097,9 +1096,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
assertEquals(results.getTotalBucketCreatesCompleted(),
stats.getRebalanceBucketCreatesCompleted());
assertEquals(1, stats.getRebalanceBucketCreatesFailed());
-
- // set the original cache
- GemFireCacheImpl.setInstanceForTests(origCache);
}
});
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 2479b71..5257616 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
@@ -99,7 +99,6 @@ public class ParallelQueueRemovalMessageJUnitTest {
private void createCache() {
// Mock cache
this.cache = Fakes.cache();
- GemFireCacheImpl.setInstanceForTests(this.cache);
}
private void createQueueRegion() {
@@ -186,11 +185,6 @@ public class ParallelQueueRemovalMessageJUnitTest {
new BucketRegionQueueHelper(this.cache, this.queueRegion, this.bucketRegionQueue);
}
- @After
- public void tearDownGemFire() {
- GemFireCacheImpl.setInstanceForTests(null);
- }
-
@Test
public void validateFailedBatchRemovalMessageKeysInUninitializedBucketRegionQueue()
throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
index fe13a4f..eec3a88 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
@@ -56,12 +56,10 @@ public class DistributedSystemBridgeJUnitTest {
when(dlock.lock(any(), anyLong(), anyLong())).thenReturn(true);
DLockService.addLockServiceForTests(BackupDataStoreHelper.LOCK_SERVICE_NAME, dlock);
- GemFireCacheImpl.setInstanceForTests(cache);
}
@After
public void clearCache() {
- GemFireCacheImpl.setInstanceForTests(null);
DLockService.removeLockServiceForTests(BackupDataStoreHelper.LOCK_SERVICE_NAME);
}
@@ -69,7 +67,7 @@ public class DistributedSystemBridgeJUnitTest {
public void testSuccessfulBackup() throws Exception {
DistributionManager dm = cache.getDistributionManager();
- DistributedSystemBridge bridge = new DistributedSystemBridge(null);
+ DistributedSystemBridge bridge = new DistributedSystemBridge(null, cache);
bridge.backupAllMembers("/tmp", null);
InOrder inOrder = inOrder(dm, backupManager);
@@ -91,7 +89,7 @@ public class DistributedSystemBridgeJUnitTest {
.thenThrow(new RuntimeException("Fail the prepare"));
- DistributedSystemBridge bridge = new DistributedSystemBridge(null);
+ DistributedSystemBridge bridge = new DistributedSystemBridge(null, cache);
try {
bridge.backupAllMembers("/tmp", null);
fail("Should have failed with an exception");
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
index 77c929f..d539d49 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
@@ -132,7 +132,6 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
List<?> results = null;
when(cache.getPersistentMemberManager()).thenReturn(memberManager);
- GemFireCacheImpl.setInstanceForTests(null);
smdsFunc.execute(context);
results = resultSender.getResults();
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
index 77f1031..9eef2da 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
@@ -46,7 +46,6 @@ public class AckReaderThreadJUnitTest {
private void createCache() {
// Mock cache
this.cache = Fakes.cache();
- GemFireCacheImpl.setInstanceForTests(this.cache);
}
private void createSender() {
@@ -59,11 +58,6 @@ public class AckReaderThreadJUnitTest {
this.dispatcher = mock(GatewaySenderEventRemoteDispatcher.class);
}
- @After
- public void tearDownGemFire() {
- GemFireCacheImpl.setInstanceForTests(null);
- }
-
@Test
public void testLogBatchExceptions() throws Exception {
// Create AckReaderThread
--
To stop receiving notification emails like this one, please contact
upthewaterspout@apache.org.