This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 9fa0e5f GEODE-3673: Refactored Lucene commands test to use new
framework
9fa0e5f is described below
commit 9fa0e5f3258b0cf9831558cb8e700dc6e3ee677c
Author: Dan Smith <[email protected]>
AuthorDate: Mon Oct 2 12:07:39 2017 -0700
GEODE-3673: Refactored Lucene commands test to use new framework
The CliCommandTest was causing this test to be flaky. Refactoring to use
the new test framework.
---
.../internal/cli/LuceneIndexCommandsDUnitTest.java | 207 ++++++++++-----------
1 file changed, 94 insertions(+), 113 deletions(-)
diff --git
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
index c73952d..479d46c 100755
---
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
+++
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
@@ -27,6 +27,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
@@ -37,8 +38,10 @@ import org.apache.lucene.analysis.core.KeywordAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.awaitility.Awaitility;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
@@ -53,31 +56,46 @@ import
org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.management.cli.Result.Status;
-import org.apache.geode.management.internal.cli.commands.CliCommandTestBase;
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.result.TabularResultData;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
-public class LuceneIndexCommandsDUnitTest extends CliCommandTestBase {
+public class LuceneIndexCommandsDUnitTest implements Serializable {
+
+ @Rule
+ public transient GfshShellConnectionRule gfsh = new
GfshShellConnectionRule();
+
+ @Rule
+ public LocatorServerStartupRule startupRule = new LocatorServerStartupRule();
+
+ @Rule
+ public SerializableTestName testName = new SerializableTestName();
+
+ private MemberVM serverVM;
@Before
- public void createJMXManager() {
- disconnectAllFromDS();
- setUpJmxManagerOnVm0ThenConnect(null);
+ public void before() throws Exception {
+ Properties props = new Properties();
+ serverVM = startupRule.startServerAsJmxManager(0, props);
+ connect(serverVM);
+ }
+
+ public void connect(MemberVM serverVM) throws Exception {
+ gfsh.connectAndVerify(serverVM.getJmxPort(),
GfshShellConnectionRule.PortType.jmxManger);
}
@Test
public void listIndexShouldReturnExistingIndexWithStats() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_LIST_INDEX);
csb.addOption(LuceneCliStrings.LUCENE_LIST_INDEX__STATS, "true");
@@ -88,9 +106,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void listIndexShouldReturnExistingIndexWithoutStats() throws
Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_LIST_INDEX);
String resultAsString = executeCommandAndLogResult(csb);
@@ -100,8 +116,6 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void listIndexWhenNoExistingIndexShouldReturnNoIndex() throws
Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_LIST_INDEX);
String resultAsString = executeCommandAndLogResult(csb);
assertTrue(resultAsString.contains("No lucene indexes found"));
@@ -109,9 +123,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void listIndexShouldReturnCorrectStatus() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndexWithoutRegion(vm1);
+ createIndexWithoutRegion();
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_LIST_INDEX);
csb.addOption(LuceneCliStrings.LUCENE_LIST_INDEX__STATS, "true");
@@ -122,15 +134,13 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void listIndexWithStatsShouldReturnCorrectStats() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
Map<String, TestObject> entries = new HashMap<>();
entries.put("A", new TestObject("field1:value1", "field2:value2",
"field3:value3"));
entries.put("B", new TestObject("ABC", "EFG", "HIJ"));
- putEntries(vm1, entries, 2);
- queryAndVerify(vm1, "field1:value1", "field1",
Collections.singletonList("A"));
+ putEntries(entries, 2);
+ queryAndVerify("field1:value1", "field1", Collections.singletonList("A"));
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_LIST_INDEX);
csb.addOption(LuceneCliStrings.LUCENE_LIST_INDEX__STATS, "true");
@@ -147,8 +157,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void createIndexShouldCreateANewIndex() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
getCache();
});
@@ -159,7 +168,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
String resultAsString = executeCommandAndLogResult(csb);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
LuceneService luceneService = LuceneServiceProvider.get(getCache());
createRegion();
final LuceneIndex index = luceneService.getIndex(INDEX_NAME,
REGION_NAME);
@@ -169,8 +178,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void createIndexWithAnalyzersShouldCreateANewIndex() throws Exception
{
- final VM vm1 = Host.getHost(0).getVM(1);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
getCache();
});
@@ -187,7 +195,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
String resultAsString = executeCommandAndLogResult(csb);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
LuceneService luceneService = LuceneServiceProvider.get(getCache());
createRegion();
final LuceneIndex index = luceneService.getIndex(INDEX_NAME,
REGION_NAME);
@@ -200,8 +208,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void createIndexShouldNotAcceptBadIndexOrRegionNames() {
- final VM vm1 = Host.getHost(0).getVM(-1);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
getCache();
});
@@ -244,8 +251,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void createIndexShouldTrimAnalyzerNames() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(-1);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
getCache();
});
@@ -263,7 +269,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
String resultAsString = executeCommandAndLogResult(csb);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
LuceneService luceneService = LuceneServiceProvider.get(getCache());
createRegion();
final LuceneIndex index = luceneService.getIndex(INDEX_NAME,
REGION_NAME);
@@ -276,8 +282,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void createIndexWithoutRegionShouldReturnCorrectResults() throws
Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
getCache();
});
@@ -288,7 +293,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
String resultAsString = executeCommandAndLogResult(csb);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
LuceneServiceImpl luceneService = (LuceneServiceImpl)
LuceneServiceProvider.get(getCache());
final ArrayList<LuceneIndexCreationProfile> profiles =
new ArrayList<>(luceneService.getAllDefinedIndexes());
@@ -300,8 +305,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void
createIndexWithWhitespaceOrDefaultKeywordAnalyzerShouldUseStandardAnalyzer()
throws Exception {
- final VM vm1 = Host.getHost(0).getVM(-1);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
getCache();
});
@@ -338,7 +342,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
resultAsString = executeCommandAndLogResult(csb);
- vm1.invoke(() -> {
+ serverVM.invoke(() -> {
LuceneService luceneService = LuceneServiceProvider.get(getCache());
createRegion();
final LuceneIndex spaceIndex = luceneService.getIndex("space",
REGION_NAME);
@@ -378,9 +382,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void describeIndexShouldReturnExistingIndex() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_DESCRIBE_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
@@ -391,9 +393,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void describeIndexShouldNotReturnResultWhenIndexNotFound() throws
Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_DESCRIBE_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, "notAnIndex");
@@ -405,10 +405,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void describeIndexWithoutRegionShouldReturnErrorMessage() throws
Exception {
-
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndexWithoutRegion(vm1);
+ createIndexWithoutRegion();
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_DESCRIBE_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, "notAnIndex");
csb.addOption(LuceneCliStrings.LUCENE__REGION_PATH, REGION_NAME);
@@ -418,9 +415,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void searchShouldReturnCorrectResults() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
Map<String, TestObject> entries = new HashMap<>();
entries.put("A", new TestObject("value1 ", "value2", "value3"));
entries.put("B", new TestObject("ABC", "EFG", "HIJ"));
@@ -430,7 +425,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
entries.put("F", new TestObject("ABC", "EFG", "HIJ"));
entries.put("G", new TestObject(" value1", "JKR", "POW"));
entries.put("H", new TestObject("ABC", "EFG", "H2J"));
- putEntries(vm1, entries, 8);
+ putEntries(entries, 8);
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_SEARCH_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
@@ -445,9 +440,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void searchShouldReturnResultsInCorrectOrderOfScore() throws
Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
Map<String, TestObject> entries = new HashMap<>();
entries.put("A", new TestObject("jon ", "value2", "value3"));
@@ -455,7 +448,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
entries.put("C", new TestObject("eon", "QWE", "RTY"));
entries.put("D", new TestObject("kion", "QWE", "RTY"));
entries.put("E", new TestObject("ryan", "QWE", "RTY"));
- putEntries(vm1, entries, 5);
+ putEntries(entries, 5);
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_SEARCH_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
@@ -477,9 +470,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void searchShouldReturnNoResults() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
Map<String, TestObject> entries = new HashMap<>();
entries.put("A", new TestObject("value1 ", "value2", "value3"));
entries.put("B", new TestObject("ABC", "EFG", "HIJ"));
@@ -489,7 +480,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
entries.put("F", new TestObject("ABC", "EFG", "HIJ"));
entries.put("G", new TestObject(" value1", "JKR", "POW"));
entries.put("H", new TestObject("ABC", "EFG", "H2J"));
- putEntries(vm1, entries, 8);
+ putEntries(entries, 8);
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_SEARCH_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
@@ -504,9 +495,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void searchWithLimitShouldReturnCorrectResults() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
Map<String, TestObject> entries = new HashMap<>();
entries.put("A", new TestObject("value1 ", "value2", "value3"));
entries.put("B", new TestObject("ABC", "EFG", "HIJ"));
@@ -516,7 +505,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
entries.put("F", new TestObject("ABC", "EFG", "HIJ"));
entries.put("G", new TestObject(" value1", "JKR", "POW"));
entries.put("H", new TestObject("ABC", "EFG", "H2J"));
- putEntries(vm1, entries, 8);
+ putEntries(entries, 8);
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_SEARCH_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
@@ -531,9 +520,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void searchWithoutFieldNameShouldReturnCorrectResults() throws
Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
Map<String, TestObject> entries = new HashMap<>();
entries.put("A", new TestObject("value1 ", "value2", "value3"));
entries.put("B", new TestObject("ABC", "EFG", "HIJ"));
@@ -543,7 +530,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
entries.put("F", new TestObject("ABC", "EFG", "HIJ"));
entries.put("G", new TestObject("value1", "JKR", "POW"));
entries.put("H", new TestObject("ABC", "EFG", "H2J"));
- putEntries(vm1, entries, 8);
+ putEntries(entries, 8);
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_SEARCH_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
@@ -559,9 +546,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void searchOnIndexWithoutRegionShouldReturnError() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndexWithoutRegion(vm1);
+ createIndexWithoutRegion();
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_SEARCH_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
csb.addOption(LuceneCliStrings.LUCENE__REGION_PATH, REGION_NAME);
@@ -575,9 +560,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void searchWithoutIndexShouldReturnError() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- vm1.invoke(() -> createRegion());
+ serverVM.invoke(() -> createRegion());
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_SEARCH_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
@@ -587,8 +570,8 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
String commandString = csb.toString();
writeToLog("Command String :\n ", commandString);
- CommandResult commandResult = executeCommand(commandString);
- String resultAsString = commandResultToString(commandResult);
+ CommandResult commandResult = gfsh.executeCommand(commandString);
+ String resultAsString = gfsh.getGfshOutput();
writeToLog("Result String :\n ", resultAsString);
assertEquals(Status.ERROR, commandResult.getStatus());
assertEquals("Unexpected CommandResult string :" + resultAsString, true,
@@ -597,9 +580,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void searchIndexShouldReturnCorrectKeys() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
-
- createIndex(vm1);
+ createIndex();
Map<String, TestObject> entries = new HashMap<>();
entries.put("A", new TestObject("value1 ", "value2", "value3"));
entries.put("B", new TestObject("ABC", "EFG", "HIJ"));
@@ -609,7 +590,7 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
entries.put("F", new TestObject("ABC", "EFG", "HIJ"));
entries.put("G", new TestObject("value1", "JKR", "POW"));
entries.put("H", new TestObject("ABC", "EFG", "H2J"));
- putEntries(vm1, entries, 8);
+ putEntries(entries, 8);
CommandStringBuilder csb = new
CommandStringBuilder(LuceneCliStrings.LUCENE_SEARCH_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
@@ -626,14 +607,13 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
@Parameters({"true", "false"})
public void testDestroySingleIndex(boolean createRegion) throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
if (createRegion) {
- createIndex(vm1);
+ createIndex();
} else {
- createIndexWithoutRegion(vm1);
+ createIndexWithoutRegion();
}
CommandResult result = createAndExecuteDestroyIndexCommand(INDEX_NAME,
REGION_NAME);
- String resultAsString = commandResultToString(result);
+ String resultAsString = gfsh.getGfshOutput();
String expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEX_0_FROM_REGION_1,
new Object[] {INDEX_NAME, REGION_NAME});
@@ -643,14 +623,13 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
@Parameters({"true", "false"})
public void testDestroyAllIndexes(boolean createRegion) throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
if (createRegion) {
- createIndex(vm1);
+ createIndex();
} else {
- createIndexWithoutRegion(vm1);
+ createIndexWithoutRegion();
}
CommandResult result = createAndExecuteDestroyIndexCommand(null,
REGION_NAME);
- String resultAsString = commandResultToString(result);
+ String resultAsString = gfsh.getGfshOutput();
String expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEXES_FROM_REGION_0,
new Object[] {REGION_NAME});
@@ -659,10 +638,9 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void testDestroyNonExistentSingleIndex() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
- vm1.invoke(() -> createRegion());
+ serverVM.invoke(() -> createRegion());
CommandResult result = createAndExecuteDestroyIndexCommand(INDEX_NAME,
REGION_NAME);
- String resultAsString = commandResultToString(result);
+ String resultAsString = gfsh.getGfshOutput();
String expectedStatus =
LocalizedStrings.LuceneService_INDEX_0_NOT_FOUND_IN_REGION_1
.toLocalizedString(new Object[] {INDEX_NAME, '/' + REGION_NAME});
assertTrue(resultAsString.contains(expectedStatus));
@@ -670,10 +648,9 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
@Test
public void testDestroyNonExistentIndexes() throws Exception {
- final VM vm1 = Host.getHost(0).getVM(1);
- vm1.invoke(() -> createRegion());
+ serverVM.invoke(() -> createRegion());
CommandResult result = createAndExecuteDestroyIndexCommand(null,
REGION_NAME);
- String resultAsString = commandResultToString(result);
+ String resultAsString = gfsh.getGfshOutput();
String expectedStatus =
LocalizedStrings.LuceneService_NO_INDEXES_WERE_FOUND_IN_REGION_0
.toLocalizedString(new Object[] {'/' + REGION_NAME});
assertTrue(resultAsString.contains(expectedStatus));
@@ -696,8 +673,8 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
private String executeCommandAndLogResult(final CommandStringBuilder csb) {
String commandString = csb.toString();
writeToLog("Command String :\n ", commandString);
- CommandResult commandResult = executeCommand(commandString);
- String resultAsString = commandResultToString(commandResult);
+ CommandResult commandResult = gfsh.executeAndVerifyCommand(commandString);
+ String resultAsString = gfsh.getGfshOutput();
writeToLog("Result String :\n ", resultAsString);
assertEquals("Command failed\n" + resultAsString, Status.OK,
commandResult.getStatus());
return resultAsString;
@@ -706,16 +683,17 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
private CommandResult executeCommandAndGetResult(final CommandStringBuilder
csb) {
String commandString = csb.toString();
writeToLog("Command String :\n ", commandString);
- CommandResult commandResult = executeCommand(commandString);
- String resultAsString = commandResultToString(commandResult);
+ CommandResult commandResult = gfsh.executeAndVerifyCommand(commandString);
+ String resultAsString = gfsh.getGfshOutput();
writeToLog("Result String :\n ", resultAsString);
assertEquals("Command failed\n" + resultAsString, Status.OK,
commandResult.getStatus());
return commandResult;
}
- private void createIndex(final VM vm1) {
- vm1.invoke(() -> {
- LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ private void createIndex() {
+ serverVM.invoke(() -> {
+ LuceneService luceneService =
+
LuceneServiceProvider.get(LocatorServerStartupRule.serverStarter.getCache());
Map<String, Analyzer> fieldAnalyzers = new HashMap();
fieldAnalyzers.put("field1", new StandardAnalyzer());
fieldAnalyzers.put("field2", new KeywordAnalyzer());
@@ -725,9 +703,10 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
});
}
- private void createIndexWithoutRegion(final VM vm1) {
- vm1.invoke(() -> {
- LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ private void createIndexWithoutRegion() {
+ serverVM.invoke(() -> {
+ LuceneService luceneService =
+
LuceneServiceProvider.get(LocatorServerStartupRule.serverStarter.getCache());
Map<String, Analyzer> fieldAnalyzers = new HashMap();
fieldAnalyzers.put("field1", new StandardAnalyzer());
fieldAnalyzers.put("field2", new KeywordAnalyzer());
@@ -737,13 +716,12 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
}
private void writeToLog(String text, String resultAsString) {
- System.out.println(text + ": " + getTestMethodName() + " : ");
+ System.out.println(text + ": " + testName.getMethodName() + " : ");
System.out.println(text + ":" + resultAsString);
}
- private void putEntries(final VM vm1, Map<String, TestObject> entries, int
countOfDocuments) {
- Cache cache = getCache();
- vm1.invoke(() -> {
+ private void putEntries(Map<String, TestObject> entries, int
countOfDocuments) {
+ serverVM.invoke(() -> {
LuceneService luceneService = LuceneServiceProvider.get(getCache());
Region region = getCache().getRegion(REGION_NAME);
region.putAll(entries);
@@ -755,9 +733,8 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
});
}
- private void queryAndVerify(VM vm1, String queryString, String defaultField,
- List<String> expectedKeys) {
- vm1.invoke(() -> {
+ private void queryAndVerify(String queryString, String defaultField,
List<String> expectedKeys) {
+ serverVM.invoke(() -> {
LuceneService luceneService = LuceneServiceProvider.get(getCache());
final LuceneQuery<String, TestObject> query =
luceneService.createLuceneQueryFactory()
.create(INDEX_NAME, REGION_NAME, queryString, defaultField);
@@ -771,6 +748,10 @@ public class LuceneIndexCommandsDUnitTest extends
CliCommandTestBase {
new Object[] {regionPath});
}
+ private static Cache getCache() {
+ return LocatorServerStartupRule.serverStarter.getCache();
+ }
+
protected class TestObject implements Serializable {
private String field1;
private String field2;
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
