[44/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

[klund]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22f577eb/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
index fcdc3a4..92624a4 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
@@ -12,22 +12,46 @@
  * or implied. See the License for the specific language governing permissions 
and limitations under
  * the License.
  */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.geode.management;
 
-import static org.junit.Assert.*;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.apache.geode.cache.Region.*;
+import static org.apache.geode.test.dunit.Host.*;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.assertj.core.api.Assertions.*;
 
+import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
 import javax.management.Notification;
 import javax.management.NotificationListener;
 import javax.management.ObjectName;
 
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -41,1325 +65,1063 @@ import org.apache.geode.cache.PartitionAttributes;
 import org.apache.geode.cache.PartitionAttributesFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.cache.Scope;
 import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.internal.cache.AbstractRegion;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.TestObjectSizerImpl;
 import org.apache.geode.internal.cache.lru.LRUStatistics;
 import 
org.apache.geode.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
 import org.apache.geode.management.internal.MBeanJMXAdapter;
 import org.apache.geode.management.internal.SystemManagementService;
-import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
 
 /**
- * This class checks and verifies various data and operations exposed through 
RegionMXBean
- * interface.
- * 
- * Goal of the Test : RegionMBean gets created once region is created. Data 
like Region Attributes
- * data and stats are of proper value
- * 
- * 
+ * This class checks and verifies various data and operations exposed through
+ * RegionMXBean interface.
+ * 
+ * Goal of the Test : RegionMBean gets created once region is created. Data 
like
+ * Region Attributes data and stats are of proper value
  */
 @Category(DistributedTest.class)
+@SuppressWarnings({ "serial", "unused" })
 public class RegionManagementDUnitTest extends ManagementTestBase {
 
-  private static final long serialVersionUID = 1L;
-
-  private final String VERIFY_CONFIG_METHOD = "verifyConfigData";
+  private static final String 

[44/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

[klund]

Convert from ManagementTestCase to ManagementTestRule


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f3b5664c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f3b5664c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f3b5664c

Branch: refs/heads/feature/GEODE-1930
Commit: f3b5664c2597f16a312cd19cb5c4a08fc1dd4971
Parents: a00a2ff
Author: Kirk Lund 
Authored: Mon Oct 31 13:45:28 2016 -0700
Committer: Kirk Lund 
Committed: Mon Nov 7 11:56:55 2016 -0800

--
 .../RestAPIsAndInterOpsDUnitTest.java   |  110 +-
 geode-core/build.gradle |1 +
 .../org/apache/geode/management/JVMMetrics.java |3 +-
 .../org/apache/geode/management/OSMetrics.java  |5 +-
 .../internal/SystemManagementService.java   |2 +-
 .../DistributedLockServiceDUnitTest.java|   18 +-
 .../cache/ConnectDisconnectDUnitTest.java   |   26 +-
 ...gionBucketCreationDistributionDUnitTest.java |   10 +-
 .../cache/locks/TXLockServiceDUnitTest.java |   18 +-
 .../management/CacheManagementDUnitTest.java|  987 +-
 .../management/ClientHealthStatsDUnitTest.java  |  559 +++---
 .../management/CompositeTypeTestDUnitTest.java  |  189 +-
 .../management/DLockManagementDUnitTest.java|  520 ++
 .../management/DiskManagementDUnitTest.java |  789 +++-
 .../management/DistributedSystemDUnitTest.java  |  952 +++---
 .../geode/management/JMXMBeanDUnitTest.java |2 +-
 .../management/LocatorManagementDUnitTest.java  |  417 ++---
 .../geode/management/ManagementTestBase.java|  545 ++
 .../geode/management/ManagementTestRule.java|  430 +
 .../org/apache/geode/management/Manager.java|   31 +
 .../org/apache/geode/management/Member.java |   31 +
 .../management/OffHeapManagementDUnitTest.java  |  373 ++--
 .../geode/management/QueryDataDUnitTest.java| 1202 +---
 .../management/RegionManagementDUnitTest.java   | 1754 --
 .../stats/DistributedSystemStatsDUnitTest.java  |  104 +-
 .../QueryDataFunctionApplyLimitClauseTest.java  |   12 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |   88 +-
 .../pulse/TestSubscriptionsDUnitTest.java   |  292 +--
 .../geode/test/dunit/AsyncInvocation.java   |   63 +-
 .../org/apache/geode/test/dunit/Invoke.java |6 +-
 .../java/org/apache/geode/test/dunit/VM.java|7 +-
 .../java/org/apache/geode/test/dunit/Wait.java  |2 +
 .../cache/internal/JUnit4CacheTestCase.java |5 +
 .../internal/JUnit4DistributedTestCase.java |4 +-
 .../dunit/rules/DistributedDisconnectRule.java  |4 +-
 .../DistributedRestoreSystemProperties.java |4 +-
 .../geode/test/dunit/rules/DistributedRule.java |   68 +
 .../test/dunit/rules/DistributedRunRules.java   |   76 +
 .../test/dunit/rules/DistributedStatement.java  |   76 +
 .../test/dunit/rules/DistributedTestRule.java   |  192 ++
 .../DistributedUseJacksonForJsonPathRule.java   |   51 +
 .../dunit/rules/DistributedWrapperRule.java |   52 +
 .../geode/test/dunit/rules/RemoteInvoker.java   |   16 +-
 .../apache/geode/test/dunit/rules/WhichVMs.java |   58 +
 .../rules/tests/DistributedTestRuleTest.java|   54 +
 .../test/dunit/standalone/DUnitLauncher.java|   70 +-
 geode-junit/build.gradle|1 +
 .../junit/rules/UseJacksonForJsonPathRule.java  |  128 ++
 .../SerializableExternalResource.java   |   25 +-
 .../serializable/SerializableStatement.java |   27 +
 .../management/LuceneManagementDUnitTest.java   |   32 +-
 gradle/dependency-versions.properties   |3 +-
 52 files changed, 4838 insertions(+), 5656 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f3b5664c/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index c90a7a4..b989206 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -65,7 +65,6 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.management.ManagementTestBase;
 import 

[44/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

[klund]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24f496df/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
index f042f2c..71359be 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
@@ -14,22 +14,46 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.geode.management;
 
-import static org.junit.Assert.*;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.apache.geode.cache.Region.*;
+import static org.apache.geode.test.dunit.Host.*;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.assertj.core.api.Assertions.*;
 
+import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
 import javax.management.Notification;
 import javax.management.NotificationListener;
 import javax.management.ObjectName;
 
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -43,757 +67,505 @@ import org.apache.geode.cache.PartitionAttributes;
 import org.apache.geode.cache.PartitionAttributesFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.cache.Scope;
 import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.internal.cache.AbstractRegion;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.TestObjectSizerImpl;
 import org.apache.geode.internal.cache.lru.LRUStatistics;
 import 
org.apache.geode.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
 import org.apache.geode.management.internal.MBeanJMXAdapter;
 import org.apache.geode.management.internal.SystemManagementService;
-import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
 
 /**
  * This class checks and verifies various data and operations exposed through
  * RegionMXBean interface.
- * 
+ * 
  * Goal of the Test : RegionMBean gets created once region is created. Data 
like
  * Region Attributes data and stats are of proper value
- * 
- * 
  */
 @Category(DistributedTest.class)
+@SuppressWarnings({ "serial", "unused" })
 public class RegionManagementDUnitTest extends ManagementTestBase {
 
-  private static final long serialVersionUID = 1L;
-
-  private final String VERIFY_CONFIG_METHOD = "verifyConfigData";
+  private static final String REGION_NAME = "MANAGEMENT_TEST_REGION";
+  private static final String PARTITIONED_REGION_NAME = 
"MANAGEMENT_PAR_REGION";
+  private static final String FIXED_PR_NAME = "MANAGEMENT_FIXED_PR";
+  private static final String LOCAL_REGION_NAME = "TEST_LOCAL_REGION";
+