http://git-wip-us.apache.org/repos/asf/geode/blob/0ea489ea/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java index cac45eb..f297b78 100755 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java @@ -23,6 +23,17 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.apache.lucene.analysis.Analyzer; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneService; @@ -42,16 +53,6 @@ import org.apache.geode.test.dunit.rules.LocatorServerStartupRule; import org.apache.geode.test.dunit.rules.Member; import org.apache.geode.test.dunit.rules.MemberVM; import org.apache.geode.test.junit.categories.DistributedTest; -import org.apache.lucene.analysis.Analyzer; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Properties; @Category(DistributedTest.class)
http://git-wip-us.apache.org/repos/asf/geode/blob/0ea489ea/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java index 7e82d23..c301d58 100644 --- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java @@ -15,28 +15,23 @@ package org.apache.geode.management.internal.configuration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import junitparams.JUnitParamsRunner; +import junitparams.Parameters; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; + import org.apache.geode.cache.RegionShortcut; -import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.dunit.rules.GfshShellConnectionRule; import org.apache.geode.test.dunit.rules.LocatorServerStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; import org.apache.geode.test.junit.categories.DistributedTest; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; - -import java.util.Properties; -import junitparams.JUnitParamsRunner; -import junitparams.Parameters; @Category(DistributedTest.class) @RunWith(JUnitParamsRunner.class) @@ -77,29 +72,17 @@ public class ClusterConfigurationIndexWithFromClauseDUnitTest { CommandStringBuilder csb = new CommandStringBuilder(CliStrings.LIST_MEMBER); gfshShellConnectionRule.executeAndVerifyCommand(csb.toString()); lsRule.stopMember(1); - lsRule.startServerVM(1, lsRule.getMember(0).getPort()); + lsRule.startServerVM(1, locator.getPort()); verifyIndexRecreated(INDEX_NAME); } private void verifyIndexRecreated(String indexName) throws Exception { CommandStringBuilder csb = new CommandStringBuilder(CliStrings.LIST_INDEX); - CommandResult commandResult = gfshShellConnectionRule.executeAndVerifyCommand(csb.toString()); - String resultAsString = commandResultToString(commandResult); - assertEquals(Result.Status.OK, commandResult.getStatus()); + gfshShellConnectionRule.executeAndVerifyCommand(csb.toString()); + String resultAsString = gfshShellConnectionRule.getGfshOutput(); assertTrue(resultAsString.contains(indexName)); } - private String commandResultToString(final CommandResult commandResult) { - assertNotNull(commandResult); - commandResult.resetToFirstLine(); - StringBuilder buffer = new StringBuilder(commandResult.getHeader()); - while (commandResult.hasNextLine()) { - buffer.append(commandResult.nextLine()); - } - buffer.append(commandResult.getFooter()); - return buffer.toString(); - } - private void createIndexUsingGfsh(String regionName, String expression, String indexName) throws Exception { CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_INDEX); http://git-wip-us.apache.org/repos/asf/geode/blob/0ea489ea/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java index 3176f54..368d64d 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java @@ -38,7 +38,7 @@ public class LogNoPasswordTest { private static String PASSWORD = "abcdefghijklmn"; @Rule public LocatorStarterRule locator = new LocatorStarterRule().withProperty(LOG_LEVEL, "DEBUG") - .withSecurityManager(MySecurityManager.class); + .withLogFile().withSecurityManager(MySecurityManager.class); @Rule public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
