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 2016/06/07 20:55:12 UTC
[57/62] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-837
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml70DUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml70DUnitTest.java
index a3e9b04,f502396..4492aa5
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml70DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml70DUnitTest.java
@@@ -20,19 -20,10 +20,15 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
+import static org.junit.Assert.*;
+
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
import java.util.List;
import java.util.Properties;
import java.util.Set;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.DataPolicy;
@@@ -49,16 -40,15 +45,13 @@@ import com.gemstone.gemfire.internal.ca
import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
--/**
-- *
-- */
+@Category(DistributedTest.class)
public class CacheXml70DUnitTest extends CacheXml66DUnitTest {
-- private static final long serialVersionUID = 225193925777688541L;
- public CacheXml70DUnitTest(String name) {
- super(name);
+ public CacheXml70DUnitTest() {
+ super();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml80DUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml80DUnitTest.java
index 5c4f9b2,c7563e2..57aea3d
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml80DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml80DUnitTest.java
@@@ -20,15 -20,6 +20,8 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
+import static org.junit.Assert.*;
+
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@@ -38,6 -29,6 +31,9 @@@ import java.util.Collection
import java.util.HashMap;
import java.util.Map;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.DataPolicy;
@@@ -57,16 -48,15 +53,13 @@@ import com.gemstone.gemfire.internal.ca
import com.gemstone.gemfire.internal.cache.xmlcache.DiskStoreAttributesCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.test.dunit.Assert;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
--/**
-- *
-- */
+@Category(DistributedTest.class)
public class CacheXml80DUnitTest extends CacheXml70DUnitTest {
-- private static final long serialVersionUID = 225193925777688541L;
- public CacheXml80DUnitTest(String name) {
- super(name);
+ public CacheXml80DUnitTest() {
+ super();
}
protected String getGemFireVersion()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
index 12e1716,1b39b2c..0ce5215
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
@@@ -16,17 -16,8 +16,10 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
-import org.junit.Rule;
+import static org.junit.Assert.*;
+
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
- import org.junit.Rule;
import org.junit.Test;
++import org.junit.experimental.categories.Category;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@@ -41,15 -32,14 +34,16 @@@ import com.gemstone.gemfire.internal.ca
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.XmlParser;
import com.gemstone.gemfire.test.dunit.IgnoredException;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* Tests 8.1 schema based configuration. From this point all config test cases
* should extend this test case where {@link #getUseSchema()} will return true.
*
*
- * @since 8.1
+ * @since GemFire 8.1
*/
+@Category(DistributedTest.class)
public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
private static final long serialVersionUID = 1L;
@@@ -69,9 -59,8 +63,9 @@@
* Test extensions to
* <code>cache<code> element.
*
- * @since 8.1
+ * @since GemFire 8.1
*/
+ @Test
public void testCacheExtension() {
final CacheCreation cache = new CacheCreation();
final MockCacheExtension extension = new MockCacheExtension("testCacheExtension");
@@@ -102,9 -91,8 +96,9 @@@
/**
* Test extensions to <code>region</code> element.
*
- * @since 8.1
+ * @since GemFire 8.1
*/
+ @Test
public void testRegionExtension() {
final String regionName = "testRegionExtension";
final CacheCreation cache = new CacheCreation();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
index 9508ae1,be4c657..39376e7
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
@@@ -20,18 -20,6 +20,15 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static org.junit.Assert.*;
+
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
+import java.util.List;
+import java.util.Properties;
+
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Declarable;
import com.gemstone.gemfire.cache.Region;
@@@ -47,9 -35,13 +44,10 @@@ import com.gemstone.gemfire.internal.ca
import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.test.dunit.IgnoredException;
-
-import java.util.List;
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+@Category(DistributedTest.class)
public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
private static final long serialVersionUID = -6437436147079728413L;
@@@ -66,10 -58,9 +64,10 @@@
}
@SuppressWarnings("rawtypes")
+ @Test
public void testEnableOffHeapMemory() {
try {
- System.setProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + OFF_HEAP_MEMORY_SIZE, "1m");
final String regionName = "testEnableOffHeapMemory";
@@@ -247,10 -235,10 +245,10 @@@
cache.setResourceManagerCreation(rmc);
testXml(cache);
c = getCache();
- assertEquals(0f, c.getResourceManager().getEvictionOffHeapPercentage());
- assertEquals(0f, c.getResourceManager().getCriticalOffHeapPercentage());
+ assertEquals(0f, c.getResourceManager().getEvictionOffHeapPercentage(),0);
+ assertEquals(0f, c.getResourceManager().getCriticalOffHeapPercentage(),0);
} finally {
- System.clearProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME);
+ System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + OFF_HEAP_MEMORY_SIZE);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
index 47a016a,7e0d552..7942db4
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
@@@ -16,17 -16,7 +16,17 @@@
*/
package com.gemstone.gemfire.cache30;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Properties;
+
import com.gemstone.gemfire.cache.Cache;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java
index 7bb8829,6b95b03..03b5124
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java
@@@ -51,10 -42,9 +51,10 @@@ import com.gemstone.gemfire.test.dunit.
/**
* Test the getCallbackArgument in light of bug 34075.
*
- * @since 5.0
+ * @since GemFire 5.0
*/
-public class CallbackArgDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CallbackArgDUnitTest extends JUnit4CacheTestCase {
// private transient Region r;
// private transient DistributedMember otherId;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
index 94a6fa4,bfd32fc..6573ed5
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
@@@ -22,33 -22,26 +22,33 @@@
*/
package com.gemstone.gemfire.cache30;
- import static org.junit.Assert.*;
-import com.gemstone.gemfire.cache.*;
++import static com.gemstone.gemfire.test.dunit.Assert.*;
+
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.CacheListener;
+import com.gemstone.gemfire.cache.CacheTransactionManager;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionEvent;
+import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import java.util.Properties;
+@Category(DistributedTest.class)
+public class ClearMultiVmCallBkDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
-
+
-/**
- *
- */
-public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{
-
- /** Creates a new instance of ClearMultiVmCallBkDUnitTest */
- public ClearMultiVmCallBkDUnitTest(String name) {
- super(name);
- }
-
static Cache cache;
static Properties props = new Properties();
static Properties propsWork = new Properties();
@@@ -78,38 -71,38 +78,24 @@@
}
public static void createCache(){
-- try{
-- CacheListener aListener = new ListenerCallBk();
- // props.setProperty("mcast-port", "1234");
- // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "1234");
--// ds = DistributedSystem.connect(props);
- ds = (new ClearMultiVmCallBkDUnitTest()).getSystem(props);
- ds = (new ClearMultiVmCallBkDUnitTest("temp")).getSystem(props);
--
-- cache = CacheFactory.create(ds);
-- AttributesFactory factory = new AttributesFactory();
-- factory.setScope(Scope.DISTRIBUTED_ACK);
--
-- // Set Cachelisterner : aListener
--
-- factory.setCacheListener(aListener);
-- RegionAttributes attr = factory.create();
--
-- region = cache.createRegion("map", attr);
--
--
-- } catch (Exception ex){
-- ex.printStackTrace();
-- }
++ CacheListener aListener = new ListenerCallBk();
++ ds = (new ClearMultiVmCallBkDUnitTest()).getSystem(props);
++
++ cache = CacheFactory.create(ds);
++ AttributesFactory factory = new AttributesFactory();
++ factory.setScope(Scope.DISTRIBUTED_ACK);
++
++ // Set Cachelisterner : aListener
++
++ factory.setCacheListener(aListener);
++ RegionAttributes attr = factory.create();
++
++ region = cache.createRegion("map", attr);
}
public static void closeCache(){
-- try{
--
-- cache.close();
-- ds.disconnect();
--
-- } catch (Exception ex){
-- ex.printStackTrace();
-- }
++ cache.close();
++ ds.disconnect();
}
//test methods
@@@ -179,7 -170,7 +165,7 @@@
}
}catch(Exception ex){
ex.printStackTrace();
-- fail("Failed while region.put");
++ fail("Failed while region.put", ex);
}
return obj;
}
@@@ -189,7 -180,7 +175,7 @@@
try{
obj = region.get(ob);
} catch(Exception ex){
-- fail("Failed while region.get");
++ fail("Failed while region.get", ex);
}
return obj;
}
@@@ -199,7 -190,7 +185,7 @@@
try{
flag = region.containsValue(ob);
}catch(Exception ex){
-- fail("Failed while region.containsValueMethod");
++ fail("Failed while region.containsValueMethod", ex);
}
return flag;
}
@@@ -209,7 -200,7 +195,7 @@@
try{
i = region.size();
}catch(Exception ex){
-- fail("Failed while region.size");
++ fail("Failed while region.size", ex);
}
return i;
}
@@@ -218,7 -209,7 +204,7 @@@
try{
region.clear();
} catch(Exception ex){
-- ex.printStackTrace();
++ fail("clearMethod failed", ex);
}
}
@@@ -235,13 -226,13 +221,8 @@@
region.put(""+i, "inAfterClear");
afterClear = true;
}catch (Exception e){
-- //
++ fail("afterRegionClear failed", e);
}
--
}
--
}
--
--
--
}//end of class
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 48997cb,27205c4..a4a6d42
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@@ -58,24 -36,26 +57,27 @@@ import com.gemstone.gemfire.internal.ca
import com.gemstone.gemfire.management.membership.ClientMembership;
import com.gemstone.gemfire.management.membership.ClientMembershipEvent;
import com.gemstone.gemfire.management.membership.ClientMembershipListener;
-import com.gemstone.gemfire.test.dunit.*;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
-import com.jayway.awaitility.Awaitility;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+ import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+ import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+
/**
* Tests the ClientMembership API including ClientMembershipListener.
*
- * @since 4.2.1
+ * @since GemFire 4.2.1
*/
+@Category(DistributedTest.class)
public class ClientMembershipDUnitTest extends ClientServerTestCase {
protected static final boolean CLIENT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
index c292247,79fd543..0971db3
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
@@@ -23,11 -19,12 +23,11 @@@ import com.gemstone.gemfire.test.junit.
/**
* Same as parent but uses selector in server
*
- * @since 5.1
+ * @since GemFire 5.1
*/
+@Category(DistributedTest.class)
public class ClientMembershipSelectorDUnitTest extends ClientMembershipDUnitTest {
- public ClientMembershipSelectorDUnitTest(String name) {
- super(name);
- }
+ @Override
protected int getMaxThreads() {
return 2;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
index c215114,b6cffa0..8d0eae7
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
@@@ -16,38 -16,31 +16,41 @@@
*/
package com.gemstone.gemfire.cache30;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.CacheException;
++import com.gemstone.gemfire.cache.CacheLoaderException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.SubscriptionNotEnabledException;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.test.dunit.*;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* Tests the client register interest
*
- * @since 4.2.3
+ * @since GemFire 4.2.3
*/
+@Category(DistributedTest.class)
public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
- public ClientRegisterInterestDUnitTest(String name) {
- super(name);
- }
-
++ protected static int bridgeServerPort;
++
@Override
public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS(); // cleans up bridge server and client and lonerDS
@@@ -81,7 -73,7 +84,7 @@@
}
catch (IOException e) {
LogWriterUtils.getLogWriter().error("startBridgeServer threw IOException", e);
-- fail("startBridgeServer threw IOException " + e.getMessage());
++ fail("startBridgeServer threw IOException ", e);
}
assertTrue(bridgeServerPort != 0);
@@@ -115,7 -107,7 +118,7 @@@
catch (SubscriptionNotEnabledException expected) {
}
}
-- protected static int bridgeServerPort;
++
private static int getBridgeServerPort() {
return bridgeServerPort;
}
@@@ -169,7 -159,7 +172,7 @@@
}
catch (IOException e) {
LogWriterUtils.getLogWriter().error("startBridgeServer threw IOException", e);
-- fail("startBridgeServer threw IOException " + e.getMessage());
++ fail("startBridgeServer threw IOException ", e);
}
assertTrue(bridgeServerPort != 0);
@@@ -200,7 -190,7 +203,7 @@@
}
catch (IOException e) {
LogWriterUtils.getLogWriter().error("startBridgeServer threw IOException", e);
-- fail("startBridgeServer threw IOException " + e.getMessage());
++ fail("startBridgeServer threw IOException ", e);
}
assertTrue(bridgeServerPort != 0);
@@@ -315,7 -305,7 +318,7 @@@
}
catch (IOException e) {
LogWriterUtils.getLogWriter().error("startBridgeServer threw IOException", e);
-- fail("startBridgeServer threw IOException " + e.getMessage());
++ fail("startBridgeServer threw IOException ", e);
}
}
});
@@@ -341,7 -331,7 +344,7 @@@
assertEquals(null, region2.get(key2));
fail("CacheLoaderException expected");
}
-- catch (com.gemstone.gemfire.cache.CacheLoaderException e) {
++ catch (CacheLoaderException e) {
}
// region2 registration should be gone now
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
index 822c9d8,d4d44c5..0638c85
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
@@@ -23,11 -19,12 +23,11 @@@ import com.gemstone.gemfire.test.junit.
/**
* Same as parent but uses selector in server
*
- * @since 5.1
+ * @since GemFire 5.1
*/
+@Category(DistributedTest.class)
public class ClientRegisterInterestSelectorDUnitTest extends ClientRegisterInterestDUnitTest {
- public ClientRegisterInterestSelectorDUnitTest(String name) {
- super(name);
- }
+ @Override
protected int getMaxThreads() {
return 2;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index 3a00ff4,80f932e..63b621e
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@@ -16,24 -16,9 +16,25 @@@
*/
package com.gemstone.gemfire.cache30;
+ import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
-
-import com.gemstone.gemfire.cache.*;
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.InterestResultPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
import com.gemstone.gemfire.cache.client.ClientRegionFactory;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
index f178e97,8dba782..e251e93
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
@@@ -48,9 -46,9 +48,9 @@@ import com.gemstone.gemfire.test.dunit.
* test case was created by refactoring methods from ConnectionPoolDUnitTest into
* this class.
*
- * @since 4.2.1
+ * @since GemFire 4.2.1
*/
-public class ClientServerTestCase extends CacheTestCase {
+public abstract class ClientServerTestCase extends JUnit4CacheTestCase {
public static String NON_EXISTENT_KEY = "NON_EXISTENT_KEY";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
index 2ccbba3,0e7b193..a43950e
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
@@@ -69,10 -60,9 +69,10 @@@ import com.gemstone.gemfire.test.dunit.
* written to disk.
*
*
- * @since 3.2
+ * @since GemFire 3.2
*/
-public class DiskRegionDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class DiskRegionDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a new <code>DiskRegionDUnitTest</code>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
index 4339dba,71b3dd7..ffd3248
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
@@@ -91,9 -75,9 +91,9 @@@ public class DistAckMapMethodsDUnitTes
public static void createCache(){
try{
- //props.setProperty("mcast-port", "1234");
+ //props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "1234");
//ds = DistributedSystem.connect(props);
- ds = (new DistAckMapMethodsDUnitTest("temp")).getSystem(props);
+ ds = (new DistAckMapMethodsDUnitTest()).getSystem(props);
cache = CacheFactory.create(ds);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
index c378145,366acf1..5fc8cc9
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
@@@ -16,35 -16,26 +16,30 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
- import static org.junit.Assert.*;
-
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.util.Properties;
+
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Overflow Region with ConcurrencyChecksEnabled and OffHeap memory.
*
- * @since 9.0
+ * @since Geode 1.0
*/
@SuppressWarnings({ "deprecation", "serial" })
+@Category(DistributedTest.class)
public class DistributedAckOverflowRegionCCEOffHeapDUnitTest extends DistributedAckOverflowRegionCCEDUnitTest {
- public DistributedAckOverflowRegionCCEOffHeapDUnitTest(String name) {
- super(name);
+ public DistributedAckOverflowRegionCCEOffHeapDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index 2c7e2e8,905cafc..36e2893
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@@ -16,35 -16,26 +16,31 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
- import static org.junit.Assert.*;
-
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.util.Properties;
+
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-
-import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
/**
* Tests Distributed Ack Persistent Region with ConcurrencyChecksEnabled and OffHeap memory.
*
- * @since 9.0
+ * @since Geode 1.0
*/
@SuppressWarnings({ "deprecation", "serial" })
+@Category(DistributedTest.class)
public class DistributedAckPersistentRegionCCEOffHeapDUnitTest extends DistributedAckPersistentRegionCCEDUnitTest {
- public DistributedAckPersistentRegionCCEOffHeapDUnitTest(String name) {
- super(name);
+ public DistributedAckPersistentRegionCCEOffHeapDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
index 17a1be7,877c611..d91b803
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
@@@ -20,26 -20,8 +20,26 @@@
*/
package com.gemstone.gemfire.cache30;
-import com.gemstone.gemfire.cache.*;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static org.junit.Assert.*;
- import static org.junit.Assume.assumeTrue;
++import static org.junit.Assume.*;
+
+import java.net.UnknownHostException;
+import java.util.Properties;
+import java.util.Set;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Operation;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.internal.DistributionAdvisor;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.distributed.internal.membership.NetMember;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
index 50bec8d,e766a49..739da00
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
@@@ -16,37 -16,27 +16,28 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
- import static org.junit.Assert.*;
-
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.util.Properties;
+
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-
-import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
*
- * @since 9.0
+ * @since Geode 1.0
*/
@SuppressWarnings({ "deprecation", "serial" })
+@Category(DistributedTest.class)
public class DistributedAckRegionCCEOffHeapDUnitTest extends DistributedAckRegionCCEDUnitTest {
- public DistributedAckRegionCCEOffHeapDUnitTest() {
- super();
- public DistributedAckRegionCCEOffHeapDUnitTest(String name) {
- super(name);
-- }
--
@Override
public final void preTearDownAssertions() throws Exception {
SerializableRunnable checkOrphans = new SerializableRunnable() {
@@@ -69,8 -59,8 +60,8 @@@
return props;
}
-- @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
++ @SuppressWarnings({ "rawtypes", "unchecked" })
protected RegionAttributes getRegionAttributes() {
RegionAttributes attrs = super.getRegionAttributes();
AttributesFactory factory = new AttributesFactory(attrs);
@@@ -78,8 -68,8 +69,8 @@@
return factory.create();
}
-- @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
++ @SuppressWarnings({ "rawtypes", "unchecked" })
protected RegionAttributes getRegionAttributes(String type) {
RegionAttributes ra = super.getRegionAttributes(type);
AttributesFactory factory = new AttributesFactory(ra);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCompressionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCompressionDUnitTest.java
index 115ea1b,b4517a9..f50a30e
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCompressionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCompressionDUnitTest.java
@@@ -27,12 -25,16 +27,12 @@@ import com.gemstone.gemfire.test.junit.
/**
* Tests Distributed Ack Region with compression.
*
- * @since 8.0
+ * @since GemFire 8.0
*/
+@Category(DistributedTest.class)
@SuppressWarnings({ "deprecation", "serial" })
-public class DistributedAckRegionCompressionDUnitTest extends
- DistributedAckRegionDUnitTest {
+public class DistributedAckRegionCompressionDUnitTest extends DistributedAckRegionDUnitTest {
- public DistributedAckRegionCompressionDUnitTest(String name) {
- super(name);
- }
-
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
protected RegionAttributes getRegionAttributes() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
index 1cd2c85,1587179..48a97c9
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
@@@ -16,43 -16,25 +16,36 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
+ import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
-
-import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.test.dunit.*;
+import static org.junit.Assert.*;
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
import java.util.Properties;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
/**
* This class tests the functionality of a cache {@link Region region}
* that has a scope of {@link Scope#DISTRIBUTED_ACK distributed ACK}.
*
- * @since 3.0
+ * @since GemFire 3.0
*/
+@Category(DistributedTest.class)
public class DistributedAckRegionDUnitTest extends MultiVMRegionTestCase {
- public DistributedAckRegionDUnitTest() {
- super();
- public DistributedAckRegionDUnitTest(String name) {
- super(name);
-- }
--
/**
* Returns region attributes for a <code>GLOBAL</code> region
*/
@@@ -72,8 -54,8 +65,6 @@@
return p;
}
-- ////////////////////// Test Methods //////////////////////
--
/**
* Tests the compatibility of creating certain kinds of subregions
* of a local region.
@@@ -141,7 -122,7 +132,4 @@@
}
});
}
--
--
--
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
index ec73caa,89b32d5..388a6e3
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
@@@ -16,37 -16,28 +16,28 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
- import static org.junit.Assert.*;
-
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.util.Properties;
+
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with OffHeap memory.
*
- * @since 9.0
+ * @since Geode 1.0
*/
- @SuppressWarnings({ "deprecation", "serial" })
+@Category(DistributedTest.class)
+ @SuppressWarnings({ "deprecation", "serial" })
public class DistributedAckRegionOffHeapDUnitTest extends DistributedAckRegionDUnitTest {
- public DistributedAckRegionOffHeapDUnitTest() {
- super();
- public DistributedAckRegionOffHeapDUnitTest(String name) {
- super(name);
-- }
--
@Override
public final void preTearDownAssertions() throws Exception {
SerializableRunnable checkOrphans = new SerializableRunnable() {
@@@ -69,8 -60,8 +60,8 @@@
return props;
}
-- @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
++ @SuppressWarnings({ "rawtypes", "unchecked" })
protected RegionAttributes getRegionAttributes() {
RegionAttributes attrs = super.getRegionAttributes();
AttributesFactory factory = new AttributesFactory(attrs);
@@@ -78,8 -69,8 +69,8 @@@
return factory.create();
}
-- @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
++ @SuppressWarnings({ "rawtypes", "unchecked" })
protected RegionAttributes getRegionAttributes(String type) {
RegionAttributes ra = super.getRegionAttributes(type);
AttributesFactory factory = new AttributesFactory(ra);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 7696800,a2bee79..5776158
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@@ -16,23 -16,8 +16,23 @@@
*/
package com.gemstone.gemfire.cache30;
-import com.gemstone.gemfire.cache.*;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.Locator;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.CachedDeserializableFactory;
@@@ -133,7 -120,7 +133,7 @@@ public class DistributedMulticastRegion
closeLocator();
}
-- public class TestObjectThrowsException implements PdxSerializable {
++ private static class TestObjectThrowsException implements PdxSerializable {
String name = "TestObjectThrowsException";
@Override
@@@ -143,13 -130,12 +143,11 @@@
@Override
public void fromData(PdxReader reader) {
-- throw new RuntimeException("Unable to desrialize message ");
-- //name = reader.readString("name");
++ throw new RuntimeException("Unable to deserialize message ");
}
--
}
+ @Test
public void testMulticastWithRegionOpsException() {
Host host = Host.getHost(0);
final VM vm0 = host.getVM(0);
@@@ -274,30 -260,30 +272,30 @@@
}
private int startLocator() {
-- final int [] ports = AvailablePortHelper.getRandomAvailableTCPPorts(3);
-- final int locatorPort = ports[0];
--
-- VM locator1Vm = Host.getHost(0).getVM(locatorVM);;
-- locator1Vm.invoke(new SerializableCallable() {
-- @Override
-- public Object call() {
-- final File locatorLogFile = new File(getTestMethodName() + "-locator-" + locatorPort + ".log");
-- final Properties locatorProps = new Properties();
- locatorProps.setProperty(DistributionConfig.NAME_NAME, "LocatorWithMcast");
- locatorProps.setProperty(DistributionConfig.MCAST_PORT_NAME, mcastport);
- locatorProps.setProperty(DistributionConfig.MCAST_TTL_NAME, mcastttl);
- locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
- locatorProps.setProperty(NAME, "LocatorWithMcast");
- locatorProps.setProperty(MCAST_PORT, mcastport);
- locatorProps.setProperty(MCAST_TTL, mcastttl);
- locatorProps.setProperty(LOG_LEVEL, "info");
-- //locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
-- try {
-- final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, null, null,
-- locatorProps);
-- System.out.println("test Locator started " + locatorPort);
-- } catch (IOException ioex) {
-- fail("Unable to create a locator with a shared configuration");
++ final int [] ports = AvailablePortHelper.getRandomAvailableTCPPorts(3);
++ final int locatorPort = ports[0];
++
++ VM locator1Vm = Host.getHost(0).getVM(locatorVM);
++ locator1Vm.invoke(new SerializableCallable() {
++ @Override
++ public Object call() {
++ final File locatorLogFile = new File(getTestMethodName() + "-locator-" + locatorPort + ".log");
++ final Properties locatorProps = new Properties();
++ locatorProps.setProperty(NAME, "LocatorWithMcast");
++ locatorProps.setProperty(MCAST_PORT, mcastport);
++ locatorProps.setProperty(MCAST_TTL, mcastttl);
++ locatorProps.setProperty(LOG_LEVEL, "info");
++ //locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
++ try {
++ final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, null, null,
++ locatorProps);
++ System.out.println("test Locator started " + locatorPort);
++ } catch (IOException ioex) {
++ fail("Unable to create a locator with a shared configuration");
++ }
++
++ return null;
}
--
-- return null;
-- }
});
return locatorPort;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
index 9c960c1,35660a6..8720fcc
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
@@@ -15,53 -15,28 +15,44 @@@
* limitations under the License.
*/
package com.gemstone.gemfire.cache30;
-
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
- import static org.junit.Assert.*;
-
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
-import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
-import com.gemstone.gemfire.test.dunit.*;
-import com.gemstone.gemfire.test.junit.categories.FlakyTest;
-import org.junit.experimental.categories.Category;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import static org.junit.Assert.*;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheListener;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.EntryNotFoundException;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+
- @Category(DistributedTest.class)
++@Category(DistributedTest.class)
public class DistributedNoAckRegionCCEDUnitTest extends DistributedNoAckRegionDUnitTest {
static volatile boolean ListenerBlocking;
- public DistributedNoAckRegionCCEDUnitTest() {
- super();
- public DistributedNoAckRegionCCEDUnitTest(String name) {
- super(name);
-- }
--
@Override
public Properties getDistributedSystemProperties() {
Properties p = super.getDistributedSystemProperties();
@@@ -73,7 -48,7 +64,6 @@@
return p;
}
--
/**
* Returns region attributes for a <code>GLOBAL</code> region
*/
@@@ -109,18 -84,15 +99,18 @@@
@Override
- @Test
++ @Test
public void testLocalDestroy() throws InterruptedException {
// replicates don't allow local destroy
}
@Override
- @Test
++ @Test
public void testEntryTtlLocalDestroy() throws InterruptedException {
// replicates don't allow local destroy
}
- @Test
++ @Test
public void testClearWithManyEventsInFlight() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@@ -252,7 -224,6 +242,7 @@@
* for register-interest.
*/
- @Test
++ @Test
public void testGIISendsTombstones() throws Exception {
versionTestGIISendsTombstones();
}
@@@ -266,29 -237,24 +256,29 @@@
* This tests the concurrency versioning system to ensure that event conflation
* happens correctly and that the statistic is being updated properly
*/
- @Test
++ @Test
public void testConcurrentEvents() throws Exception {
versionTestConcurrentEvents();
}
- @Test
++ @Test
public void testClearWithConcurrentEvents() throws Exception {
// need to figure out how to flush clear() ops for verification steps
}
- @Test
++ @Test
public void testClearWithConcurrentEventsAsync() throws Exception {
// need to figure out how to flush clear() ops for verification steps
}
- @Test
++ @Test
public void testClearOnNonReplicateWithConcurrentEvents() throws Exception {
// need to figure out how to flush clear() ops for verification steps
}
- @Test
++ @Test
public void testTombstones() throws Exception {
// for (int i=0; i<1000; i++) {
// System.out.println("starting run #"+i);
@@@ -306,7 -272,6 +296,7 @@@
- @Test
++ @Test
public void testOneHopKnownIssues() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@@ -384,7 -349,6 +374,7 @@@
* happens correctly and that the statistic is being updated properly
*/
@Category(FlakyTest.class) // GEODE-976: time sensitive, thread sleeps, relies on stat values
- @Test
++ @Test
public void testConcurrentEventsOnEmptyRegion() {
versionTestConcurrentEventsOnEmptyRegion();
}
@@@ -393,13 -357,11 +383,13 @@@
* This tests the concurrency versioning system to ensure that event conflation
* happens correctly and that the statistic is being updated properly
*/
- @Test
++ @Test
public void testConcurrentEventsOnNonReplicatedRegion() {
versionTestConcurrentEventsOnNonReplicatedRegion();
}
- @Test
++ @Test
public void testGetAllWithVersions() {
versionTestGetAllWithVersions();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
index 4e030f5,9980e56..c871632
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
@@@ -16,37 -16,28 +16,28 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
- import static org.junit.Assert.*;
-
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.util.Properties;
+
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
*
- * @since 9.0
+ * @since Geode 1.0
*/
- @SuppressWarnings({ "deprecation", "serial" })
+@Category(DistributedTest.class)
+ @SuppressWarnings({ "deprecation", "serial" })
public class DistributedNoAckRegionCCEOffHeapDUnitTest extends DistributedNoAckRegionCCEDUnitTest {
- public DistributedNoAckRegionCCEOffHeapDUnitTest() {
- super();
- public DistributedNoAckRegionCCEOffHeapDUnitTest(String name) {
- super(name);
-- }
--
@Override
public final void preTearDownAssertions() throws Exception {
SerializableRunnable checkOrphans = new SerializableRunnable() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
index 5f8b0c0,454d0ce..aecce60
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
@@@ -50,11 -43,14 +50,11 @@@ import com.gemstone.gemfire.test.junit.
* that has a scope of {@link Scope#DISTRIBUTED_NO_ACK distributed no
* ACK}.
*
- * @since 3.0
+ * @since GemFire 3.0
*/
+@Category(DistributedTest.class)
public class DistributedNoAckRegionDUnitTest extends MultiVMRegionTestCase {
- public DistributedNoAckRegionDUnitTest(String name) {
- super(name);
- }
-
/**
* Returns region attributes for a <code>GLOBAL</code> region
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
index cd454ce,73f5201..b74956c
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
@@@ -16,35 -16,25 +16,30 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
- import static org.junit.Assert.*;
-
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.util.Properties;
+
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests Distributed NoAck Region with OffHeap memory.
*
- * @since 9.0
+ * @since Geode 1.0
*/
@SuppressWarnings({ "deprecation", "serial" })
+@Category(DistributedTest.class)
public class DistributedNoAckRegionOffHeapDUnitTest extends DistributedNoAckRegionDUnitTest {
- public DistributedNoAckRegionOffHeapDUnitTest(String name) {
- super(name);
+ public DistributedNoAckRegionOffHeapDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
index f3dcdc3,472546f..046df3d
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
@@@ -47,10 -38,9 +47,10 @@@ import com.gemstone.gemfire.test.dunit.
/**
* Test to make sure dynamic regions work
*
- * @since 4.3
+ * @since GemFire 4.3
*/
-public class DynamicRegionDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class DynamicRegionDUnitTest extends JUnit4CacheTestCase {
// Specify oplog size in MB
private static final int OPLOG_SIZE = 1;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
index 2c387b4,deefac4..9a8f0e0
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
@@@ -20,26 -20,7 +20,21 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
-import com.gemstone.gemfire.cache.*;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static org.junit.Assert.*;
+
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
+import java.util.Properties;
+
+import org.junit.Ignore;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.Scope;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.RegionClearedException;
import com.gemstone.gemfire.internal.cache.RegionEntry;
@@@ -49,23 -30,27 +44,16 @@@ import com.gemstone.gemfire.test.dunit.
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
-import org.junit.Ignore;
-
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* This test is only for GLOBAL REPLICATE Regions. Tests are
* similar to {@link DistributedAckRegionCCEDUnitTest}.
-- *
-- *
*/
+@Category(DistributedTest.class)
public class GlobalRegionCCEDUnitTest extends GlobalRegionDUnitTest {
-- /**
-- * @param name
-- */
- public GlobalRegionCCEDUnitTest() {
- super();
- public GlobalRegionCCEDUnitTest(String name) {
- super(name);
-- }
--
++ @Override
protected boolean supportsTransactions() {
return true;
}
@@@ -84,6 -69,6 +72,7 @@@
/**
* Returns region attributes for a <code>GLOBAL</code> region
*/
++ @Override
protected RegionAttributes getRegionAttributes() {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.GLOBAL);
@@@ -92,6 -77,6 +81,7 @@@
return factory.create();
}
++ @Override
protected RegionAttributes getRegionAttributes(String type) {
RegionAttributes ra = getCache().getRegionAttributes(type);
if (ra == null) {
@@@ -104,14 -89,12 +94,16 @@@
return factory.create();
}
++ @Ignore("replicates don't allow local destroy")
@Override
+ @Test
public void testLocalDestroy() throws InterruptedException {
// replicates don't allow local destroy
}
++ @Ignore("replicates don't allow local destroy")
@Override
+ @Test
public void testEntryTtlLocalDestroy() throws InterruptedException {
// replicates don't allow local destroy
}
@@@ -127,6 -109,6 +119,7 @@@
versionTestGIISendsTombstones();
}
++ // TODO: delete this unused method
protected void do_version_recovery_if_necessary(final VM vm0, final VM vm1,
final VM vm2, final Object[] params) {
// do nothing here
@@@ -144,19 -125,18 +137,26 @@@
// these tests for clear() take too long with global regions and cause false dunit hangs
// on older machines
--// public void testClearWithConcurrentEvents() throws Exception {
--// z_versionTestClearWithConcurrentEvents(true);
--// }
--//
--// public void testClearWithConcurrentEventsAsync() throws Exception {
--// versionTestClearWithConcurrentEventsAsync();
--// }
--//
--// public void testClearOnNonReplicateWithConcurrentEvents() throws Exception {
--// versionTestClearOnNonReplicateWithConcurrentEvents();
--// }
+
++ @Ignore("TODO: takes too long with global regions and cause false dunit hangs")
++ @Test
++ public void testClearWithConcurrentEvents() throws Exception {
++ z_versionTestClearWithConcurrentEvents(true);
++ }
++
++ @Ignore("TODO: takes too long with global regions and cause false dunit hangs")
++ @Test
++ public void testClearWithConcurrentEventsAsync() throws Exception {
++ versionTestClearWithConcurrentEventsAsync();
++ }
++
++ @Ignore("TODO: takes too long with global regions and cause false dunit hangs")
++ @Test
++ public void testClearOnNonReplicateWithConcurrentEvents() throws Exception {
++ versionTestClearOnNonReplicateWithConcurrentEvents();
++ }
+
+ @Test
public void testTombstones() {
versionTestTombstones();
}
@@@ -237,7 -216,7 +237,8 @@@
* properly
*/
@Ignore("Disabling due to bug #52347")
-- public void DISABLED_testConcurrentEventsOnEmptyRegion() {
++ @Test
++ public void testConcurrentEventsOnEmptyRegion() {
versionTestConcurrentEventsOnEmptyRegion();
}
@@@ -246,7 -225,6 +247,8 @@@
* conflation happens correctly and that the statistic is being updated
* properly
*/
++ @Ignore("TODO: reenable this test")
+ @Test
public void testConcurrentEventsOnNonReplicatedRegion() {
// Shobhit: Just commenting out for now as it is being fixed by Bruce.
// TODO: uncomment the test asa the bug is fixed.
@@@ -258,5 -235,5 +260,4 @@@
versionTestGetAllWithVersions();
}
--
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
index 8b5f5d0,0c7b17d..dddc2e5
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
@@@ -16,20 -16,8 +16,19 @@@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
+import java.util.Properties;
+
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@@ -37,16 -29,15 +40,12 @@@ import static com.gemstone.gemfire.dist
/**
* Tests Global Region with ConcurrencyChecksEnabled and OffHeap memory.
*
- * @since 9.0
+ * @since Geode 1.0
*/
- @SuppressWarnings({ "deprecation", "serial" })
+@Category(DistributedTest.class)
+ @SuppressWarnings({ "deprecation", "serial" })
public class GlobalRegionCCEOffHeapDUnitTest extends GlobalRegionCCEDUnitTest {
- public GlobalRegionCCEOffHeapDUnitTest() {
- super();
- public GlobalRegionCCEOffHeapDUnitTest(String name) {
- super(name);
-- }
--
@Override
public final void preTearDownAssertions() throws Exception {
SerializableRunnable checkOrphans = new SerializableRunnable() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
index 12c0f42,8c40d6f..b105354
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
@@@ -16,19 -16,10 +16,15 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
+import static org.junit.Assert.*;
+
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
import java.util.Random;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.Cache;
@@@ -47,20 -38,19 +43,17 @@@ import com.gemstone.gemfire.test.dunit.
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.ThreadUtils;
import com.gemstone.gemfire.test.dunit.VM;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* This class tests the functionality of a cache {@link Region region}
* that has a scope of {@link Scope#GLOBAL global}.
*
- * @since 3.0
+ * @since GemFire 3.0
*/
+@Category(DistributedTest.class)
public class GlobalRegionDUnitTest extends MultiVMRegionTestCase {
- public GlobalRegionDUnitTest() {
- super();
- public GlobalRegionDUnitTest(String name) {
- super(name);
-- }
--
/**
* Returns region attributes for a <code>GLOBAL</code> region
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
index 05ebb44,6f06758..d894565
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
@@@ -16,15 -16,8 +16,16 @@@
*/
package com.gemstone.gemfire.cache30;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++
+import java.util.Properties;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@@ -33,12 -29,15 +34,12 @@@ import com.gemstone.gemfire.test.junit.
/**
* Tests Global Region with OffHeap memory.
*
- * @since 9.0
+ * @since Geode 1.0
*/
-@SuppressWarnings({ "deprecation", "serial" })
+@Category(DistributedTest.class)
+@SuppressWarnings({ "deprecation", "serial", "rawtypes", "unchecked" })
public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest {
- public GlobalRegionOffHeapDUnitTest(String name) {
- super(name);
- }
-
@Override
public final void preTearDownAssertions() throws Exception {
SerializableRunnable checkOrphans = new SerializableRunnable() {
@@@ -53,11 -52,9 +54,11 @@@
Invoke.invokeInEveryVM(checkOrphans);
checkOrphans.run();
}
-
+
- @Override
+ @Ignore("TODO: DISABLED due to bug 47951")
+ @Override
- public void DISABLED_testNBRegionInvalidationDuringGetInitialImage() throws Throwable {
+ @Test
+ public void testNBRegionInvalidationDuringGetInitialImage() throws Exception {
//DISABLED - bug 47951
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/LRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/LRUEvictionControllerDUnitTest.java
index 177872f,e0358d7..fa2abb2
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/LRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/LRUEvictionControllerDUnitTest.java
@@@ -63,10 -54,9 +63,10 @@@ import com.gemstone.gemfire.test.dunit.
* controller and its statistics.
*
*
- * @since 3.2
+ * @since GemFire 3.2
*/
-public class LRUEvictionControllerDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class LRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
private static boolean usingMain = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
index 2953d08,4f4a440..225cd7c
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
@@@ -37,14 -31,17 +37,14 @@@ import com.gemstone.gemfire.test.junit.
/**
* Tests the functionality of a {@link Scope#LOCAL locally scoped}
* cache {@link Region} including its callbacks. Note that even
- * though this test is a {@link com.gemstone.gemfire.test.dunit.DistributedTestCase}, it does
+ * though this test is a dunit test, it does
* not perform any distribution.
*
- * @since 3.0
+ * @since GemFire 3.0
*/
+@Category(DistributedTest.class)
public class LocalRegionDUnitTest extends CacheListenerTestCase {
- public LocalRegionDUnitTest(String name) {
- super(name);
- }
-
/**
* Returns the attributes of a region to be tested.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
index 5ba74c8,2e8716c..a74967b
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
@@@ -49,10 -40,9 +49,10 @@@ import com.gemstone.gemfire.internal.si
* and its statistics.
*
*
- * @since 3.2
+ * @since GemFire 3.2
*/
-public class MemLRUEvictionControllerDUnitTest extends CacheTestCase
+@Category(DistributedTest.class)
+public class MemLRUEvictionControllerDUnitTest extends JUnit4CacheTestCase
{
private static boolean usingMain = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
index da9422a,b5f4149..b56f84a
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
@@@ -5394,10 -5448,9 +5394,10 @@@ public abstract class MultiVMRegionTest
* Tests what happens when one VM attempts to read an object for
* which it does not have a registered <code>DataSerializer</code>.
*
- * @since 3.5
+ * @since GemFire 3.5
*/
- public void testNoDataSerializer() {
+ @Test
+ public void testNoDataSerializer() throws Exception {
assertTrue(getRegionAttributes().getScope().isDistributed());
final String name = this.getUniqueName();
@@@ -5546,10 -5600,9 +5546,10 @@@
* Tests what happens when one VM attempts to read an object for
* which it does not have a registered <code>Instantiator</code>.
*
- * @since 3.5
+ * @since GemFire 3.5
*/
- public void testNoInstantiator() {
+ @Test
+ public void testNoInstantiator() throws Exception {
assertTrue(getRegionAttributes().getScope().isDistributed());
final String name = this.getUniqueName();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
index 9037b4a,dd49966..18d08c5
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
@@@ -16,32 -16,23 +16,27 @@@
*/
package com.gemstone.gemfire.cache30;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
- import static org.junit.Assert.*;
-
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.util.Properties;
+
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType;
import com.gemstone.gemfire.internal.cache.lru.HeapEvictor;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* Tests the basic functionality of the lru eviction
* controller and its statistics using off-heap regions.
*
- * @since 9.0
+ * @since Geode 1.0
*/
+@Category(DistributedTest.class)
public class OffHeapLRUEvictionControllerDUnitTest extends
LRUEvictionControllerDUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
index 43ccfea,d099761..78d7db9
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
@@@ -33,9 -24,8 +33,9 @@@ import com.gemstone.gemfire.compression
/**
* Tests Partitioned Region with compression.
*
- * @since 8.0
+ * @since GemFire 8.0
*/
+@Category(DistributedTest.class)
public class PartitionedRegionCompressionDUnitTest extends
PartitionedRegionDUnitTest {