You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/02/11 01:38:49 UTC
[15/61] [abbrv] [partial] incubator-geode git commit: GEODE-773:
Extract static methods from DistributedTestCase
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
index 74aedd1..3d462f4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
@@ -25,6 +25,7 @@ import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -96,11 +97,11 @@ public class MiscellaneousCommandsExportLogsPart2DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForLogLevel" + dir, null, null, logLevel, false,
false, start, end, 1);
- getLogWriter().info("testExportLogsForLogLevel command=" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForLogLevel command=" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- getLogWriter().info("testExportLogsForLogLevel cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForLogLevel cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForLogLevel failed as did not get CommandResult");
@@ -128,11 +129,11 @@ public class MiscellaneousCommandsExportLogsPart2DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForLogLevelWithUPTOLOGLEVEL" + dir, null, null,
logLevel, true, false, start, end, 1);
- getLogWriter().info("testExportLogsForLogLevelWithUPTOLOGLEVEL command=" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForLogLevelWithUPTOLOGLEVEL command=" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- getLogWriter().info("testExportLogsForLogLevelWithUPTOLOGLEVEL cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForLogLevelWithUPTOLOGLEVEL cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
@@ -140,9 +141,4 @@ public class MiscellaneousCommandsExportLogsPart2DUnitTest extends CliCommandTes
}
FileUtil.delete(new File("testExportLogsForLogLevelWithUPTOLOGLEVEL" + dir));
}
-
- @Override
- public void tearDown2() throws Exception {
- super.tearDown2();
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index 9bce503..7d67b61 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@ -26,6 +26,7 @@ import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -103,10 +104,10 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForGroup" + dir, groups, null, logLevel, false,
false, start, end, 1);
- getLogWriter().info("testExportLogsForGroup command result =" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForGroup command result =" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- getLogWriter().info("testExportLogsForGroup cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForGroup cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForGroup failed as did not get CommandResult");
@@ -136,11 +137,11 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForMember" + dir, null, vm1MemberId, logLevel,
false, false, start, end, 1);
- getLogWriter().info("testExportLogsForMember command result =" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForMember command result =" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- getLogWriter().info("testExportLogsForMember cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForMember cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForMember failed as did not get CommandResult");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
index 11c3afd..2d11580 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
@@ -25,6 +25,7 @@ import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -51,11 +52,6 @@ public class MiscellaneousCommandsExportLogsPart4DUnitTest extends CliCommandTes
return cache.getDistributedSystem().getDistributedMember().getId();
}
- @Override
- public void tearDown2() throws Exception {
- super.tearDown2();
- }
-
void setupForExportLogs() {
final VM vm1 = Host.getHost(0).getVM(1);
createDefaultSetup(null);
@@ -99,11 +95,11 @@ public class MiscellaneousCommandsExportLogsPart4DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForTimeRange1" + dir, null, null, logLevel, false,
false, start, end, 1);
- getLogWriter().info("testExportLogsForTimeRange1 command result =" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForTimeRange1 command result =" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- getLogWriter().info("testExportLogsForTimeRange1 cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForTimeRange1 cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForTimeRange1 failed as did not get CommandResult");
@@ -127,11 +123,11 @@ public class MiscellaneousCommandsExportLogsPart4DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForTimeRangeForOnlyStartTime" + dir, null, null,
logLevel, false, false, s, null, 1);
- getLogWriter().info("testExportLogsForTimeRangeForOnlyStartTime command result =" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForTimeRangeForOnlyStartTime command result =" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- getLogWriter().info("testExportLogsForTimeRangeForOnlyStartTime cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForTimeRangeForOnlyStartTime cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForTimeRangeForOnlyStartTime failed as did not get CommandResult");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index 78540ac..e6c1e47 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -29,10 +29,13 @@ import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import java.io.File;
import java.io.FileOutputStream;
@@ -256,7 +259,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -267,7 +270,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
}
@@ -334,7 +337,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
xmlFromConfig = sharedConfig.getConfiguration(groupName).getCacheXmlContent();
assertTrue(xmlFromConfig.contains(queueName));
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
@@ -366,7 +369,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
}
@Override
- public void tearDown2() throws Exception {
+ protected final void preTearDownCliCommandTestBase() throws Exception {
for (String path : this.filesToBeDeleted) {
try {
final File fileToDelete = new File(path);
@@ -375,11 +378,10 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
executeCommand("undeploy --jar=" + fileToDelete.getName());
}
} catch (IOException e) {
- getLogWriter().error("Unable to delete file", e);
+ LogWriterUtils.getLogWriter().error("Unable to delete file", e);
}
}
this.filesToBeDeleted.clear();
- super.tearDown2();
}
private void writeJarBytesToFile(File jarFile, byte[] jarBytes) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
index b937fa9..9dc9506 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
@@ -34,11 +34,14 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.management.internal.configuration.SharedConfigurationDUnitTest;
import com.gemstone.gemfire.management.internal.configuration.domain.Configuration;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import org.apache.commons.io.FileUtils;
@@ -121,7 +124,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile,
null, locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -132,7 +135,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
+ Wait.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
}
@@ -211,23 +214,23 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
cmdResult = executeCommand(commandStringBuilder.getCommandString());
String resultString = commandResultToString(cmdResult);
- getLogWriter().info("#SB Result\n");
- getLogWriter().info(resultString);
+ LogWriterUtils.getLogWriter().info("#SB Result\n");
+ LogWriterUtils.getLogWriter().info(resultString);
assertEquals(true, cmdResult.getStatus().equals(Status.OK));
commandStringBuilder = new CommandStringBuilder(CliStrings.STATUS_SHARED_CONFIG);
cmdResult = executeCommand(commandStringBuilder.getCommandString());
resultString = commandResultToString(cmdResult);
- getLogWriter().info("#SB Result\n");
- getLogWriter().info(resultString);
+ LogWriterUtils.getLogWriter().info("#SB Result\n");
+ LogWriterUtils.getLogWriter().info(resultString);
assertEquals(Status.OK, cmdResult.getStatus());
commandStringBuilder = new CommandStringBuilder(CliStrings.EXPORT_SHARED_CONFIG);
commandStringBuilder.addOption(CliStrings.EXPORT_SHARED_CONFIG__FILE, sharedConfigZipFileName);
cmdResult = executeCommand(commandStringBuilder.getCommandString());
resultString = commandResultToString(cmdResult);
- getLogWriter().info("#SB Result\n");
- getLogWriter().info(resultString);
+ LogWriterUtils.getLogWriter().info("#SB Result\n");
+ LogWriterUtils.getLogWriter().info(resultString);
assertEquals(Status.OK, cmdResult.getStatus());
//Import into a running system should fail
@@ -287,7 +290,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator2Port, locatorLogFile,
null, locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -298,7 +301,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
SharedConfiguration sc = locator.getSharedConfiguration();
assertNotNull(sc);
@@ -318,7 +321,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
@@ -330,8 +333,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
}
@Override
- public void tearDown2() throws Exception {
- super.tearDown2();
+ protected final void postTearDownCacheTestCase() throws Exception {
for (int i = 0; i < 4; i++) {
Host.getHost(0).getVM(i).invoke(SharedConfigurationDUnitTest.locatorCleanup);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
index c8695ad..2ff86ba 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
@@ -28,6 +28,8 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+
import org.junit.Before;
import java.io.File;
@@ -65,7 +67,7 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase {
assertEquals(String.valueOf(jmxManagerPort), System.getProperty("gemfire.jmx-manager-port"));
assertEquals("0", System.getProperty("gemfire.jmx-manager-http-port"));
- final String pathname = (getClass().getSimpleName() + "_" + getTestName());
+ final String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
final File workingDirectory = new File(pathname);
workingDirectory.mkdir();
@@ -104,7 +106,7 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase {
if (gfshInstance == null) {
fail("In testEcho command gfshInstance is null");
}
- getLogWriter().info("Gsh " + gfshInstance);
+ LogWriterUtils.getLogWriter().info("Gsh " + gfshInstance);
gfshInstance.setEnvProperty("TESTSYS", "SYS_VALUE");
printAllEnvs(gfshInstance);
@@ -334,9 +336,9 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase {
if (cmdResult != null) {
assertEquals(Result.Status.OK, cmdResult.getStatus());
- getLogWriter().info("testClearHistory cmdResult=" + commandResultToString(cmdResult));
+ LogWriterUtils.getLogWriter().info("testClearHistory cmdResult=" + commandResultToString(cmdResult));
String resultString = commandResultToString(cmdResult);
- getLogWriter().info("testClearHistory resultString=" + resultString);
+ LogWriterUtils.getLogWriter().info("testClearHistory resultString=" + resultString);
assertTrue(resultString.contains(CliStrings.HISTORY__MSG__CLEARED_HISTORY));
assertTrue(gfshInstance.getGfshHistory().size()<= 1);
} else {
@@ -346,18 +348,18 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase {
private static void printCommandOutput(CommandResult cmdResult) {
assertNotNull(cmdResult);
- getLogWriter().info("Command Output : ");
+ LogWriterUtils.getLogWriter().info("Command Output : ");
StringBuilder sb = new StringBuilder();
cmdResult.resetToFirstLine();
while (cmdResult.hasNextLine()) {
sb.append(cmdResult.nextLine()).append(DataCommandRequest.NEW_LINE);
}
- getLogWriter().info(sb.toString());
- getLogWriter().info("");
+ LogWriterUtils.getLogWriter().info(sb.toString());
+ LogWriterUtils.getLogWriter().info("");
}
private void printAllEnvs(Gfsh gfsh) {
- getLogWriter().info("printAllEnvs : " + StringUtils.objectToString(gfsh.getEnv(), false, 0));
+ LogWriterUtils.getLogWriter().info("printAllEnvs : " + StringUtils.objectToString(gfsh.getEnv(), false, 0));
/*
getLogWriter().info("Gfsh printAllEnvs : " + HydraUtil.ObjectToString(getDefaultShell().getEnv()));
getLogWriter().info("gfsh " + gfsh + " default shell " + getDefaultShell());*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index 7a72865..ba942c6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -32,7 +32,10 @@ import com.gemstone.gemfire.management.internal.cli.CliUtil;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -70,8 +73,8 @@ public class ShowDeadlockDUnitTest extends CacheTestCase {
}
@Override
- public void tearDown2() throws Exception {
- invokeInEveryVM(new SerializableRunnable() {
+ protected final void preTearDownCacheTestCase() throws Exception {
+ Invoke.invokeInEveryVM(new SerializableRunnable() {
private static final long serialVersionUID = 1L;
public void run() {
@@ -110,7 +113,7 @@ public class ShowDeadlockDUnitTest extends CacheTestCase {
String deadLockOutputFromCommand = getResultAsString(result);
- getLogWriter().info("output = " + deadLockOutputFromCommand);
+ LogWriterUtils.getLogWriter().info("output = " + deadLockOutputFromCommand);
assertEquals(true, result.hasIncomingFiles());
assertEquals(true, result.getStatus().equals(Status.OK));
assertEquals(true, deadLockOutputFromCommand.startsWith(CliStrings.SHOW_DEADLOCK__NO__DEADLOCK));
@@ -146,7 +149,7 @@ public class ShowDeadlockDUnitTest extends CacheTestCase {
Result result = commandProcessor.createCommandStatement(csb.toString(), EMPTY_ENV).process();
String deadLockOutputFromCommand = getResultAsString(result);
- getLogWriter().info("Deadlock = " + deadLockOutputFromCommand);
+ LogWriterUtils.getLogWriter().info("Deadlock = " + deadLockOutputFromCommand);
result.saveIncomingFiles(null);
assertEquals(true, deadLockOutputFromCommand.startsWith(CliStrings.SHOW_DEADLOCK__DEADLOCK__DETECTED));
assertEquals(true, result.getStatus().equals(Status.OK));
@@ -183,7 +186,7 @@ public class ShowDeadlockDUnitTest extends CacheTestCase {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
ResultCollector collector = FunctionService.onMember(system, member).execute(new TestFunction());
//wait the function to lock the lock on member.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
index c327f41..a34b185 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -36,9 +36,12 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import javax.management.ObjectName;
import java.io.File;
@@ -94,11 +97,11 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
WaitCriterion wc = createMBeanWaitCriterion(1, "", null, 0);
- waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
CommandProcessor commandProcessor = new CommandProcessor();
Result result = commandProcessor.createCommandStatement("show metrics", Collections.EMPTY_MAP).process();
String resultStr = commandResultToString((CommandResult) result);
- getLogWriter().info(resultStr);
+ LogWriterUtils.getLogWriter().info(resultStr);
assertEquals(resultStr, true, result.getStatus().equals(Status.OK));
return resultStr;
}
@@ -110,8 +113,8 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- getLogWriter().info("#SB Manager");
- getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
}
public void systemSetUp() {
@@ -141,7 +144,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
WaitCriterion wc = createMBeanWaitCriterion(2, regionName, null, 0);
- waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
CommandProcessor commandProcessor = new CommandProcessor();
Result result = commandProcessor.createCommandStatement("show metrics --region=REGION1",
Collections.EMPTY_MAP).process();
@@ -157,8 +160,8 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- getLogWriter().info("#SB Manager");
- getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
}
/***
@@ -228,9 +231,9 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
public Object call() throws Exception {
WaitCriterion wc = createMBeanWaitCriterion(3, "", distributedMember, 0);
- waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
wc = createMBeanWaitCriterion(5, "", distributedMember, cacheServerPort);
- waitForCriterion(wc, 10000, 500, true);
+ Wait.waitForCriterion(wc, 10000, 500, true);
final String command = CliStrings.SHOW_METRICS + " --" + CliStrings.SHOW_METRICS__MEMBER + "=" + distributedMember.getId() + " --" + CliStrings.SHOW_METRICS__CACHESERVER__PORT + "=" + cacheServerPort + " --" + CliStrings.SHOW_METRICS__FILE + "=" + exportFileName;
@@ -255,8 +258,8 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- getLogWriter().info("#SB Manager");
- getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
cs.stop();
}
@@ -273,7 +276,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
public Object call() throws Exception {
WaitCriterion wc = createMBeanWaitCriterion(4, regionName, distributedMember, 0);
- waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
CommandProcessor commandProcessor = new CommandProcessor();
Result result = commandProcessor.createCommandStatement(
"show metrics --region=" + regionName + " --member=" + distributedMember.getName() + " --file=" + exportFileName,
@@ -296,8 +299,8 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- getLogWriter().info("#SB Manager");
- getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
}
public void testShowMetricsRegionFromMemberWithCategories() throws ClassNotFoundException, IOException, InterruptedException {
@@ -313,7 +316,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
public Object call() throws Exception {
WaitCriterion wc = createMBeanWaitCriterion(4, regionName, distributedMember, 0);
- waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
CommandProcessor commandProcessor = new CommandProcessor();
Result result = commandProcessor.createCommandStatement(
"show metrics --region=" + regionName + " --member=" + distributedMember.getName() + " --file=" + exportFileName + " --categories=region,eviction",
@@ -336,7 +339,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- getLogWriter().info("#SB Manager");
- getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
index b0f0495..11bd352 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
@@ -22,6 +22,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -93,9 +94,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.EXPORT_STACKTRACE);
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, allStacktracesFile.getCanonicalPath());
String commandString = csb.toString();
- getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
CommandResult commandResult = executeCommand(commandString);
- getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertTrue(commandResult.getStatus().equals(Status.OK));
File mgrStacktraceFile = new File("managerStacktrace.txt");
@@ -105,9 +106,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, mgrStacktraceFile.getCanonicalPath());
csb.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, "Manager");
commandString = csb.toString();
- getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
- getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertTrue(commandResult.getStatus().equals(Status.OK));
File serverStacktraceFile = new File("serverStacktrace.txt");
@@ -117,9 +118,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, serverStacktraceFile.getCanonicalPath());
csb.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, "Server");
commandString = csb.toString();
- getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
- getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertTrue(commandResult.getStatus().equals(Status.OK));
File groupStacktraceFile = new File("groupstacktrace.txt");
@@ -129,9 +130,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, groupStacktraceFile.getCanonicalPath());
csb.addOption(CliStrings.EXPORT_STACKTRACE__GROUP, "G2");
commandString = csb.toString();
- getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
- getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertTrue(commandResult.getStatus().equals(Status.OK));
File wrongStackTraceFile = new File("wrongStackTrace.txt");
@@ -141,9 +142,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, wrongStackTraceFile.getCanonicalPath());
csb.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, "WrongMember");
commandString = csb.toString();
- getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
- getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertFalse(commandResult.getStatus().equals(Status.OK));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
index dcbba2f..c7a8f5d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
@@ -58,8 +58,7 @@ public class UserCommandsDUnitTest extends CliCommandTestBase {
}
@Override
- public void tearDown2() throws Exception {
- super.tearDown2();
+ protected final void postTearDownCacheTestCase() throws Exception {
if (this.deleteJarDirectory) {
FileUtil.delete(this.jarDirectory);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
index 955d9f9..d583e51 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
@@ -49,11 +49,12 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity.X
import com.gemstone.gemfire.management.internal.configuration.handlers.ConfigurationRequestHandler;
import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationRequest;
import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationResponse;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/***
* Tests the starting up of shared configuration, installation of {@link ConfigurationRequestHandler}
@@ -118,7 +119,7 @@ public class SharedConfigurationDUnitTest extends CacheTestCase {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null,
locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -129,7 +130,7 @@ public class SharedConfigurationDUnitTest extends CacheTestCase {
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
+ Wait.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
}
@@ -256,7 +257,7 @@ public class SharedConfigurationDUnitTest extends CacheTestCase {
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null,
locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -267,7 +268,7 @@ public class SharedConfigurationDUnitTest extends CacheTestCase {
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
+ Wait.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
}
@@ -347,7 +348,7 @@ public class SharedConfigurationDUnitTest extends CacheTestCase {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator2Port, locatorLogFile, null,
locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -358,7 +359,7 @@ public class SharedConfigurationDUnitTest extends CacheTestCase {
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
+ Wait.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
}
@@ -433,10 +434,8 @@ public class SharedConfigurationDUnitTest extends CacheTestCase {
});
}
-
@Override
- public void tearDown2() throws Exception {
- super.tearDown2();
+ protected final void postTearDownCacheTestCase() throws Exception {
for (int i=0; i<4; i++) {
Host.getHost(0).getVM(i).invoke(SharedConfigurationDUnitTest.locatorCleanup);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
index 88b2b3d..696de8e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
@@ -37,12 +37,16 @@ import com.gemstone.gemfire.management.CacheServerMXBean;
import com.gemstone.gemfire.management.MBeanUtil;
import com.gemstone.gemfire.management.ManagementTestBase;
import com.gemstone.gemfire.management.internal.cli.CliUtil;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* This is for testing client IDs
@@ -86,17 +90,14 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
client2 = host.getVM(3);
}
- public void tearDown2() throws Exception {
- super.tearDown2();
-
+ @Override
+ protected final void preTearDown() throws Exception {
helper.closeCache(managingNode);
helper.closeCache(server);
helper.closeCache(client);
helper.closeCache(client2);
disconnectFromDS();
-
-
}
private static final long serialVersionUID = 1L;
@@ -106,8 +107,8 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
helper.startManagingNode(managingNode);
int port = (Integer) createServerCache(server);
DistributedMember serverMember = helper.getMember(server);
- createClientCache(client, getServerHostName(server.getHost()), port);
- createClientCache(client2, getServerHostName(server.getHost()), port);
+ createClientCache(client, NetworkUtils.getServerHostName(server.getHost()), port);
+ createClientCache(client2, NetworkUtils.getServerHostName(server.getHost()), port);
put(client);
put(client2);
verifyClientIds(managingNode, serverMember, port);
@@ -229,7 +230,7 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
}
}
}catch (Exception e) {
- getLogWriter().info("exception occured " + e.getMessage() + CliUtil.stackTraceAsString((Throwable)e));
+ LogWriterUtils.getLogWriter().info("exception occured " + e.getMessage() + CliUtil.stackTraceAsString((Throwable)e));
}
return false;
}
@@ -238,12 +239,12 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
return "wait for getNumOfClients bean to complete and get results";
}
};
- waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);
+ Wait.waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);
//Now it is sure that bean would be available
CacheServerMXBean bean = MBeanUtil.getCacheServerMbeanProxy(
serverMember, serverPort);
- getLogWriter().info("verifyClientIds = " + bean.getClientIds().length);
+ LogWriterUtils.getLogWriter().info("verifyClientIds = " + bean.getClientIds().length);
assertEquals(true, bean.getClientIds().length > 0 ? true : false);
} catch (Exception e) {
fail("Error while verifying cache server from remote member " + e);
@@ -289,7 +290,7 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
}
r1.clear();
} catch (Exception ex) {
- fail("failed while put", ex);
+ Assert.fail("failed while put", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
index 1ebbab7..c2f2b60 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
@@ -24,8 +24,11 @@ import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* This is for testing running functions
@@ -46,10 +49,6 @@ public class TestFunctionsDUnitTest extends ManagementTestBase {
}
- public void tearDown2() throws Exception {
- super.tearDown2();
- }
-
public static Integer getNumOfRunningFunction() {
final WaitCriterion waitCriteria = new WaitCriterion() {
@@ -74,7 +73,7 @@ public class TestFunctionsDUnitTest extends ManagementTestBase {
}
};
- waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);
+ Wait.waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);
final DistributedSystemMXBean bean = getManagementService()
.getDistributedSystemMXBean();
assertNotNull(bean);
@@ -98,7 +97,7 @@ public class TestFunctionsDUnitTest extends ManagementTestBase {
});
Integer numOfRunningFunctions = (Integer) managingNode.invoke(
TestFunctionsDUnitTest.class, "getNumOfRunningFunction");
- getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"TestNumOfFunctions numOfRunningFunctions= " + numOfRunningFunctions);
assertTrue(numOfRunningFunctions > 0 ? true : false);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
index 4a8783a..f8abe35 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
@@ -19,7 +19,10 @@ package com.gemstone.gemfire.management.internal.pulse;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* This is for testing heap size from Mbean
@@ -40,10 +43,6 @@ public class TestHeapDUnitTest extends ManagementTestBase {
}
- public void tearDown2() throws Exception {
- super.tearDown2();
- }
-
public static long getHeapSizeOfClient() {
return (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory());
}
@@ -68,7 +67,7 @@ public class TestHeapDUnitTest extends ManagementTestBase {
}
};
- waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);
+ Wait.waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);
final DistributedSystemMXBean bean = getManagementService()
.getDistributedSystemMXBean();
assertNotNull(bean);
@@ -86,7 +85,7 @@ public class TestHeapDUnitTest extends ManagementTestBase {
long totalHeapSizeFromMXBean = ((Number) managingNode.invoke(
TestHeapDUnitTest.class, "getHeapSizeOfDS")).intValue();
- getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testTotalHeapSize totalHeapSizeFromMXBean = "
+ totalHeapSizeFromMXBean + " totalHeapSizeOnAll = "
+ totalHeapSizeOnAll);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
index 2e9a239..e9b976a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
@@ -19,6 +19,9 @@ package com.gemstone.gemfire.management.internal.pulse;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* This is for testing locators from MBean
@@ -39,10 +42,6 @@ public class TestLocatorsDUnitTest extends ManagementTestBase {
}
- public void tearDown2() throws Exception {
- super.tearDown2();
- }
-
public static int getNumOfLocatorFromMBean() {
final WaitCriterion waitCriteria = new WaitCriterion() {
@@ -63,7 +62,7 @@ public class TestLocatorsDUnitTest extends ManagementTestBase {
return "wait for getNumOfLocatorFromMBean to complete and get results";
}
};
- waitForCriterion(waitCriteria, 2 * 60 * 1000, 2000, true);
+ Wait.waitForCriterion(waitCriteria, 2 * 60 * 1000, 2000, true);
final DistributedSystemMXBean bean = getManagementService().getDistributedSystemMXBean();
assertNotNull(bean);
return bean.getLocatorCount();
@@ -73,7 +72,7 @@ public class TestLocatorsDUnitTest extends ManagementTestBase {
initManagement(false);
int locatorCount = ((Number) managingNode.invoke(
TestLocatorsDUnitTest.class, "getNumOfLocatorFromMBean")).intValue();
- getLogWriter().info("TestLocatorsDUnitTest locatorCount =" + locatorCount);
+ LogWriterUtils.getLogWriter().info("TestLocatorsDUnitTest locatorCount =" + locatorCount);
assertEquals(1, locatorCount);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
index b415eac..ef491b0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
@@ -37,11 +37,16 @@ import com.gemstone.gemfire.management.DistributedRegionMXBean;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* This is for testing subscriptions
@@ -78,14 +83,13 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
client2 = host.getVM(3);
}
- public void tearDown2() throws Exception {
- super.tearDown2();
+ @Override
+ protected final void preTearDown() throws Exception {
helper.closeCache(managingNode);
helper.closeCache(server);
helper.closeCache(client);
helper.closeCache(client2);
disconnectFromDS();
-
}
private static final long serialVersionUID = 1L;
@@ -97,8 +101,8 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
int port = (Integer) createServerCache(server);
DistributedMember serverMember = helper.getMember(server);
- createClientCache(client, getServerHostName(server.getHost()), port);
- createClientCache(client2, getServerHostName(server.getHost()), port);
+ createClientCache(client, NetworkUtils.getServerHostName(server.getHost()), port);
+ createClientCache(client2, NetworkUtils.getServerHostName(server.getHost()), port);
put(client);
put(client2);
registerInterest(client);
@@ -235,11 +239,11 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
return "TestSubscriptionsDUnitTest wait for getDistributedSystemMXBean to complete and get results";
}
};
- waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);
+ Wait.waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);
final DistributedSystemMXBean dsBean = ManagementService
.getExistingManagementService(cache).getDistributedSystemMXBean();
assertNotNull(dsBean);
- getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"TestSubscriptionsDUnitTest dsBean.getNumSubscriptions() ="
+ dsBean.getNumSubscriptions());
assertTrue(dsBean.getNumSubscriptions() == 2 ? true : false);
@@ -271,7 +275,7 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
r1.registerInterest(k1);
r1.registerInterest(k2);
} catch (Exception ex) {
- fail("TestSubscriptionsDUnitTest failed while register Interest", ex);
+ Assert.fail("TestSubscriptionsDUnitTest failed while register Interest", ex);
}
}
@@ -292,7 +296,7 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
r1.put(k2, client_k2);
assertEquals(r1.getEntry(k2).getValue(), client_k2);
} catch (Exception ex) {
- fail("failed while put", ex);
+ Assert.fail("failed while put", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
index 0704121..40592ff 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -56,10 +56,15 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
import com.gemstone.gemfire.internal.cache.tier.sockets.command.Put70;
import com.gemstone.gemfire.internal.cache.versions.VMVersionTag;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
/**
* @author dsmith
@@ -67,7 +72,7 @@ import com.gemstone.gemfire.test.dunit.VM;
*/
public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
// list of expected exceptions to remove in tearDown2()
- static List<ExpectedException> expectedExceptions = new LinkedList<ExpectedException>();
+ static List<IgnoredException> expectedExceptions = new LinkedList<IgnoredException>();
public ClientsWithVersioningRetryDUnitTest(String name) {
super(name);
@@ -76,7 +81,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
@Override
public void setUp() throws Exception {
super.setUp();
- invokeInEveryVM(new SerializableRunnable() {
+ Invoke.invokeInEveryVM(new SerializableRunnable() {
@Override
public void run() {
//Disable endpoint shuffling, so that the client will always connect
@@ -87,17 +92,15 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
});
}
-
@Override
- public void tearDown2() throws Exception {
- super.tearDown2();
- invokeInEveryVM(new SerializableRunnable() {
- @Override public void run() {
+ protected final void postTearDownCacheTestCase() throws Exception {
+ Invoke.invokeInEveryVM(new SerializableRunnable() {
+ @Override
+ public void run() {
System.setProperty("gemfire.bridge.disableShufflingOfEndpoints", "false");
}
-
});
- for (ExpectedException ex: expectedExceptions) {
+ for (IgnoredException ex: expectedExceptions) {
ex.remove();
}
}
@@ -279,7 +282,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
final VM vm2 = host.getVM(2);
final VM vm3 = host.getVM(3);
- getLogWriter().info("creating region in vm0");
+ LogWriterUtils.getLogWriter().info("creating region in vm0");
createRegionInPeer(vm0, RegionShortcut.PARTITION_REDUNDANT_PERSISTENT);
vm0.invoke(new SerializableRunnable() {
@@ -291,14 +294,14 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
}
});
- getLogWriter().info("creating region in vm1");
+ LogWriterUtils.getLogWriter().info("creating region in vm1");
createRegionInPeer(vm1, RegionShortcut.PARTITION_REDUNDANT_PERSISTENT);
- getLogWriter().info("creating region in vm2");
+ LogWriterUtils.getLogWriter().info("creating region in vm2");
createRegionInPeer(vm2, RegionShortcut.PARTITION_REDUNDANT_PERSISTENT);
- getLogWriter().info("creating region in vm3");
+ LogWriterUtils.getLogWriter().info("creating region in vm3");
createRegionInPeer(vm3, RegionShortcut.PARTITION_PROXY);
- expectedExceptions.add(addExpectedException("RuntimeException", vm2));
+ expectedExceptions.add(IgnoredException.addIgnoredException("RuntimeException", vm2));
vm2.invoke(new SerializableRunnable("install message listener to ignore update") {
public void run() {
//Add a listener to close vm2 when we send a distributed put all operation
@@ -311,7 +314,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
DistributionMessage msg) {
if(msg instanceof DistributedPutAllOperation.PutAllMessage) {
DistributionMessageObserver.setInstance(null);
- pause(5000); // give vm1 time to process the message that we're ignoring
+ Wait.pause(5000); // give vm1 time to process the message that we're ignoring
disconnectFromDS(vm0);
// no reply will be sent to vm0 due to this exception, but that's okay
// because vm0 has been shut down
@@ -494,8 +497,8 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
SerializableCallable createRegion = new SerializableCallable("create client region in " + vm) {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(getServerHostName(vm.getHost()), port1);
- cf.addPoolServer(getServerHostName(vm.getHost()), port2);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port1);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port2);
cf.setPoolPRSingleHopEnabled(false);
cf.setPoolThreadLocalConnections(threadLocalConnections);
cf.setPoolReadTimeout(10 * 60 * 1000);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
index 5a355ea..2d20275 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
@@ -26,6 +26,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -69,7 +70,7 @@ public class DistributedSystemIdDUnitTest extends DistributedTestCase {
}
public void testMismatch() {
- addExpectedException("Rejected new system node");
+ IgnoredException.addIgnoredException("Rejected new system node");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
index a8b4e8d..937ff31 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.pdx.internal.json.PdxToJSON;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
@@ -59,7 +60,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
}
@Override
- public void tearDown2() {
+ protected final void preTearDownCacheTestCase() {
// this test creates client caches in some VMs and so
// breaks the contract of CacheTestCase to hold caches in
// that class's "cache" instance variable
@@ -594,7 +595,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
SerializableCallable createRegion = new SerializableCallable() {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(getServerHostName(vm.getHost()), port);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port);
cf.setPoolThreadLocalConnections(threadLocalConnections);
ClientCache cache = getClientCache(cf);
cache.createClientRegionFactory(ClientRegionShortcut.PROXY)
@@ -610,7 +611,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
SerializableCallable createRegion = new SerializableCallable() {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(getServerHostName(vm.getHost()), port);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port);
cf.setPoolThreadLocalConnections(threadLocalConnections);
cf.setPdxReadSerialized(isPdxReadSerialized);
ClientCache cache = getClientCache(cf);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
index 98da0fc..7720890 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
@@ -42,6 +42,8 @@ import com.gemstone.gemfire.internal.PdxSerializerObject;
import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.pdx.internal.AutoSerializableManager;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -171,7 +173,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
VM vm2 = host.getVM(2);
System.setProperty("gemfire.auto.serialization.no.hardcoded.excludes", "true");
- invokeInEveryVM(new SerializableRunnable() {
+ Invoke.invokeInEveryVM(new SerializableRunnable() {
public void run() {
System.setProperty("gemfire.auto.serialization.no.hardcoded.excludes", "true");
}
@@ -239,7 +241,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
});
} finally {
System.setProperty("gemfire.auto.serialization.no.hardcoded.excludes", "false");
- invokeInEveryVM(new SerializableRunnable() {
+ Invoke.invokeInEveryVM(new SerializableRunnable() {
public void run() {
System.setProperty("gemfire.auto.serialization.no.hardcoded.excludes", "false");
}
@@ -392,11 +394,11 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
getSystem(props);
Cache cache = getCache();
PoolFactory pf = PoolManager.createFactory();
- pf.addServer(getServerHostName(vm0.getHost()), port1);
+ pf.addServer(NetworkUtils.getServerHostName(vm0.getHost()), port1);
pf.create("pool1");
pf = PoolManager.createFactory();
- pf.addServer(getServerHostName(vm0.getHost()), port2);
+ pf.addServer(NetworkUtils.getServerHostName(vm0.getHost()), port2);
pf.create("pool2");
AttributesFactory af = new AttributesFactory();
@@ -497,7 +499,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
getSystem(props);
Cache cache = getCache();
PoolFactory pf = PoolManager.createFactory();
- pf.addServer(getServerHostName(vm0.getHost()), port);
+ pf.addServer(NetworkUtils.getServerHostName(vm0.getHost()), port);
pf.create("pool");
AttributesFactory af = new AttributesFactory();
@@ -551,7 +553,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
DataSerializer.writeObject(new SimpleClass(57, (byte) 3), out);
PoolFactory pf = PoolManager.createFactory();
- pf.addServer(getServerHostName(vm0.getHost()), port);
+ pf.addServer(NetworkUtils.getServerHostName(vm0.getHost()), port);
try {
pf.create("pool");
fail("should have received an exception");
@@ -702,7 +704,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
System.setProperty("gemfire.ON_DISCONNECT_CLEAR_PDXTYPEIDS", "true");
}
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(getServerHostName(vm.getHost()), port);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port);
cf.setPoolThreadLocalConnections(threadLocalConnections);
if(autoSerializerPatterns != null && autoSerializerPatterns.length != 0) {
cf.setPdxSerializer(new ReflectionBasedAutoSerializer(autoSerializerPatterns));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
index 3310d95..10b21d0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
@@ -38,10 +38,13 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.pdx.PdxReader;
import com.gemstone.gemfire.pdx.PdxSerializable;
import com.gemstone.gemfire.pdx.PdxWriter;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* A test to ensure that we do not deserialize PDX objects
@@ -268,7 +271,7 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
protected void checkClientValue(final Region<Object, Object> region) {
//Because register interest is asynchronous, we need to wait for the value to arrive.
- waitForCriterion(new WaitCriterion() {
+ Wait.waitForCriterion(new WaitCriterion() {
public boolean done() {
return region.get("A") != null;
@@ -310,7 +313,7 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
}
} catch (Exception e) {
- fail("got exception from query", e);
+ Assert.fail("got exception from query", e);
}
@@ -352,7 +355,7 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
try {
server.start();
} catch (IOException e) {
- fail("got exception", e);
+ Assert.fail("got exception", e);
}
return server;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
index 001aab4..c820e72 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.pdx.internal.EnumInfo;
import com.gemstone.gemfire.pdx.internal.PdxType;
import com.gemstone.gemfire.pdx.internal.TypeRegistry;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
public class PdxTypeExportDUnitTest extends CacheTestCase {
@@ -115,7 +116,7 @@ public class PdxTypeExportDUnitTest extends CacheTestCase {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory()
.setPdxSerializer(new MyPdxSerializer())
- .addPoolServer(getServerHostName(host), port);
+ .addPoolServer(NetworkUtils.getServerHostName(host), port);
ClientCache cache = getClientCache(cf);
Region r = cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create("pdxtest");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java
index be4d9c7..f2e6b5a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Constructor;
import java.net.URL;
import java.net.URLClassLoader;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
public class VersionClassLoader {
@@ -42,16 +42,16 @@ public class VersionClassLoader {
String alternateVersionClassPath = System.getProperty("JTESTS") +
File.separator + ".." + File.separator + ".." + File.separator +
"classes" + File.separator + "version" + classVersion;
- DistributedTestCase.getLogWriter().info("Initializing the class loader :" + alternateVersionClassPath);
+ LogWriterUtils.getLogWriter().info("Initializing the class loader :" + alternateVersionClassPath);
ClassLoader versionCL = null;
try {
versionCL = new URLClassLoader(new URL[]{new File(alternateVersionClassPath).toURI().toURL()}, cl);
Thread.currentThread().setContextClassLoader(versionCL);
} catch (Exception e) {
- DistributedTestCase.getLogWriter().info("error", e);
+ LogWriterUtils.getLogWriter().info("error", e);
throw new Exception("Failed to initialize the class loader. " + e.getMessage());
}
- DistributedTestCase.getLogWriter().info("Setting/adding class loader with " + alternateVersionClassPath);
+ LogWriterUtils.getLogWriter().info("Setting/adding class loader with " + alternateVersionClassPath);
return versionCL;
}
@@ -90,7 +90,7 @@ public class VersionClassLoader {
newObj = constructor.newInstance();
}
} catch (Exception e) {
- DistributedTestCase.getLogWriter().info("error", e);
+ LogWriterUtils.getLogWriter().info("error", e);
throw new Exception("Failed to get the class instance. ClassName: " + className + " error: ", e);
}
return newObj;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
index 28e2940..f787909 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
@@ -25,7 +25,10 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.SocketCreator;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestUtils;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -70,7 +73,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
client1 = host.getVM(2);
client2 = host.getVM(3);
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
- final int locatorPort = getDUnitLocatorPort();
+ final int locatorPort = DistributedTestUtils.getDUnitLocatorPort();
final SerializableCallable<Object> startRedisAdapter = new SerializableCallable<Object>() {
private static final long serialVersionUID = 1978017907725504294L;
@@ -80,7 +83,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
int port = ports[VM.getCurrentVMNum()];
CacheFactory cF = new CacheFactory();
String locator = SocketCreator.getLocalHost().getHostName() + "[" + locatorPort + "]";
- cF.set("log-level", getDUnitLogLevel());
+ cF.set("log-level", LogWriterUtils.getDUnitLogLevel());
cF.set("redis-bind-address", localHost);
cF.set("redis-port", ""+port);
cF.set("mcast-port", "0");
@@ -99,8 +102,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
}
@Override
- public void tearDown2() throws Exception {
- super.tearDown2();
+ protected final void preTearDown() throws Exception {
disconnectAllFromDS();
}
@@ -139,8 +141,8 @@ public class RedisDistDUnitTest extends DistributedTestCase {
}
public void testConcCreateDestroy() throws Throwable {
- addExpectedException("RegionDestroyedException");
- addExpectedException("IndexInvalidException");
+ IgnoredException.addIgnoredException("RegionDestroyedException");
+ IgnoredException.addIgnoredException("IndexInvalidException");
final int ops = 40;
final String hKey = TEST_KEY+"hash";
final String lKey = TEST_KEY+"list";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
index 40acd62..7cd95fd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
@@ -28,6 +28,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
public class RestAPITestBase extends DistributedTestCase {
private static final long serialVersionUID = 1L;
@@ -46,7 +47,7 @@ public class RestAPITestBase extends DistributedTestCase {
public void setUp() throws Exception {
super.setUp();
disconnectAllFromDS();
- pause(5000);
+ Wait.pause(5000);
final Host host = Host.getHost(0);
vm0 = host.getVM(0);
vm1 = host.getVM(1);
@@ -58,8 +59,7 @@ public class RestAPITestBase extends DistributedTestCase {
* close the clients and teh servers
*/
@Override
- public void tearDown2() throws Exception
- {
+ protected final void preTearDown() throws Exception {
vm0.invoke(getClass(), "closeCache");
vm1.invoke(getClass(), "closeCache");
vm2.invoke(getClass(), "closeCache");
@@ -79,7 +79,7 @@ public class RestAPITestBase extends DistributedTestCase {
protected static String createCache(VM currentVM) {
- RestAPITestBase test = new RestAPITestBase(testName);
+ RestAPITestBase test = new RestAPITestBase(getTestMethodName());
final String hostName = currentVM.getHost().getHostName();
final int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();
@@ -98,7 +98,7 @@ public class RestAPITestBase extends DistributedTestCase {
}
public static String createCacheWithGroups (VM vm, final String groups, final String regionName ) {
- RestAPITestBase test = new RestAPITestBase(testName);
+ RestAPITestBase test = new RestAPITestBase(getTestMethodName());
final String hostName = vm.getHost().getHostName();
final int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();