You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jc...@apache.org on 2018/11/08 01:13:09 UTC
[geode] branch feature/GEODE-6010 updated (7b0ab52 -> 1137b72)
This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a change to branch feature/GEODE-6010
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard 7b0ab52 WIP
new 1137b72 GEODE-6010: Add unit test for CreateMappingCommand
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7b0ab52)
\
N -- N -- N refs/heads/feature/GEODE-6010 (1137b72)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cli/CreateMappingCommandIntegrationTest.java | 52 ++----
.../internal/cli/CreateMappingCommandTest.java | 192 +++++++++++++++++++++
2 files changed, 206 insertions(+), 38 deletions(-)
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
[geode] 01/01: GEODE-6010: Add unit test for CreateMappingCommand
Posted by jc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a commit to branch feature/GEODE-6010
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 1137b72e9735c0faa9e554eed1cf94835dd559d2
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Wed Nov 7 13:03:26 2018 -0800
GEODE-6010: Add unit test for CreateMappingCommand
Co-authored-by: Darrel Schneider <ds...@pivotal.io>
Co-authored-by: Jianxia Chen <jc...@pivotal.io>
---
.../internal/cli/CreateMappingCommandTest.java | 192 +++++++++++++++++++++
1 file changed, 192 insertions(+)
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
new file mode 100644
index 0000000..5dfcb0d
--- /dev/null
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
@@ -0,0 +1,192 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.connectors.jdbc.internal.cli;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.CacheElement;
+import org.apache.geode.cache.configuration.RegionConfig;
+import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.management.cli.Result;
+import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
+import org.apache.geode.management.internal.cli.result.model.ResultModel;
+
+public class CreateMappingCommandTest {
+
+ private InternalCache cache;
+ private CreateMappingCommand createRegionMappingCommand;
+
+ private String regionName;
+ private String dataSourceName;
+ private String tableName;
+ private String pdxClass;
+ private DistributionManager distributionManager;
+ private Set<InternalDistributedMember> members;
+ private List<CliFunctionResult> results;
+ private CliFunctionResult successFunctionResult;
+ private RegionMapping mapping;
+ private CacheConfig cacheConfig;
+
+ @Before
+ public void setup() {
+ regionName = "regionName";
+ dataSourceName = "connection";
+ tableName = "testTable";
+ pdxClass = "myPdxClass";
+ cache = mock(InternalCache.class);
+ distributionManager = mock(DistributionManager.class);
+ when(cache.getDistributionManager()).thenReturn(distributionManager);
+ members = new HashSet<>();
+ members.add(mock(InternalDistributedMember.class));
+ when(distributionManager.getNormalDistributionManagerIds()).thenReturn(members);
+ createRegionMappingCommand = spy(CreateMappingCommand.class);
+ createRegionMappingCommand.setCache(cache);
+ results = new ArrayList<>();
+ successFunctionResult = mock(CliFunctionResult.class);
+ when(successFunctionResult.isSuccessful()).thenReturn(true);
+
+ doReturn(results).when(createRegionMappingCommand).executeAndGetFunctionResult(any(), any(),
+ any());
+
+ mapping = mock(RegionMapping.class);
+ when(mapping.getRegionName()).thenReturn(regionName);
+
+ cacheConfig = mock(CacheConfig.class);
+ }
+
+ @Test
+ public void createsMappingReturnsStatusOKWhenFunctionResultSuccess() {
+ results.add(successFunctionResult);
+
+ ResultModel result = createRegionMappingCommand.createMapping(regionName, dataSourceName,
+ tableName, pdxClass);
+
+ assertThat(result.getStatus()).isSameAs(Result.Status.OK);
+ RegionMapping regionMapping = (RegionMapping) result.getConfigObject();
+ assertThat(regionMapping).isNotNull();
+ assertThat(regionMapping.getRegionName()).isEqualTo(regionName);
+ assertThat(regionMapping.getDataSourceName()).isEqualTo(dataSourceName);
+ assertThat(regionMapping.getTableName()).isEqualTo(tableName);
+ assertThat(regionMapping.getPdxName()).isEqualTo(pdxClass);
+ }
+
+ @Test
+ public void createsMappingReturnsStatusERRORWhenFunctionResultIsEmpty() {
+ results.clear();
+
+ ResultModel result = createRegionMappingCommand.createMapping(regionName, dataSourceName,
+ tableName, pdxClass);
+
+ assertThat(result.getStatus()).isSameAs(Result.Status.ERROR);
+ }
+
+ @Test
+ public void testUpdateClusterConfigWithNoRegionsAndNoExistingElement() {
+ doReturn(null).when(cacheConfig).findCustomRegionElement(any(), any(), any());
+ when(cacheConfig.getRegions()).thenReturn(Collections.emptyList());
+ createRegionMappingCommand.updateClusterConfig(null, cacheConfig, mapping);
+ }
+
+ @Test
+ 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);
+ when(cacheConfig.getRegions()).thenReturn(list);
+
+ createRegionMappingCommand.updateClusterConfig(null, cacheConfig, mapping);
+
+ assertThat(listCacheElements.size()).isEqualTo(1);
+ assertThat(listCacheElements).contains(mapping);
+ }
+
+ @Test
+ public void testUpdateClusterConfigWithOneNonMatchingRegionAndNoExistingElement() {
+ doReturn(null).when(cacheConfig).findCustomRegionElement(any(), any(), any());
+ List<RegionConfig> list = new ArrayList<>();
+ RegionConfig nonMatchingRegion = mock(RegionConfig.class);
+ when(nonMatchingRegion.getName()).thenReturn("nonMatchingRegion");
+ List<CacheElement> listCacheElements = new ArrayList<>();
+ when(nonMatchingRegion.getCustomRegionElements()).thenReturn(listCacheElements);
+ list.add(nonMatchingRegion);
+ when(cacheConfig.getRegions()).thenReturn(list);
+
+ createRegionMappingCommand.updateClusterConfig(null, cacheConfig, mapping);
+
+ assertThat(listCacheElements).isEmpty();
+ }
+
+ @Test
+ public void testUpdateClusterConfigWithOneMatchingRegionAndExistingElement() {
+ RegionMapping existingMapping = mock(RegionMapping.class);
+ doReturn(existingMapping).when(cacheConfig).findCustomRegionElement(any(), any(), any());
+ RegionConfig matchingRegion = mock(RegionConfig.class);
+ when(matchingRegion.getName()).thenReturn(regionName);
+ List<CacheElement> listCacheElements = new ArrayList<>();
+ listCacheElements.add(existingMapping);
+ when(matchingRegion.getCustomRegionElements()).thenReturn(listCacheElements);
+ List<RegionConfig> list = new ArrayList<>();
+ list.add(matchingRegion);
+ when(cacheConfig.getRegions()).thenReturn(list);
+
+ createRegionMappingCommand.updateClusterConfig(null, cacheConfig, mapping);
+
+ assertThat(listCacheElements.size()).isEqualTo(1);
+ assertThat(listCacheElements).contains(mapping);
+ }
+
+ @Test
+ public void testUpdateClusterConfigWithOneNonMatchingRegionAndExistingElement() {
+ RegionMapping existingMapping = mock(RegionMapping.class);
+ doReturn(existingMapping).when(cacheConfig).findCustomRegionElement(any(), any(), any());
+ List<RegionConfig> list = new ArrayList<>();
+ RegionConfig nonMatchingRegion = mock(RegionConfig.class);
+ when(nonMatchingRegion.getName()).thenReturn("nonMatchingRegion");
+ List<CacheElement> listCacheElements = new ArrayList<>();
+ listCacheElements.add(existingMapping);
+ when(nonMatchingRegion.getCustomRegionElements()).thenReturn(listCacheElements);
+ list.add(nonMatchingRegion);
+ when(cacheConfig.getRegions()).thenReturn(list);
+
+ createRegionMappingCommand.updateClusterConfig(null, cacheConfig, mapping);
+
+ assertThat(listCacheElements.size()).isEqualTo(1);
+ assertThat(listCacheElements).contains(existingMapping);
+ }
+
+
+}