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 124a527 list jdbc-mapping tests now work
124a527 is described below
commit 124a527732a40a5496e373cea4a29960039c6564
Author: Darrel Schneider <[email protected]>
AuthorDate: Fri Oct 26 12:49:54 2018 -0700
list jdbc-mapping tests now work
---
.../internal/cli/ListMappingCommandDUnitTest.java | 6 ++
.../jdbc/internal/cli/ListMappingCommand.java | 23 ++-----
.../jdbc/internal/cli/ListMappingCommandTest.java | 71 ++--------------------
3 files changed, 16 insertions(+), 84 deletions(-)
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
index c910a6e..2ffe403 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
@@ -58,6 +58,8 @@ public class ListMappingCommandDUnitTest implements
Serializable {
locator = startupRule.startLocatorVM(0);
server = startupRule.startServerVM(1, locator.getPort());
gfsh.connectAndVerify(locator);
+ gfsh.executeAndAssertThat("create region --name=" + regionName + "
--type=REPLICATE")
+ .statusIsSuccess();
String mapping = "create jdbc-mapping --region=testRegion
--connection=connection "
+ "--table=myTable --pdx-class-name=myPdxClass
--value-contains-primary-key=true "
@@ -80,6 +82,8 @@ public class ListMappingCommandDUnitTest implements
Serializable {
locator = startupRule.startLocatorVM(0, properties);
server = startupRule.startServerVM(1, locator.getPort());
gfsh.connectAndVerify(locator);
+ gfsh.executeAndAssertThat("create region --name=" + regionName + "
--type=REPLICATE")
+ .statusIsSuccess();
server.invoke(() -> createNRegionMappings(3));
@@ -97,6 +101,8 @@ public class ListMappingCommandDUnitTest implements
Serializable {
locator = startupRule.startLocatorVM(0);
server = startupRule.startServerVM(1, locator.getPort());
gfsh.connectAndVerify(locator);
+ gfsh.executeAndAssertThat("create region --name=" + regionName + "
--type=REPLICATE")
+ .statusIsSuccess();
CommandStringBuilder csb = new CommandStringBuilder(LIST_MAPPING);
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
index 213756e..e24712b 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
@@ -50,19 +50,6 @@ public class ListMappingCommand extends GfshCommand {
public ResultModel listMapping() {
Collection<RegionMapping> mappings = null;
- // check if CC is available and use it to describe the connection
- // ConfigurationPersistenceService ccService =
getConfigurationPersistenceService();
- // if (ccService != null) {
- // CacheConfig cacheConfig = ccService.getCacheConfig(CLUSTER_CONFIG);
- // if (cacheConfig != null) {
- // ConnectorService service =
- // cacheConfig.findCustomCacheElement("connector-service",
ConnectorService.class);
- // if (service != null) {
- // mappings = service.getRegionMapping();
- // }
- // }
- // } else {
- // otherwise get it from any member
Set<DistributedMember> members = findMembers(null, null);
if (members.size() > 0) {
DistributedMember targetMember = members.iterator().next();
@@ -71,11 +58,8 @@ public class ListMappingCommand extends GfshCommand {
if (result != null) {
mappings = (Collection<RegionMapping>) result.getResultObject();
}
- }
- // }
-
- if (mappings == null) {
- return ResultModel.createInfo(EXPERIMENTAL + "\n" + "No mappings found");
+ } else {
+ return ResultModel.createError(CliStrings.NO_MEMBERS_FOUND_MESSAGE);
}
// output
@@ -95,6 +79,9 @@ public class ListMappingCommand extends GfshCommand {
*/
private boolean fillTabularResultData(Collection<RegionMapping> mappings,
TabularResultModel tableModel) {
+ if (mappings == null) {
+ return false;
+ }
for (RegionMapping mapping : mappings) {
tableModel.accumulate(LIST_OF_MAPPINGS, mapping.getRegionName());
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
index 10da42f..678d4d3 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
@@ -29,12 +29,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;
@@ -42,8 +39,6 @@ import org.apache.geode.test.junit.rules.GfshParserRule;
public class ListMappingCommandTest {
public static final String COMMAND = "list jdbc-mappings";
private ListMappingCommand command;
- private ConfigurationPersistenceService ccService;
- private CacheConfig cacheConfig;
@ClassRule
public static GfshParserRule gfsh = new GfshParserRule();
@@ -51,73 +46,18 @@ public class ListMappingCommandTest {
@Before
public void setUp() {
command = spy(ListMappingCommand.class);
- ccService = mock(InternalConfigurationPersistenceService.class);
- doReturn(ccService).when(command).getConfigurationPersistenceService();
- cacheConfig = mock(CacheConfig.class);
- when(ccService.getCacheConfig("cluster")).thenReturn(cacheConfig);
}
- // @Test
- // public void whenCCServiceIsNotAvailable() {
- // doReturn(null).when(command).getConfigurationPersistenceService();
- // doReturn(Collections.emptySet()).when(command).findMembers(any(), any());
- // gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
- // .containsOutput("No mappings found");
- // }
-
- // @Test
- // public void whenCCServiceIsRunningAndNoConnectorServiceFound() {
- // doReturn(ccService).when(command).getConfigurationPersistenceService();
- // gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
- // .containsOutput("(Experimental) \\nNo mappings 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).statusIsSuccess()
- // .containsOutput("(Experimental) \\nNo mappings found");
- // }
- //
- // @Test
- // public void whenCCIsAvailable() {
- // doReturn(ccService).when(command).getConfigurationPersistenceService();
- //
- // // mappings found in CC
- // RegionMapping mapping1 =
- // new RegionMapping("region1", "class1", "table1", "name1", true);
- // mapping1.getFieldMapping()
- // .add(new RegionMapping.FieldMapping("field1", "value1"));
- // RegionMapping mapping2 =
- // new RegionMapping("region2", "class2", "table2", "name2", true);
- // mapping2.getFieldMapping()
- // .add(new RegionMapping.FieldMapping("field2", "value2"));
- //
- // ConnectorService connectorService = new ConnectorService();
- // connectorService.getRegionMapping().add(mapping1);
- // connectorService.getRegionMapping().add(mapping2);
- //
- // when(cacheConfig.findCustomCacheElement(any(),
any())).thenReturn(connectorService);
- //
- // gfsh.executeAndAssertThat(command,
COMMAND).statusIsSuccess().containsOutput("region1",
- // "region2");
- // }
-
@Test
- public void whenCCIsNotAvailableAndNoMemberExists() {
- // doReturn(null).when(command).getConfigurationPersistenceService();
+ public void whenNoMemberExists() {
doReturn(Collections.emptySet()).when(command).findMembers(null, null);
- gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
- .containsOutput("No mappings found");
+ gfsh.executeAndAssertThat(command, COMMAND).statusIsError()
+ .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);
@@ -146,8 +86,7 @@ public class ListMappingCommandTest {
@Test
- public void whenCCIsNotAvailableAndNoConnectionFoundOnMember() {
- // doReturn(null).when(command).getConfigurationPersistenceService();
+ public void whenNoMappingsExist() {
doReturn(Collections.singleton(mock(DistributedMember.class))).when(command).findMembers(null,
null);
