You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/04/25 16:58:59 UTC
[geode] branch develop updated: GEODE-4459: Remove singleton calls
from all tests in org.apache.geode.pdx
This is an automated email from the ASF dual-hosted git repository.
prhomberg 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 e5a35bc GEODE-4459: Remove singleton calls from all tests in org.apache.geode.pdx
e5a35bc is described below
commit e5a35bca5b4ff43331c4206873c1e2c040a0fadb
Author: adongre <ad...@apache.org>
AuthorDate: Wed Apr 25 09:55:00 2018 -0700
GEODE-4459: Remove singleton calls from all tests in org.apache.geode.pdx
This closes #1540
---
.../geode/pdx/ClientsWithVersioningRetryDUnitTest.java | 4 ++--
.../apache/geode/pdx/DistributedSystemIdDUnitTest.java | 13 ++++++++-----
.../org/apache/geode/pdx/PdxAttributesJUnitTest.java | 5 +++--
.../org/apache/geode/pdx/PdxInstanceJUnitTest.java | 18 +++++++++++++-----
4 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
index 8b15bcb..00c6a1f 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -269,7 +269,7 @@ public class ClientsWithVersioningRetryDUnitTest extends JUnit4CacheTestCase {
vm1.invoke(new SerializableRunnable() {
@Override
public void run() {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ GemFireCacheImpl cache = (GemFireCacheImpl) basicGetCache();
assertTrue(cache == null || cache.isClosed());
}
});
@@ -382,7 +382,7 @@ public class ClientsWithVersioningRetryDUnitTest extends JUnit4CacheTestCase {
vm0.invoke(new SerializableRunnable() {
@Override
public void run() {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ GemFireCacheImpl cache = (GemFireCacheImpl) basicGetCache();
assertTrue(cache == null || cache.isClosed());
}
});
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java
index 0e34466..50404f4 100755
--- a/geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.pdx;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.util.Properties;
@@ -23,7 +27,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
@@ -141,8 +144,8 @@ public class DistributedSystemIdDUnitTest extends JUnit4DistributedTestCase {
SerializableCallable createSystem = new SerializableCallable() {
public Object call() throws Exception {
- ClusterDistributionManager dm = (ClusterDistributionManager) InternalDistributedSystem
- .getAnyInstance().getDistributionManager();
+ ClusterDistributionManager dm =
+ (ClusterDistributionManager) basicGetSystem().getDistributionManager();
assertEquals(dsId, dm.getDistributedSystemId());
return null;
}
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
index 9a8aa1a..8438e62 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
@@ -54,11 +54,12 @@ import org.apache.geode.pdx.internal.EnumId;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
@Category({IntegrationTest.class, SerializationTest.class})
-public class PdxAttributesJUnitTest {
+public class PdxAttributesJUnitTest extends JUnit4CacheTestCase {
private File diskDir;
@@ -73,7 +74,7 @@ public class PdxAttributesJUnitTest {
@After
public void tearDown() throws Exception {
- GemFireCacheImpl instance = GemFireCacheImpl.getInstance();
+ GemFireCacheImpl instance = (GemFireCacheImpl) basicGetCache();
if (instance != null) {
instance.close();
}
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
index c5bf061..cbe930b 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
@@ -31,17 +31,19 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
@Category({IntegrationTest.class, SerializationTest.class})
-public class PdxInstanceJUnitTest {
+public class PdxInstanceJUnitTest extends JUnit4CacheTestCase {
private GemFireCacheImpl c;
private int allFieldCount;
@@ -220,8 +222,11 @@ public class PdxInstanceJUnitTest {
if (f instanceof PdxInstanceEnumInfo) {
PdxInstanceEnumInfo e = (PdxInstanceEnumInfo) f;
assertEquals("ONE", e.getName());
- GemFireCacheImpl theCache = GemFireCacheImpl
- .getForPdx("PDX registry is unavailable because the Cache has been closed.");
+ GemFireCacheImpl theCache = (GemFireCacheImpl) getCache();
+ if (theCache == null) {
+ throw new CacheClosedException(
+ "PDX registry is unavailable because the Cache has been closed.");
+ }
theCache.getPdxRegistry().flushCache();
assertEquals(MyComplexEnum.ONE, e.getObject());
} else {
@@ -237,8 +242,11 @@ public class PdxInstanceJUnitTest {
if (f instanceof PdxInstanceEnumInfo) {
PdxInstanceEnumInfo e = (PdxInstanceEnumInfo) f;
assertEquals("ONE", e.getName());
- GemFireCacheImpl theCache = GemFireCacheImpl
- .getForPdx("PDX registry is unavailable because the Cache has been closed.");
+ GemFireCacheImpl theCache = (GemFireCacheImpl) getCache();
+ if (theCache == null) {
+ throw new CacheClosedException(
+ "PDX registry is unavailable because the Cache has been closed.");
+ }
theCache.getPdxRegistry().flushCache();
assertEquals(MyEnum.ONE, e.getObject());
} else {
--
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.