This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5935
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5935 by this
push:
new 85eab40 describe jdbc-mapping tests now work
85eab40 is described below
commit 85eab40c2cd64a65a75e061655af43d4785b5ffa
Author: Darrel Schneider <[email protected]>
AuthorDate: Fri Oct 26 13:00:18 2018 -0700
describe jdbc-mapping tests now work
---
.../cli/DescribeMappingCommandDUnitTest.java | 8 ++-
.../jdbc/internal/cli/DescribeMappingCommand.java | 16 +-----
.../internal/cli/DescribeMappingCommandTest.java | 63 ++--------------------
3 files changed, 13 insertions(+), 74 deletions(-)
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
index 14f94ac..b11e0b4 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
@@ -67,9 +67,11 @@ public class DescribeMappingCommandDUnitTest implements
Serializable {
server = startupRule.startServerVM(1, locator.getPort());
gfsh.connectAndVerify(locator);
+ gfsh.executeAndAssertThat("create region --name=" + REGION_NAME + "
--type=REPLICATE")
+ .statusIsSuccess();
CommandStringBuilder csb = new CommandStringBuilder(CREATE_MAPPING);
- csb.addOption(CREATE_MAPPING__REGION_NAME, "testRegion");
+ csb.addOption(CREATE_MAPPING__REGION_NAME, REGION_NAME);
csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "testTable");
csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
@@ -100,6 +102,8 @@ public class DescribeMappingCommandDUnitTest implements
Serializable {
locator = startupRule.startLocatorVM(0);
server = startupRule.startServerVM(1, locator.getPort());
gfsh.connectAndVerify(locator);
+ gfsh.executeAndAssertThat("create region --name=" + REGION_NAME + "
--type=REPLICATE")
+ .statusIsSuccess();
CommandStringBuilder csb = new CommandStringBuilder(DESCRIBE_MAPPING)
.addOption(DESCRIBE_MAPPING__REGION_NAME, "nonExisting");
@@ -119,6 +123,8 @@ public class DescribeMappingCommandDUnitTest implements
Serializable {
locator = startupRule.startLocatorVM(0, properties);
server = startupRule.startServerVM(1, locator.getPort());
gfsh.connectAndVerify(locator);
+ gfsh.executeAndAssertThat("create region --name=" + REGION_NAME + "
--type=REPLICATE")
+ .statusIsSuccess();
server.invoke(() -> createRegionMapping());
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
index aa20042..8905cbf 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
@@ -58,19 +58,6 @@ public class DescribeMappingCommand extends GfshCommand {
mandatory = true, help = DESCRIBE_MAPPING__REGION_NAME__HELP) String
regionName) {
RegionMapping mapping = null;
- // check if CC is available and use it to describe the connection
- // ConfigurationPersistenceService ccService =
getConfigurationPersistenceService();
- // if (ccService != null) {
- // CacheConfig cacheConfig = ccService.getCacheConfig("cluster");
- // if (cacheConfig != null) {
- // ConnectorService service =
- // cacheConfig.findCustomCacheElement("connector-service",
ConnectorService.class);
- // if (service != null) {
- // mapping = CacheElement.findElement(service.getRegionMapping(),
regionName);
- // }
- // }
- // } else {
- // otherwise get it from any member
Set<DistributedMember> members = findMembers(null, null);
if (members.size() > 0) {
DistributedMember targetMember = members.iterator().next();
@@ -79,8 +66,9 @@ public class DescribeMappingCommand extends GfshCommand {
if (result != null) {
mapping = (RegionMapping) result.getResultObject();
}
+ } else {
+ return ResultModel.createError(CliStrings.NO_MEMBERS_FOUND_MESSAGE);
}
- // }
if (mapping == null) {
throw new EntityNotFoundException(
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
index b20c9ca..aa94d2e 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
@@ -27,12 +27,9 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
-import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
-import
org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.rules.GfshParserRule;
@@ -40,8 +37,6 @@ import org.apache.geode.test.junit.rules.GfshParserRule;
public class DescribeMappingCommandTest {
public static final String COMMAND = "describe jdbc-mapping --region=region
";
private DescribeMappingCommand command;
- private ConfigurationPersistenceService ccService;
- private CacheConfig cacheConfig;
@ClassRule
public static GfshParserRule gfsh = new GfshParserRule();
@@ -49,10 +44,6 @@ public class DescribeMappingCommandTest {
@Before
public void setUp() {
command = spy(DescribeMappingCommand.class);
- ccService = mock(InternalConfigurationPersistenceService.class);
- doReturn(ccService).when(command).getConfigurationPersistenceService();
- cacheConfig = mock(CacheConfig.class);
- when(ccService.getCacheConfig("cluster")).thenReturn(cacheConfig);
}
@Test
@@ -61,61 +52,16 @@ public class DescribeMappingCommandTest {
.containsOutput("Invalid command");
}
- // @Test
- // public void whenCCServiceIsRunningAndNoConnectorServiceFound() {
- // doReturn(ccService).when(command).getConfigurationPersistenceService();
- // gfsh.executeAndAssertThat(command, COMMAND).statusIsError()
- // .containsOutput("mapping for region 'region' not found");
- // }
-
- // @Test
- // public void whenCCServiceIsRunningAndNoConnectionFound() {
- // doReturn(ccService).when(command).getConfigurationPersistenceService();
- //
- // ConnectorService connectorService = mock(ConnectorService.class);
- // when(cacheConfig.findCustomCacheElement(any(),
any())).thenReturn(connectorService);
- // gfsh.executeAndAssertThat(command, COMMAND).statusIsError()
- // .containsOutput("mapping for region 'region' not found");
- // }
-
- // @Test
- // public void whenCCIsAvailable() {
- // doReturn(ccService).when(command).getConfigurationPersistenceService();
- //
- // // mapping found in CC
- // RegionMapping mapping =
- // new RegionMapping("region", "class1", "table1", "name1", true);
- // mapping.getFieldMapping()
- // .add(new RegionMapping.FieldMapping("field1", "value1"));
- // mapping.getFieldMapping()
- // .add(new RegionMapping.FieldMapping("field2", "value2"));
- //
- // ConnectorService connectorService = mock(ConnectorService.class);
- // List<RegionMapping> mappings = new ArrayList<>();
- // when(connectorService.getRegionMapping()).thenReturn(mappings);
- // mappings.add(mapping);
- // when(cacheConfig.findCustomCacheElement(any(),
any())).thenReturn(connectorService);
- //
- // gfsh.executeAndAssertThat(command,
COMMAND).statusIsSuccess().containsOutput("region",
- // "region")
- // .containsOutput("connection", "name1").containsOutput("table", "table1")
- // .containsOutput("pdx-class-name", "class1")
- // .containsOutput("value-contains-primary-key",
"true").containsOutput("field1", "value1")
- // .containsOutput("field2", "value2");
- // }
-
@Test
- public void whenCCIsNotAvailableAndNoMemberExists() {
- doReturn(null).when(command).getConfigurationPersistenceService();
+ public void whenNoMemberExists() {
doReturn(Collections.emptySet()).when(command).findMembers(null, null);
gfsh.executeAndAssertThat(command, COMMAND).statusIsError()
- .containsOutput("mapping for region 'region' not found");
+ .containsOutput("No Members Found");
}
@Test
- public void whenCCIsNotAvailableAndMemberExists() {
- doReturn(null).when(command).getConfigurationPersistenceService();
+ public void whenMemberExists() {
doReturn(Collections.singleton(mock(DistributedMember.class))).when(command).findMembers(null,
null);
@@ -139,8 +85,7 @@ public class DescribeMappingCommandTest {
}
@Test
- public void whenCCIsNotAvailableAndNoMappingFoundOnMember() {
- doReturn(null).when(command).getConfigurationPersistenceService();
+ public void whenNoMappingFoundOnMember() {
doReturn(Collections.singleton(mock(DistributedMember.class))).when(command).findMembers(null,
null);
