Repository: geode Updated Branches: refs/heads/develop 00a0490d5 -> 77a0b9f8e
GEODE-3530: move FlakyTest category to class * add SuppressWarnings for serial * organize imports Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/77a0b9f8 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/77a0b9f8 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/77a0b9f8 Branch: refs/heads/develop Commit: 77a0b9f8e433465e266edd3a4c13ac8349fdd855 Parents: 1ea3451 Author: Kirk Lund <kl...@apache.org> Authored: Tue Aug 29 14:12:27 2017 -0700 Committer: Kirk Lund <kl...@apache.org> Committed: Tue Aug 29 14:32:53 2017 -0700 ---------------------------------------------------------------------- .../LauncherLifecycleCommandsDUnitTest.java | 9 +++- .../commands/AlterRegionCommandDUnitTest.java | 6 +-- .../cli/commands/ConfigCommandsDUnitTest.java | 38 +++++++-------- ...eateAlterDestroyRegionCommandsDUnitTest.java | 8 +-- .../commands/CreateRegionCommandDUnitTest.java | 8 +-- .../commands/DestroyRegionCommandDUnitTest.java | 6 ++- .../commands/DiskStoreCommandsDUnitTest.java | 11 ++--- .../cli/commands/FunctionCommandsDUnitTest.java | 41 +++++++++------- .../commands/GemfireDataCommandsDUnitTest.java | 48 +++++++++--------- ...WithCacheLoaderDuringCacheMissDUnitTest.java | 46 ++++++++++++------ ...stAndDescribeDiskStoreCommandsDUnitTest.java | 4 +- .../cli/commands/ListIndexCommandDUnitTest.java | 5 +- .../MiscellaneousCommandsDUnitTest.java | 21 +++----- .../cli/commands/QueueCommandsDUnitTest.java | 38 +++++++-------- .../RebalanceCommandDistributedTest.java | 15 +++--- .../cli/commands/ShellCommandsDUnitTest.java | 29 +++++------ .../cli/commands/ShowMetricsDUnitTest.java | 51 ++++++++++++-------- .../cli/commands/ShowStackTraceDUnitTest.java | 29 ++++++----- .../cli/commands/ClientCommandsTestUtils.java | 1 - .../DescribeClientCommandDUnitTest.java | 7 ++- .../DurableClientCommandsDUnitTest.java | 3 +- .../commands/ListClientCommandDUnitTest.java | 7 ++- .../cli/LuceneIndexCommandsDUnitTest.java | 2 +- .../ClusterConfigurationDUnitTest.java | 30 ++++++------ .../ConnectCommandWithHttpAndSSLDUnitTest.java | 31 ++++++++++-- ...RebalanceCommandOverHttpDistributedTest.java | 8 +-- 26 files changed, 282 insertions(+), 220 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java index 6e5d17c..f783c5d 100644 --- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java +++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java @@ -51,6 +51,7 @@ import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; import org.junit.FixMethodOrder; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; @@ -84,7 +85,9 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.dunit.WaitCriterion; +import org.apache.geode.test.dunit.rules.RequiresGeodeHome; import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; /** * The LauncherLifecycleCommandsDUnitTest class is a test suite of integration tests testing the @@ -101,10 +104,14 @@ import org.apache.geode.test.junit.categories.DistributedTest; * @see org.apache.geode.management.internal.cli.util.CommandStringBuilder * @since GemFire 7.0 */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530 @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@SuppressWarnings("serial") public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { + @Rule + public RequiresGeodeHome requiresGeodeHome = new RequiresGeodeHome(); + protected static final DateFormat TIMESTAMP = new SimpleDateFormat("yyyyMMddHHmmssSSS"); private final Queue<Integer> processIds = new ConcurrentLinkedDeque<>(); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java index fa368ab..f1dad7d 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java @@ -12,7 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.management.internal.cli.commands; import static org.apache.geode.distributed.ConfigurationProperties.GROUPS; @@ -50,8 +49,10 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3018 GEODE-3530 +@SuppressWarnings("serial") public class AlterRegionCommandDUnitTest extends CliCommandTestBase { + private final String alterRegionName = "testAlterRegionRegion"; private final String alterAsyncEventQueueId1 = "testAlterRegionQueue1"; private final String alterAsyncEventQueueId2 = "testAlterRegionQueue2"; @@ -138,7 +139,6 @@ public class AlterRegionCommandDUnitTest extends CliCommandTestBase { this.alterVm1.invoke(() -> getCache().getRegion(alterRegionName).destroyRegion()); } - @Category(FlakyTest.class) // GEODE-3018 @Test public void testAlterRegionResetCacheListeners() throws IOException { setUpJmxManagerOnVm0ThenConnect(null); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java index eeec317..a4f523c 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java @@ -41,13 +41,29 @@ import static org.apache.geode.test.dunit.Assert.fail; import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; import static org.apache.geode.test.dunit.Wait.waitForCriterion; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Collections; +import java.util.List; +import java.util.Properties; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.distributed.Locator; +import org.apache.geode.distributed.internal.ClusterConfigurationService; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.distributed.internal.InternalLocator; -import org.apache.geode.distributed.internal.ClusterConfigurationService; import org.apache.geode.internal.AvailablePortHelper; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator; @@ -66,28 +82,13 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.lang.management.ManagementFactory; -import java.lang.management.RuntimeMXBean; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Collections; -import java.util.List; -import java.util.Properties; /** * Dunit class for testing GemFire config commands : export config * * @since GemFire 7.0 */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1449 GEODE-3530 @SuppressWarnings("serial") public class ConfigCommandsDUnitTest extends CliCommandTestBase { @@ -186,8 +187,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { } } - @Category(FlakyTest.class) // GEODE-1449 - @Test + @Test // FlakyTest: GEODE-1449 public void testExportConfig() throws Exception { Properties localProps = new Properties(); localProps.setProperty(NAME, "Manager"); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java index f8644cb..eaf714c 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java @@ -73,9 +73,10 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-973 GEODE-2009 GEODE-3530 +@SuppressWarnings("serial") public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBase { - private static final long serialVersionUID = 1L; + private final List<String> filesToBeDeleted = new CopyOnWriteArrayList<>(); private void waitForRegionMBeanCreation(final String regionPath) { @@ -103,8 +104,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas * Asserts that creating, altering and destroying regions correctly updates the shared * configuration. */ - @Category(FlakyTest.class) // GEODE-2009 - @Test + @Test // FlakyTest: GEODE-2009 public void testCreateAlterDestroyUpdatesSharedConfig() throws Exception { disconnectAllFromDS(); final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java index 4c0d2c2..2c0fb06 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java @@ -47,8 +47,10 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-973 GEODE-3530 +@SuppressWarnings("serial") public class CreateRegionCommandDUnitTest extends CliCommandTestBase { + private final List<String> filesToBeDeleted = new CopyOnWriteArrayList<>(); /** @@ -149,9 +151,7 @@ public class CreateRegionCommandDUnitTest extends CliCommandTestBase { assertEquals(Result.Status.OK, cmdResult.getStatus()); } - @Category(FlakyTest.class) // GEODE-973: random ports, BindException, - // java.rmi.server.ExportException: Port already in use - @Test + @Test // FlakyTest: GEODE-973 public void testCreateRegion46391() throws IOException { setUpJmxManagerOnVm0ThenConnect(null); // GEODE-973: getRandomAvailablePort String region46391 = "region46391"; http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java index a3afe33..8598a4c 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java @@ -12,7 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.management.internal.cli.commands; import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION; @@ -72,9 +71,12 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530 +@SuppressWarnings("serial") public class DestroyRegionCommandDUnitTest extends CliCommandTestBase { + @Test public void testDestroyDistributedRegion() { setUpJmxManagerOnVm0ThenConnect(null); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java index 341216c..526a4c1 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java @@ -116,14 +116,13 @@ import org.apache.geode.test.junit.categories.FlakyTest; * @see org.junit.Test * @since GemFire 7.0 */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1206 GEODE-1406 GEODE-2102 GEODE-3530 @SuppressWarnings("serial") public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { private final List<String> filesToBeDeleted = new CopyOnWriteArrayList<>(); - @Category(FlakyTest.class) // GEODE-2102 - @Test + @Test // FlakyTest: GEODE-2102 public void testMissingDiskStore() { final String regionName = "testShowMissingDiskStoreRegion"; @@ -738,8 +737,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { /** * Asserts that creating and destroying disk stores correctly updates the shared configuration. */ - @Category(FlakyTest.class) // GEODE-1406 - @Test + @Test // FlakyTest: GEODE-1406 public void testCreateDestroyUpdatesSharedConfig() { disconnectAllFromDS(); final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2); @@ -1143,8 +1141,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { assertEquals(true, resultAsString.contains(vm1Name)); } - @Category(FlakyTest.class) // GEODE-1206: random ports, BindException - @Test + @Test // FlakyTest: GEODE-1206 public void testCreateDiskStore() { final String diskStore1Name = "testCreateDiskStore1"; final String diskStore2Name = "testCreateDiskStore2"; http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java index e03447f..a0788a0 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java @@ -14,6 +14,22 @@ */ package org.apache.geode.management.internal.cli.commands; +import static org.apache.geode.distributed.ConfigurationProperties.GROUPS; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.apache.geode.test.dunit.Assert.assertEquals; +import static org.apache.geode.test.dunit.Assert.assertFalse; +import static org.apache.geode.test.dunit.Assert.assertNotNull; +import static org.apache.geode.test.dunit.Assert.assertTrue; +import static org.apache.geode.test.dunit.Assert.fail; +import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; +import static org.apache.geode.test.dunit.Wait.waitForCriterion; + +import java.util.List; +import java.util.Properties; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionFactory; @@ -28,29 +44,22 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.json.GfJsonException; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.result.TabularResultData; -import org.apache.geode.test.dunit.*; +import org.apache.geode.test.dunit.Host; +import org.apache.geode.test.dunit.SerializableCallable; +import org.apache.geode.test.dunit.SerializableRunnable; +import org.apache.geode.test.dunit.VM; +import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.util.List; -import java.util.Properties; - -import static org.apache.geode.test.dunit.Assert.*; -import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; -import static org.apache.geode.test.dunit.Wait.waitForCriterion; -import static org.apache.geode.distributed.ConfigurationProperties.*; - /** * Dunit class for testing gemfire function commands : execute function, destroy function, list * function */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1563 GEODE-3530 +@SuppressWarnings("serial") public class FunctionCommandsDUnitTest extends CliCommandTestBase { - private static final long serialVersionUID = 1L; private static final String REGION_NAME = "FunctionCommandsReplicatedRegion"; private static final String REGION_ONE = "RegionOne"; private static final String REGION_TWO = "RegionTwo"; @@ -418,9 +427,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { } } - @Category(FlakyTest.class) // GEODE-1563: JMX RMI (java.rmi.NoSuchObjectException: no such object - // in table) - @Test + @Test // FlakyTest: GEODE-1563 public void testExecuteFunctionOnGroups() { Properties localProps = new Properties(); localProps.setProperty(NAME, "Manager"); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java index 9da8072..0247c79 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java @@ -15,11 +15,17 @@ package org.apache.geode.management.internal.cli.commands; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.apache.geode.test.dunit.Assert.*; -import static org.apache.geode.test.dunit.IgnoredException.*; -import static org.apache.geode.test.dunit.LogWriterUtils.*; -import static org.apache.geode.test.dunit.Wait.*; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.apache.geode.test.dunit.Assert.assertEquals; +import static org.apache.geode.test.dunit.Assert.assertFalse; +import static org.apache.geode.test.dunit.Assert.assertNotEquals; +import static org.apache.geode.test.dunit.Assert.assertNotNull; +import static org.apache.geode.test.dunit.Assert.assertNotSame; +import static org.apache.geode.test.dunit.Assert.assertTrue; +import static org.apache.geode.test.dunit.Assert.fail; +import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException; +import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; +import static org.apache.geode.test.dunit.Wait.waitForCriterion; import java.io.File; import java.io.IOException; @@ -91,7 +97,9 @@ import org.apache.geode.test.junit.categories.FlakyTest; /** * Dunit class for testing gemfire data commands : get, put, remove, select, rebalance */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1182 GEODE-1249 GEODE-1404 GEODE-1430 + // GEODE-1487 GEODE-1496 GEODE-1561 GEODE-1822 + // GEODE-2006 GEODE-3530 @SuppressWarnings("serial") public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { @@ -577,8 +585,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { validateResult(cmdResult, true); } - @Category(FlakyTest.class) // GEODE-2006 - @Test + @Test // FlakyTest: GEODE-2006 public void testSelectCommand() { setupForSelect(); doTestGetRegionAssociatedMembersForSelect(); @@ -984,8 +991,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { fail("Expected CompositeResult Returned Result Type " + cmdResult.getType()); } - @Test - @Category(FlakyTest.class) // GEODE-1249 + @Test // FlakyTest: GEODE-1249 public void testSimplePutIfAbsentCommand() { final String keyPrefix = "testKey"; final String valuePrefix = "testValue"; @@ -1047,8 +1053,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { vm2.invoke(checkPutIfAbsentKeys); } - @Category(FlakyTest.class) // GEODE-1496 (http) - @Test + @Test // FlakyTest: GEODE-1496 (http) public void testSimpleRemoveCommand() { final String keyPrefix = "testKey"; final String valuePrefix = "testValue"; @@ -1283,8 +1288,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { } } - @Category(FlakyTest.class) // GEODE-1822 - @Test + @Test // FlakyTest: GEODE-1822 public void testGetLocateEntryLocationsForPR() { final String keyPrefix = "testKey"; final String valuePrefix = "testValue"; @@ -1380,9 +1384,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { vm2.invoke(checkPutKeysInVM2); } - @Category(FlakyTest.class) // GEODE-1182: random ports, BindException, HeadlessGFSH, - // waitForCriterion, time sensitive - @Test + @Test // FlakyTest: GEODE-1182 public void testGetLocateEntryJsonKeys() { final String keyPrefix = "testKey"; @@ -1507,8 +1509,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { } } - @Category(FlakyTest.class) // GEODE-1430 - @Test + @Test // FlakyTest: GEODE-1430 public void testPutJsonKeys() { final String keyPrefix = "testKey"; @@ -1718,8 +1719,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { return regionFactory.create(regionName); } - @Category(FlakyTest.class) // GEODE-1404 - @Test + @Test // FlakyTest: GEODE-1404 public void testImportExportData() throws InterruptedException, IOException { final String regionName = "Region1"; final String exportFileName = "export.gfd"; @@ -2099,8 +2099,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { } } - @Category(FlakyTest.class) // GEODE-1561 - @Test + @Test // FlakyTest: GEODE-1561 public void testSimulateForEntireDS() { setupTestRebalanceForEntireDS(); // check if DistributedRegionMXBean is available so that command will not fail @@ -2148,8 +2147,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { } } - @Category(FlakyTest.class) // GEODE-1487 - @Test + @Test // FlakyTest: GEODE-1487 public void testRebalanceForEntireDS() { setupTestRebalanceForEntireDS(); // check if DistributedRegionMXBean is available so that command will not fail http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java index cebb7f1..5956433 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java @@ -14,7 +14,33 @@ */ package org.apache.geode.management.internal.cli.commands; -import org.apache.geode.cache.*; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.apache.geode.test.dunit.Assert.assertEquals; +import static org.apache.geode.test.dunit.Assert.assertFalse; +import static org.apache.geode.test.dunit.Assert.assertNotNull; +import static org.apache.geode.test.dunit.Assert.assertNull; +import static org.apache.geode.test.dunit.Assert.assertTrue; +import static org.apache.geode.test.dunit.Assert.fail; +import static org.apache.geode.test.dunit.Host.getHost; +import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; +import static org.apache.geode.test.dunit.Wait.waitForCriterion; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.RegionShortcut; import org.apache.geode.management.DistributedRegionMXBean; import org.apache.geode.management.ManagementService; import org.apache.geode.management.ManagerMXBean; @@ -30,19 +56,7 @@ import org.apache.geode.test.dunit.SerializableRunnableIF; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.junit.categories.DistributedTest; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.apache.geode.test.dunit.Assert.*; -import static org.apache.geode.test.dunit.Host.getHost; -import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; -import static org.apache.geode.test.dunit.Wait.waitForCriterion; +import org.apache.geode.test.junit.categories.FlakyTest; /** * The GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest class is test suite of test cases @@ -53,8 +67,8 @@ import static org.apache.geode.test.dunit.Wait.waitForCriterion; * @see org.apache.geode.management.internal.cli.commands.GetCommand * @since GemFire 8.0 */ -@SuppressWarnings("unused") -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530 +@SuppressWarnings("serial") public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends CliCommandTestBase { private static final String GEMFIRE_MANAGER_NAME = "GemManagerNode"; http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java index 1fe0bd1..bbd0b6c 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java @@ -40,6 +40,7 @@ import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.SerializableRunnableIF; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; /** * The ListAndDescribeDiskStoreCommandsDUnitTest class is a test suite of functional tests cases @@ -52,7 +53,8 @@ import org.apache.geode.test.junit.categories.DistributedTest; * * @since GemFire 7.0 */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530 +@SuppressWarnings("serial") public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBase { @Override http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java index 7b9afc3..226925f 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java @@ -58,6 +58,7 @@ import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.SerializableRunnableIF; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; /** * The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the @@ -72,8 +73,8 @@ import org.apache.geode.test.junit.categories.DistributedTest; * @see org.apache.geode.management.internal.cli.commands.ListIndexCommand * @since GemFire 7.0 */ -@SuppressWarnings("unused") -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530 +@SuppressWarnings("serial") public class ListIndexCommandDUnitTest extends CliCommandTestBase { private static final int DEFAULT_REGION_INITIAL_CAPACITY = 10000; http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java index 674a0b6..3aeff61 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java @@ -66,10 +66,11 @@ import org.apache.geode.test.junit.categories.FlakyTest; /** * DUnit class for testing gemfire function commands : GC, Shutdown */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1034 GEODE-1385 GEODE-1518 GEODE-1605 + // GEODE-1706 GEODE-2126 GEODE-3530 +@SuppressWarnings("serial") public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { - private static final long serialVersionUID = 1L; private static String cachedLogLevel; @Override @@ -84,9 +85,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { }); } - @Category(FlakyTest.class) // GEODE-1034: random ports, GC sensitive, memory sensitive, - // HeadlessGFSH - @Test + @Test // FlakyTest: GEODE-1034 public void testGCForGroup() { Properties localProps = new Properties(); localProps.setProperty(NAME, "Manager"); @@ -155,8 +154,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { } } - @Category(FlakyTest.class) // GEODE-2126 - @Test + @Test // FlakyTest: GEODE-2126 public void testShowLogNumLines() { Properties props = new Properties(); props.setProperty(LOG_FILE, "testShowLogNumLines.log"); @@ -231,8 +229,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { }); } - @Category(FlakyTest.class) // GEODE-1706 - @Test + @Test // FlakyTest: GEODE-1706 public void testShutDownWithoutTimeout() { addIgnoredException("EntryDestroyedException"); @@ -302,8 +299,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { assertFalse(defaultShell.isConnectedAndReady()); } - @Category(FlakyTest.class) // GEODE-1385, 1518: time sensitive, HeadlessGfsh - @Test + @Test // FlakyTest: GEODE-1385 GEODE-1518 public void testShutDownForTIMEOUT() { setupForShutDown(); ThreadUtils.sleep(2500); @@ -410,8 +406,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { assertTrue(Boolean.FALSE.equals(vm0.invoke(connectedChecker))); } - @Category(FlakyTest.class) // GEODE-1605 - @Test + @Test // FlakyTest: GEODE-1605 public void testChangeLogLevelForMembers() { final VM vm0 = Host.getHost(0).getVM(0); final VM vm1 = Host.getHost(0).getVM(1); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java index 163e0b0..8de6f89 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java @@ -34,7 +34,21 @@ import static org.apache.geode.test.dunit.Assert.fail; import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; import static org.apache.geode.test.dunit.Wait.waitForCriterion; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.nio.file.Files; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.CopyOnWriteArrayList; + import org.apache.commons.io.FileUtils; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; import org.apache.geode.distributed.Locator; @@ -53,30 +67,16 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.nio.file.Files; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.CopyOnWriteArrayList; /** * A distributed test suite of test cases for testing the queue commands that are part of Gfsh. * * @since GemFire 8.0 */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1429 GEODE-1976 GEODE-3530 +@SuppressWarnings("serial") public class QueueCommandsDUnitTest extends CliCommandTestBase { - private static final long serialVersionUID = 1L; - private final List<String> filesToBeDeleted = new CopyOnWriteArrayList<>(); @Override @@ -84,8 +84,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase { disconnectAllFromDS(); } - @Category(FlakyTest.class) // GEODE-1429 - @Test + @Test // FlakyTest: GEODE-1429 public void testAsyncEventQueue() throws IOException { final String queue1Name = "testAsyncEventQueue1"; final String queue2Name = "testAsyncEventQueue2"; @@ -267,8 +266,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase { /** * Asserts that creating async event queues correctly updates the shared configuration. */ - @Category(FlakyTest.class) // GEODE-1976 - @Test + @Test // FlakyTest: GEODE-1976 public void testCreateUpdatesSharedConfig() throws IOException { disconnectAllFromDS(); final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java index d8c3095..19dcfde 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java @@ -18,6 +18,12 @@ import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; import static org.apache.geode.test.dunit.Wait.waitForCriterion; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.ProvideSystemProperty; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionFactory; @@ -31,13 +37,10 @@ import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.junit.categories.DistributedTest; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.ProvideSystemProperty; -import org.junit.experimental.categories.Category; +import org.apache.geode.test.junit.categories.FlakyTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530 +@SuppressWarnings("serial") public class RebalanceCommandDistributedTest extends CliCommandTestBase { private static final String REBALANCE_REGION_NAME = http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java index 93bba3c..255013e 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java @@ -14,6 +14,18 @@ */ package org.apache.geode.management.internal.cli.commands; +import static org.apache.geode.test.dunit.Assert.assertEquals; +import static org.apache.geode.test.dunit.Assert.assertNotNull; +import static org.apache.geode.test.dunit.Assert.assertTrue; +import static org.apache.geode.test.dunit.Assert.fail; +import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; + +import java.io.File; +import java.util.concurrent.TimeUnit; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.distributed.AbstractLauncher.Status; import org.apache.geode.distributed.LocatorLauncher; import org.apache.geode.distributed.LocatorLauncher.LocatorState; @@ -29,20 +41,11 @@ import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.io.File; -import java.util.concurrent.TimeUnit; -import static org.apache.geode.test.dunit.Assert.*; -import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; - -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-989 GEODE-3530 +@SuppressWarnings("serial") public class ShellCommandsDUnitTest extends CliCommandTestBase { - private static final long serialVersionUID = 1L; - @Override public final void postSetUpCliCommandTestBase() throws Exception { getDefaultShell(); @@ -53,9 +56,7 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase { .addOption(CliStrings.CONNECT__LOCATOR, "localhost[" + locatorPort + "]").toString()); } - @Category(FlakyTest.class) // GEODE-989: random ports, suspect string: DiskAccessException, disk - // pollution, HeadlessGfsh, time sensitive - @Test + @Test // FlakyTest: GEODE-989 public void testConnectToLocatorBecomesManager() { final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java index 5c94c3a..b804099 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java @@ -14,6 +14,22 @@ */ package org.apache.geode.management.internal.cli.commands; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.apache.geode.test.dunit.Assert.assertEquals; +import static org.apache.geode.test.dunit.Assert.assertTrue; +import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; +import static org.apache.geode.test.dunit.Wait.waitForCriterion; + +import java.io.File; +import java.io.IOException; +import java.util.Collections; +import java.util.Properties; + +import javax.management.ObjectName; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionFactory; @@ -21,35 +37,29 @@ import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.AvailablePortHelper; -import org.apache.geode.management.*; +import org.apache.geode.management.CacheServerMXBean; +import org.apache.geode.management.DistributedRegionMXBean; +import org.apache.geode.management.DistributedSystemMXBean; +import org.apache.geode.management.ManagementService; +import org.apache.geode.management.MemberMXBean; +import org.apache.geode.management.RegionMXBean; import org.apache.geode.management.cli.Result; import org.apache.geode.management.cli.Result.Status; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.remote.CommandProcessor; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.test.dunit.*; +import org.apache.geode.test.dunit.Host; +import org.apache.geode.test.dunit.SerializableCallable; +import org.apache.geode.test.dunit.SerializableRunnable; +import org.apache.geode.test.dunit.VM; +import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import javax.management.ObjectName; -import java.io.File; -import java.io.IOException; -import java.util.Collections; -import java.util.Properties; -import static org.apache.geode.test.dunit.Assert.assertEquals; -import static org.apache.geode.test.dunit.Assert.assertTrue; -import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; -import static org.apache.geode.test.dunit.Wait.waitForCriterion; -import static org.apache.geode.distributed.ConfigurationProperties.*; - -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1764 GEODE-3530 +@SuppressWarnings("serial") public class ShowMetricsDUnitTest extends CliCommandTestBase { - private static final long serialVersionUID = 1L; - private void createLocalSetUp() { Properties localProps = new Properties(); localProps.setProperty(NAME, "Controller"); @@ -220,8 +230,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase { return waitCriterion; } - @Category(FlakyTest.class) // GEODE-1764 - @Test + @Test // FlakyTest: GEODE-1764 public void testShowMetricsMember() throws ClassNotFoundException, IOException, InterruptedException { systemSetUp(); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java index 51653a4..b8b96be 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java @@ -14,14 +14,25 @@ */ package org.apache.geode.management.internal.cli.commands; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.apache.geode.test.dunit.Assert.*; -import static org.apache.geode.test.dunit.LogWriterUtils.*; +import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_TIME_STATISTICS; +import static org.apache.geode.distributed.ConfigurationProperties.GROUPS; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED; +import static org.apache.geode.test.dunit.Assert.assertFalse; +import static org.apache.geode.test.dunit.Assert.assertTrue; +import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; import java.io.File; import java.io.IOException; import java.util.Properties; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.rules.TemporaryFolder; + import org.apache.geode.management.cli.Result.Status; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.json.GfJsonException; @@ -31,20 +42,16 @@ import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.TemporaryFolder; -/*** +/** * DUnit test for 'show stack-trace' command */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530 +@SuppressWarnings("serial") public class ShowStackTraceDUnitTest extends CliCommandTestBase { - private static final long serialVersionUID = 1L; - @Rule public TemporaryFolder workDirectory = new SerializableTemporaryFolder(); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsTestUtils.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsTestUtils.java b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsTestUtils.java index bf29918..5ab63e8 100644 --- a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsTestUtils.java +++ b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsTestUtils.java @@ -12,7 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.management.internal.cli.commands; import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION; http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommandDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommandDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommandDUnitTest.java index 33527f8..37170b1 100644 --- a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommandDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommandDUnitTest.java @@ -75,10 +75,10 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-910 GEODE-3530 +@SuppressWarnings("serial") public class DescribeClientCommandDUnitTest extends CliCommandTestBase { - private static final long serialVersionUID = 1L; private final String regionName = "stocks"; private final String cq1 = "cq1"; private final String cq2 = "cq2"; @@ -283,8 +283,7 @@ public class DescribeClientCommandDUnitTest extends CliCommandTestBase { ClientCommandsTestUtils.closeCacheServer(Host.getHost(0).getVM(1)); } - @Category(FlakyTest.class) // GEODE-910: random ports, HeadlessGfsh - @Test + @Test // FlakyTest: GEODE-910 public void testDescribeClientForNonSubscribedClient() throws Exception { setUpNonSubscribedClient(); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java index ef3b4a7..a6512a6 100644 --- a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java @@ -59,7 +59,8 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1705, GEODE-3404, GEODE-3359 +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1705 GEODE-3404 GEODE-3359 GEODE-3530 +@SuppressWarnings("serial") public class DurableClientCommandsDUnitTest extends CliCommandTestBase { private static final String REGION_NAME = "stocks"; http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ListClientCommandDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ListClientCommandDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ListClientCommandDUnitTest.java index fb08afa..81e318e 100644 --- a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ListClientCommandDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ListClientCommandDUnitTest.java @@ -68,16 +68,15 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-908 GEODE-3530 +@SuppressWarnings("serial") public class ListClientCommandDUnitTest extends CliCommandTestBase { - private static final long serialVersionUID = 1L; private final String regionName = "stocks"; private int port0 = 0; private int port1 = 0; - @Category(FlakyTest.class) // GEODE-908: random ports, BindException, time sensitive, HeadlessGfsh - @Test + @Test // FlakyTest: GEODE-908 public void testListClient() throws Exception { setupSystemForListClient(); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java index 10409ca..c73952d 100755 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java @@ -64,9 +64,9 @@ import org.apache.geode.test.junit.categories.DistributedTest; @Category(DistributedTest.class) @RunWith(JUnitParamsRunner.class) +@SuppressWarnings("serial") public class LuceneIndexCommandsDUnitTest extends CliCommandTestBase { - @Before public void createJMXManager() { disconnectAllFromDS(); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java index 9eb423f..ddb8d45 100644 --- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java @@ -39,6 +39,17 @@ import static org.apache.geode.test.dunit.Host.getHost; import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException; import static org.apache.geode.test.dunit.Wait.waitForCriterion; +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.HashSet; +import java.util.Properties; +import java.util.Set; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.Region; @@ -68,18 +79,9 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; - -@Category(DistributedTest.class) +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1333 GEODE-1334 GEODE-3530 +@SuppressWarnings("serial") public class ClusterConfigurationDUnitTest extends CliCommandTestBase { private static final int TIMEOUT = 10000; @@ -113,8 +115,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { * * @since GemFire 8.1 */ - @Category(FlakyTest.class) // GEODE-1334 - @Test + @Test // FlakyTest: GEODE-1334 public void testCreateExtensions() throws Exception { Object[] result = setup(); final int locatorPort = (Integer) result[0]; @@ -184,8 +185,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { * * @since GemFire 8.1 */ - @Category(FlakyTest.class) // GEODE-1333 - @Test + @Test // FlakyTest: GEODE-1333 public void testDestroyExtensions() throws Exception { Object[] result = setup(); final int locatorPort = (Integer) result[0]; http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java index 8ab45b7..d8ef3a8 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java @@ -14,10 +14,29 @@ */ package org.apache.geode.management.internal.cli.commands; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.apache.geode.management.internal.cli.i18n.CliStrings.*; -import static org.apache.geode.util.test.TestUtil.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_CIPHERS; +import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_ENABLED; +import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE; +import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD; +import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_TYPE; +import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_PROTOCOLS; +import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION; +import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE; +import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT__KEY_STORE; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT__KEY_STORE_PASSWORD; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT__SSL_CIPHERS; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT__SSL_PROTOCOLS; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT__TRUST_STORE; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT__TRUST_STORE_PASSWORD; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT__URL; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT__USE_HTTP; +import static org.apache.geode.management.internal.cli.i18n.CliStrings.CONNECT__USE_SSL; +import static org.apache.geode.util.test.TestUtil.getResourcePath; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; import java.io.File; import java.util.Arrays; @@ -38,15 +57,17 @@ import org.apache.geode.management.internal.cli.HeadlessGfsh; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.test.junit.categories.SecurityTest; import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory; /** * @since GemFire 8.1 */ -@Category({DistributedTest.class, SecurityTest.class}) +@Category({DistributedTest.class, SecurityTest.class, FlakyTest.class}) // GEODE-3530 @RunWith(Parameterized.class) @Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class) +@SuppressWarnings("serial") public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { private static final ThreadLocal<Properties> sslInfoHolder = new ThreadLocal<>(); http://git-wip-us.apache.org/repos/asf/geode/blob/77a0b9f8/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java index 6101744..733f047 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java @@ -14,13 +14,15 @@ */ package org.apache.geode.management.internal.cli.commands; -import org.apache.geode.test.junit.categories.DistributedTest; import org.junit.ClassRule; import org.junit.contrib.java.lang.system.ProvideSystemProperty; import org.junit.experimental.categories.Category; -@Category(DistributedTest.class) -@SuppressWarnings("deprecated") +import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; + +@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530 +@SuppressWarnings("serial") public class RebalanceCommandOverHttpDistributedTest extends RebalanceCommandDistributedTest { @ClassRule