You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2017/11/07 21:38:30 UTC
[geode] branch develop updated: GEODE-2566 Missed merge issues
(#1031)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe 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 a5ea077 GEODE-2566 Missed merge issues (#1031)
a5ea077 is described below
commit a5ea0779b21591994fd44c809e2cf8fb753a5ed0
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Tue Nov 7 13:38:28 2017 -0800
GEODE-2566 Missed merge issues (#1031)
---
.../commands/DestroyIndexCommandsDUnitTest.java | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
index 96fbe71..0959804 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
@@ -67,7 +67,7 @@ public class DestroyIndexCommandsDUnitTest {
}
private static void createRegionAndIndex() throws Exception {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
RegionFactory factory = cache.createRegionFactory(RegionShortcut.REPLICATE);
Region region = factory.create(REGION_1);
@@ -83,12 +83,12 @@ public class DestroyIndexCommandsDUnitTest {
"Destroyed all indexes on region REGION1", "Destroyed all indexes on region REGION1");
server1.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes()).isEmpty();
});
server2.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes()).isEmpty();
});
@@ -105,12 +105,12 @@ public class DestroyIndexCommandsDUnitTest {
"Destroyed index INDEX1 on region REGION1", "Destroyed index INDEX1 on region REGION1");
server1.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes().size()).isEqualTo(1);
});
server2.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes().size()).isEqualTo(1);
});
@@ -132,12 +132,12 @@ public class DestroyIndexCommandsDUnitTest {
.tableHasColumnWithExactValuesInAnyOrder("Status", "Destroyed all indexes");
server1.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes()).isEmpty();
});
server2.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes().size()).isEqualTo(2);
});
@@ -153,12 +153,12 @@ public class DestroyIndexCommandsDUnitTest {
.tableHasColumnWithExactValuesInAnyOrder("Status", "Destroyed index INDEX1");
server1.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes().size()).isEqualTo(1);
});
server2.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes().size()).isEqualTo(2);
});
@@ -180,12 +180,12 @@ public class DestroyIndexCommandsDUnitTest {
.tableHasColumnWithExactValuesInAnyOrder("Status", "Destroyed index INDEX1");
server1.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes().size()).isEqualTo(1);
});
server2.invoke(() -> {
- Cache cache = LocatorServerStartupRule.serverStarter.getCache();
+ Cache cache = LocatorServerStartupRule.getCache();
assertThat(cache.getQueryService().getIndexes().size()).isEqualTo(2);
});
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].