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/04/15 05:08:01 UTC
[32/32] incubator-geode git commit: GEODE-17: fix compilation errors
after merge from develop
GEODE-17: fix compilation errors after merge from develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/151472c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/151472c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/151472c7
Branch: refs/heads/feature/GEODE-17-2
Commit: 151472c7095bff612bd38272391fcc040bec428f
Parents: 31c6054
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Thu Apr 14 20:06:22 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Thu Apr 14 20:06:22 2016 -0700
----------------------------------------------------------------------
.../cli/commands/CliCommandTestBase.java | 21 ++--------
.../cli/commands/DeployCommandsDUnitTest.java | 19 ++++-----
.../cli/commands/IndexCommandsDUnitTest.java | 19 +++++----
.../WanCommandPauseResumeDUnitTest.java | 42 ++++++++++----------
4 files changed, 41 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/151472c7/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 7d65ce7..de239d7 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
@@ -25,6 +25,8 @@ import java.io.PrintWriter;
import java.io.StringWriter;
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.Set;
@@ -48,23 +50,6 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.junit.runners.Parameterized;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-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.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-
/**
* Base class for all the CLI/gfsh command dunit tests.
*/
@@ -283,7 +268,7 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
CommandResult result = executeCommand(shell, command.toString());
if (!shell.isConnectedAndReady()) {
- throw new TestException(
+ throw new AssertionError(
"Connect command failed to connect to manager " + endpoint + " result=" + commandResultToString(result));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/151472c7/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 a314681..db84f84 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
@@ -16,6 +16,14 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
@@ -36,20 +44,11 @@ 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 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;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-
/**
* Unit tests for the DeployCommands class
*
@@ -57,8 +56,6 @@ import static com.gemstone.gemfire.test.dunit.Assert.*;
*/
@Category(DistributedTest.class)
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
-@SuppressWarnings("serial")
@RunWith(Parameterized.class)
public class DeployCommandsDUnitTest extends CliCommandTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/151472c7/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 ab8097c..70aba5d 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
@@ -16,6 +16,12 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.DiskStoreFactory;
@@ -45,17 +51,10 @@ 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;
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-
@Category({ DistributedTest.class, FlakyTest.class }) // see GEODE-689, GEODE-1048
@RunWith(Parameterized.class)
public class IndexCommandsDUnitTest extends CliCommandTestBase {
@@ -638,7 +637,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
Properties managerProps = new Properties();
managerProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
managerProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort);
- createDefaultSetup(managerProps);
+ setUpJmxManagerOnVm0ThenConnect(managerProps);
// Create a cache in VM 1
VM vm = Host.getHost(0).getVM(1);
@@ -756,7 +755,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
private void setupSystem() {
disconnectAllFromDS();
- createDefaultSetup(null);
+ setUpJmxManagerOnVm0ThenConnect(null);
final String parRegName = "StocksParReg";
final VM manager = Host.getHost(0).getVM(0);
@@ -786,7 +785,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
private void setupSystemPersist() {
disconnectAllFromDS();
- createDefaultSetup(null);
+ setUpJmxManagerOnVm0ThenConnect(null);
final String parRegName = "StocksParReg";
final VM manager = Host.getHost(0).getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/151472c7/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index 5a352c1..17986e0 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -81,26 +81,26 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testPauseGatewaySender_onMember() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createCache( punePort ));
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+ vm3.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+ final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
+ CliStrings.PAUSE_GATEWAYSENDER__ID + "=ln --"
@@ -116,7 +116,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testPauseGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
}
@@ -133,23 +133,23 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createCache( punePort ));
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm4.invoke(() -> createCache( punePort ));
+ vm4.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm5.invoke(() -> createCache( punePort ));
+ vm5.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
vm3.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
pause(10000);
@@ -172,11 +172,11 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testPauseGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, true ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, true ));
}