You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/05/05 22:21:09 UTC
incubator-geode git commit: GEODE-1350: first turn off the
Parameteried runner to have the tests run in night/CI builds
Repository: incubator-geode
Updated Branches:
refs/heads/develop 5817cdbfc -> 676b2a781
GEODE-1350: first turn off the Parameteried runner to have the tests run in night/CI builds
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/676b2a78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/676b2a78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/676b2a78
Branch: refs/heads/develop
Commit: 676b2a781c5243b9a92b156fa2631d4c451d5bab
Parents: 5817cdb
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Thu May 5 15:20:47 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Thu May 5 15:20:47 2016 -0700
----------------------------------------------------------------------
.../cli/commands/CliCommandTestBase.java | 21 --------------------
.../cli/commands/ConfigCommandsDUnitTest.java | 8 +-------
...eateAlterDestroyRegionCommandsDUnitTest.java | 6 ------
.../cli/commands/DeployCommandsDUnitTest.java | 8 +-------
.../commands/DiskStoreCommandsDUnitTest.java | 5 -----
.../cli/commands/FunctionCommandsDUnitTest.java | 8 +-------
.../commands/GemfireDataCommandsDUnitTest.java | 5 -----
...WithCacheLoaderDuringCacheMissDUnitTest.java | 9 +--------
.../cli/commands/IndexCommandsDUnitTest.java | 8 +-------
...stAndDescribeDiskStoreCommandsDUnitTest.java | 8 +-------
.../ListAndDescribeRegionDUnitTest.java | 5 -----
.../cli/commands/ListIndexCommandDUnitTest.java | 8 +-------
.../MiscellaneousCommandsDUnitTest.java | 8 +-------
...laneousCommandsExportLogsPart1DUnitTest.java | 8 +-------
...laneousCommandsExportLogsPart2DUnitTest.java | 9 +--------
...laneousCommandsExportLogsPart3DUnitTest.java | 10 ++--------
...laneousCommandsExportLogsPart4DUnitTest.java | 8 +-------
.../cli/commands/QueueCommandsDUnitTest.java | 8 +-------
.../SharedConfigurationCommandsDUnitTest.java | 8 +-------
.../cli/commands/ShellCommandsDUnitTest.java | 8 +-------
.../cli/commands/ShowMetricsDUnitTest.java | 8 +-------
.../cli/commands/ShowStackTraceDUnitTest.java | 8 +-------
.../cli/commands/UserCommandsDUnitTest.java | 8 +-------
.../security/GfshCommandsSecurityTest.java | 17 ++--------------
24 files changed, 21 insertions(+), 186 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index f2dc80f..5c6239b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@ -23,8 +23,6 @@ import java.io.IOException;
import java.io.PrintStream;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.Map;
import java.util.Properties;
import java.util.regex.Matcher;
@@ -45,8 +43,6 @@ import com.gemstone.gemfire.management.internal.security.JSONAuthorization;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.junit.runners.Parameterized;
-
/**
* Base class for all the CLI/gfsh command dunit tests.
*/
@@ -69,23 +65,6 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
protected String jmxHost;
- public CliCommandTestBase(){
- this(false);
- }
-
- // Junit will use the parameters to initialize the test class and run the tests with different parameters
- public CliCommandTestBase(boolean useHttpOnConnect){
- this.useHttpOnConnect = useHttpOnConnect;
- }
-
- @Parameterized.Parameters
- public static Collection parameters() {
- return Arrays.asList(new Object[][] {
- { false}, // useHttpOnConnect=false,
- { true } // useHttpOnConnect=true,
- });
- }
-
@Override
public final void preTearDownCacheTestCase() throws Exception {
preTearDownCliCommandTestBase();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 2d5dec3..c342142 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -57,11 +57,10 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.apache.commons.io.FileUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Dunit class for testing GemFire config commands : export config
@@ -69,7 +68,6 @@ import org.junit.runners.Parameterized;
* @since 7.0
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
@SuppressWarnings("serial")
public class ConfigCommandsDUnitTest extends CliCommandTestBase {
@@ -84,10 +82,6 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
File subDir = new File("ConfigCommandsDUnitTestSubDir");
File subManagerConfigFile = new File(subDir, managerConfigFile.getName());
- public ConfigCommandsDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
@Override
protected void preTearDownCliCommandTestBase() throws Exception {
deleteTestFiles();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index 087e826..530428d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -72,7 +72,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
@@ -91,11 +90,6 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
String alterVm2Name;
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
-
- public CreateAlterDestroyRegionCommandsDUnitTest(boolean useHttpOnConnect){
- super(useHttpOnConnect);
- }
-
/**
* Asserts that the "compressor" option for the "create region" command succeeds for a recognized compressor.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index e4b50b9..4bc92eb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -44,10 +44,9 @@ 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;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Unit tests for the DeployCommands class
@@ -56,7 +55,6 @@ import org.junit.runners.Parameterized;
*/
@Category(DistributedTest.class)
@SuppressWarnings("serial")
-@RunWith(Parameterized.class)
public class DeployCommandsDUnitTest extends CliCommandTestBase {
File newDeployableJarFile = new File("DeployCommandsDUnit1.jar");
@@ -64,10 +62,6 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
transient private ClassBuilder classBuilder = new ClassBuilder();
transient private CommandProcessor commandProcessor;
- public DeployCommandsDUnitTest(boolean useHttpOnConnect){
- super(useHttpOnConnect);
- }
-
@Override
public final void postSetUp() throws Exception {
this.commandProcessor = new CommandProcessor();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 731e07c..2502a4b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -83,15 +83,10 @@ import org.junit.runners.Parameterized;
*/
@Category(DistributedTest.class)
@SuppressWarnings("serial")
-@RunWith(Parameterized.class)
public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
- public DiskStoreCommandsDUnitTest(boolean useHttpOnConnect){
- super(useHttpOnConnect);
- }
-
@Test
public void testMissingDiskStore() {
final String regionName = "testShowMissingDiskStoreRegion";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index bc92409..8d1252b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -44,16 +44,14 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Dunit class for testing gemfire function commands : execute function, destroy function, list function
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class FunctionCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
@@ -61,10 +59,6 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
private static final String REGION_ONE = "RegionOne";
private static final String REGION_TWO = "RegionTwo";
- public FunctionCommandsDUnitTest(boolean useHttpOnConnect){
- super(useHttpOnConnect);
- }
-
void setupWith2Regions() {
final VM vm1 = Host.getHost(0).getVM(1);
final VM vm2 = Host.getHost(0).getVM(2);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 2966072..7097918 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -89,7 +89,6 @@ import org.junit.runners.Parameterized;
*/
@Category(DistributedTest.class)
@SuppressWarnings("serial")
-@RunWith(Parameterized.class)
public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
@@ -122,10 +121,6 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
final static int COUNT = 5;
- public GemfireDataCommandsDUnitTest(boolean useHttpOnConnect){
- super(useHttpOnConnect);
- }
-
public String getMemberId() {
Cache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index 55ef25c..5674b83 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -49,10 +49,9 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* The GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest class is test suite of test cases testing the Gfsh
@@ -65,7 +64,6 @@ import org.junit.runners.Parameterized;
*/
@SuppressWarnings("unused")
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends CliCommandTestBase {
private static final String GEMFIRE_MANAGER_NAME = "GemManagerNode";
@@ -73,11 +71,6 @@ public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends C
private static final String GEMFIRE_LOG_LEVEL = System.getProperty("logLevel", "config");
private static final String USERS_REGION_NAME = "Users";
-
- public GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest(boolean useHttpOnConnect){
- super(useHttpOnConnect);
- }
-
protected static String getRegionPath(final String regionName) {
return (regionName.startsWith(Region.SEPARATOR) ? regionName : String.format("%1$s%2$s", Region.SEPARATOR,
regionName));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index 529032c..3e6946a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -51,13 +51,11 @@ import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class IndexCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
@@ -67,10 +65,6 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
private static final String parRegPersName = "ParRegPers";
private static final String repRegPersName = "RepRegPer";
- public IndexCommandsDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
Region<?, ?> createParReg(String regionName, Cache cache, Class keyConstraint, Class valueConstraint) {
RegionFactory regionFactory = cache.createRegionFactory();
regionFactory.setDataPolicy(DataPolicy.PARTITION);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
index bb46b75..443c7c7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
@@ -36,10 +36,9 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* The ListAndDescribeDiskStoreCommandsDUnitTest class is a test suite of functional tests cases testing the proper
@@ -50,13 +49,8 @@ import org.junit.runners.Parameterized;
* @since 7.0
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBase {
- public ListAndDescribeDiskStoreCommandsDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
protected static String toString(final Result result) {
assert result != null : "The Result object from the command execution cannot be null!";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index a422fc7..e747685 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -50,7 +50,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
private static final String REGION1 = "region1";
@@ -62,10 +61,6 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
private static final String PR1 = "PR1";
private static final String LOCALREGIONONMANAGER = "LocalRegionOnManager";
- public ListAndDescribeRegionDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
static class CacheListener2 extends CacheListenerAdapter {
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index 97ca98a..e92d5bd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -52,10 +52,9 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the index-based GemFire shell
@@ -67,17 +66,12 @@ import org.junit.runners.Parameterized;
*/
@SuppressWarnings("unused")
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class ListIndexCommandDUnitTest extends CliCommandTestBase {
protected static final int DEFAULT_REGION_INITIAL_CAPACITY = 10000;
private final AtomicLong idGenerator = new AtomicLong(0l);
- public ListIndexCommandDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
protected static String toString(final Result result) {
assert result != null : "The Result object from the command execution cannot be null!";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index ec0f020..5238765 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -52,26 +52,20 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Dunit class for testing gemfire function commands : GC, Shutdown
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
private static String cachedLogLevel;
- public MiscellaneousCommandsDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
@Override
protected final void preTearDownCliCommandTestBase() throws Exception {
invokeInEveryVM(new SerializableRunnable("reset log level") {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
index 7660f79..c77ee63 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
@@ -36,24 +36,18 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Dunit class for testing gemfire function commands : export logs
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class MiscellaneousCommandsExportLogsPart1DUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
- public MiscellaneousCommandsExportLogsPart1DUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
void setupForExportLogs() {
final VM vm1 = Host.getHost(0).getVM(1);
setUpJmxManagerOnVm0ThenConnect(null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
index ee263ae..2019667 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
@@ -36,25 +36,18 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Dunit class for testing gemfire function commands : export logs
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class MiscellaneousCommandsExportLogsPart2DUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
- public MiscellaneousCommandsExportLogsPart2DUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
-
void setupForExportLogs() {
final VM vm1 = Host.getHost(0).getVM(1);
setUpJmxManagerOnVm0ThenConnect(null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index 967dfb1..57b94db 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@ -38,25 +38,19 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import com.gemstone.gemfire.test.junit.categories.FlakyTest;
/**
* Dunit class for testing gemfire function commands : export logs
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
- public MiscellaneousCommandsExportLogsPart3DUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
public String getMemberId() {
Cache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
index 3d837dc..c12b0a1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
@@ -36,24 +36,18 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Dunit class for testing gemfire function commands : export logs
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class MiscellaneousCommandsExportLogsPart4DUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
- public MiscellaneousCommandsExportLogsPart4DUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
void setupForExportLogs() {
final VM vm1 = Host.getHost(0).getVM(1);
setUpJmxManagerOnVm0ThenConnect(null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index 691533d..db14fdc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -46,10 +46,9 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* A distributed test suite of test cases for testing the queue commands that are part of Gfsh.
@@ -57,17 +56,12 @@ import org.junit.runners.Parameterized;
* @since 8.0
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class QueueCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
- public QueueCommandsDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
@Override
public final void preSetUp() throws Exception {
disconnectAllFromDS();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
index d871062..4bb9b81 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
@@ -51,18 +51,16 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.apache.commons.io.FileUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/***
* DUnit test to test export and import of shared configuration.
*/
@Category(DistributedTest.class)
@SuppressWarnings("unchecked")
-@RunWith(Parameterized.class)
public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
@@ -72,10 +70,6 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
File newDeployableJarFile = new File("DeployCommandsDUnit1.jar");
private transient ClassBuilder classBuilder = new ClassBuilder();
- public SharedConfigurationCommandsDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
@Test
public void testExportImportSharedConfiguration() {
disconnectAllFromDS();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
index d4fe871..b60f78c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
@@ -36,21 +36,15 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class ShellCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
- public ShellCommandsDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
@Override
public final void postSetUp() throws Exception {
getDefaultShell();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
index 5c2913c..2a20672 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -51,21 +51,15 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class ShowMetricsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
- public ShowMetricsDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
private void createLocalSetUp() {
Properties localProps = new Properties();
localProps.setProperty(DistributionConfig.NAME_NAME, "Controller");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
index eb79c48..2614091 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
@@ -32,24 +32,18 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/***
* DUnit test for 'show stack-trace' command
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class ShowStackTraceDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
- public ShowStackTraceDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
private void createCache(Properties props) {
getSystem(props);
getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
index 9f44c14..9ca6036 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
@@ -33,10 +33,9 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Unit tests for configuring user commands.
@@ -44,7 +43,6 @@ import org.junit.runners.Parameterized;
* @since 8.0
*/
@Category(DistributedTest.class)
-@RunWith(Parameterized.class)
public class UserCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
@@ -54,10 +52,6 @@ public class UserCommandsDUnitTest extends CliCommandTestBase {
final File jarFile = new File(this.jarDirectory, "UserCommandsDUnit.jar");
boolean deleteJarDirectory = false;
- public UserCommandsDUnitTest(boolean useHttpOnConnect) {
- super(useHttpOnConnect);
- }
-
@Override
public final void postSetUp() throws Exception {
createUserCommandJarFile();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/676b2a78/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshCommandsSecurityTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshCommandsSecurityTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshCommandsSecurityTest.java
index b5ef0a6..d96c96c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshCommandsSecurityTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshCommandsSecurityTest.java
@@ -19,8 +19,6 @@ package com.gemstone.gemfire.management.internal.security;
import static org.junit.Assert.*;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
import com.gemstone.gemfire.internal.AvailablePortHelper;
@@ -38,11 +36,8 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
@Category(IntegrationTest.class)
-@RunWith(Parameterized.class)
public class GfshCommandsSecurityTest {
private static int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
private static int jmxPort = ports[0];
@@ -57,16 +52,8 @@ public class GfshCommandsSecurityTest {
@Rule
public GfshShellConnectionRule gfshConnection = null;
- public GfshCommandsSecurityTest(boolean useHttp){
- gfshConnection = new GfshShellConnectionRule(jmxPort, httpPort, useHttp);
- }
-
- @Parameterized.Parameters
- public static Collection parameters() {
- return Arrays.asList(new Object[][] {
- { false}, // useHttp=false,
- { true } // useHttp=true,
- });
+ public GfshCommandsSecurityTest(){
+ gfshConnection = new GfshShellConnectionRule(jmxPort, httpPort, false);
}
@Before