[geode] 02/02: CreateMappingCommandTest now passes

[ds...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dschneider pushed a commit to branch feature/GEODE-6010
in repository https://gitbox.apache.org/repos/asf/geode.git

commit ade6e6a36c5bd59153f77e029fc1d3ece7379bc3
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Thu Nov 8 11:08:56 2018 -0800

    CreateMappingCommandTest now passes
---
 .../jdbc/internal/cli/CreateMappingCommand.java    |  6 +++--
 .../internal/cli/CreateMappingCommandTest.java     | 29 ++++++++++++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
index d8449ac..f00c015 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
@@ -69,7 +69,8 @@ public class CreateMappingCommand extends SingleGfshCommand {
         pdxName, table, dataSourceName);
 
     // action
-    ConfigurationPersistenceService configurationPersistenceService = getConfigurationPersistenceService();
+    ConfigurationPersistenceService configurationPersistenceService =
+        getConfigurationPersistenceService();
     if (configurationPersistenceService == null) {
       return ResultModel.createError("Cluster Configuration must be enabled.");
     }
@@ -79,7 +80,8 @@ public class CreateMappingCommand extends SingleGfshCommand {
         .getRegions()
         .stream()
         .anyMatch(regionConfig -> regionConfig.getName().equals(mapping.getRegionName()))) {
-      return ResultModel.createError("Cluster Configuration must contain a region named " + regionName);
+      return ResultModel
+          .createError("Cluster Configuration must contain a region named " + regionName);
     }
 
     List<CliFunctionResult> results =
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
index 9cdbe72..0b84043 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
@@ -57,6 +57,7 @@ public class CreateMappingCommandTest {
   private CliFunctionResult successFunctionResult;
   private RegionMapping mapping;
   private CacheConfig cacheConfig;
+  RegionConfig matchingRegion;
 
   @Before
   public void setup() {
@@ -83,10 +84,26 @@ public class CreateMappingCommandTest {
     when(mapping.getRegionName()).thenReturn(regionName);
 
     cacheConfig = mock(CacheConfig.class);
+
+    matchingRegion = mock(RegionConfig.class);
+    when(matchingRegion.getName()).thenReturn(regionName);
+
+  }
+
+  private void setupRequiredPreconditions() {
+    ConfigurationPersistenceService configurationPersistenceService =
+        mock(ConfigurationPersistenceService.class);
+    doReturn(configurationPersistenceService).when(createRegionMappingCommand)
+        .getConfigurationPersistenceService();
+    when(configurationPersistenceService.getCacheConfig(null)).thenReturn(cacheConfig);
+    List<RegionConfig> list = new ArrayList<>();
+    list.add(matchingRegion);
+    when(cacheConfig.getRegions()).thenReturn(list);
   }
 
   @Test
   public void createsMappingReturnsStatusOKWhenFunctionResultSuccess() {
+    setupRequiredPreconditions();
     results.add(successFunctionResult);
 
     ResultModel result = createRegionMappingCommand.createMapping(regionName, dataSourceName,
@@ -103,6 +120,7 @@ public class CreateMappingCommandTest {
 
   @Test
   public void createsMappingReturnsStatusERRORWhenFunctionResultIsEmpty() {
+    setupRequiredPreconditions();
     results.clear();
 
     ResultModel result = createRegionMappingCommand.createMapping(regionName, dataSourceName,
@@ -126,8 +144,10 @@ public class CreateMappingCommandTest {
   @Test
   public void createsMappingReturnsStatusERRORWhenClusterConfigDoesNotContainRegion() {
     results.add(successFunctionResult);
-    ConfigurationPersistenceService configurationPersistenceService = mock(ConfigurationPersistenceService.class);
-    doReturn(configurationPersistenceService).when(createRegionMappingCommand).getConfigurationPersistenceService();
+    ConfigurationPersistenceService configurationPersistenceService =
+        mock(ConfigurationPersistenceService.class);
+    doReturn(configurationPersistenceService).when(createRegionMappingCommand)
+        .getConfigurationPersistenceService();
     when(configurationPersistenceService.getCacheConfig(null)).thenReturn(cacheConfig);
     when(cacheConfig.getRegions()).thenReturn(Collections.emptyList());
 
@@ -135,7 +155,8 @@ public class CreateMappingCommandTest {
         tableName, pdxClass);
 
     assertThat(result.getStatus()).isSameAs(Result.Status.ERROR);
-    assertThat(result.toString()).contains("Cluster Configuration must contain a region named " + regionName);
+    assertThat(result.toString())
+        .contains("Cluster Configuration must contain a region named " + regionName);
   }
 
   @Test
@@ -149,8 +170,6 @@ public class CreateMappingCommandTest {
   public void testUpdateClusterConfigWithOneMatchingRegionAndNoExistingElement() {
     doReturn(null).when(cacheConfig).findCustomRegionElement(any(), any(), any());
     List<RegionConfig> list = new ArrayList<>();
-    RegionConfig matchingRegion = mock(RegionConfig.class);
-    when(matchingRegion.getName()).thenReturn(regionName);
     List<CacheElement> listCacheElements = new ArrayList<>();
     when(matchingRegion.getCustomRegionElements()).thenReturn(listCacheElements);
     list.add(matchingRegion);