[geode] branch feature/GEODE-6511 updated: Add more tests

[jchen21]

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

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


The following commit(s) were added to refs/heads/feature/GEODE-6511 by this 
push:
     new 59b2d96  Add more tests
59b2d96 is described below

commit 59b2d96027bb57ec32c1295eca9cc808643d58db
Author: Jianxia Chen <jc...@pivotal.io>
AuthorDate: Tue Mar 12 16:31:06 2019 -0700

    Add more tests
    
    Co-authored-by: Ben Ross <br...@pivotal.io>
    Co-authored-by: Jianxia Chen <jc...@pivotal.io>
---
 .../internal/cli/DescribeDataSourceCommandDUnitTest.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommandDUnitTest.java
 
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommandDUnitTest.java
index 472b4ec..cdb4bfb 100644
--- 
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommandDUnitTest.java
+++ 
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommandDUnitTest.java
@@ -61,14 +61,14 @@ public class DescribeDataSourceCommandDUnitTest {
   @Test
   public void describeDataSourceForSimpleDataSource() {
     gfsh.executeAndAssertThat(
-        "create data-source --name=simple 
--url=\"jdbc:derby:memory:newDB;create=true\" --username=joe 
--password=myPassword")
+        "create data-source --name=simple --pooled=false 
--url=\"jdbc:derby:memory:newDB;create=true\" --username=joe 
--password=myPassword")
         .statusIsSuccess().tableHasColumnOnlyWithValues("Member", "server-1");
 
     CommandResultAssert result = gfsh.executeAndAssertThat("describe 
data-source --name=simple");
 
     result.statusIsSuccess()
         .tableHasRowWithValues("Property", "Value", "name", "simple")
-        .tableHasRowWithValues("Property", "Value", "pooled", "true")
+        .tableHasRowWithValues("Property", "Value", "pooled", "false")
         .tableHasRowWithValues("Property", "Value", "username", "joe")
         .tableHasRowWithValues("Property", "Value", "url", 
"jdbc:derby:memory:newDB;create=true");
     
assertThat(result.getResultModel().toString()).doesNotContain("myPassword");
@@ -87,7 +87,7 @@ public class DescribeDataSourceCommandDUnitTest {
   private void executeSql(String sql) {
     server.invoke(() -> {
       try {
-        DataSource ds = JNDIInvoker.getDataSource("simple");
+        DataSource ds = JNDIInvoker.getDataSource("pool");
         Connection conn = ds.getConnection();
         Statement sm = conn.createStatement();
         sm.execute(sql);
@@ -136,23 +136,23 @@ public class DescribeDataSourceCommandDUnitTest {
   @Test
   public void describeDataSourceUsedByRegionsListsTheRegionsInOutput() {
     gfsh.executeAndAssertThat(
-        "create data-source --name=simple 
--url=\"jdbc:derby:memory:newDB;create=true\"")
+        "create data-source --name=pool 
--url=\"jdbc:derby:memory:newDB;create=true\"")
         .statusIsSuccess().tableHasColumnOnlyWithValues("Member", "server-1");
     gfsh.executeAndAssertThat("create region --name=region1 
--type=REPLICATE").statusIsSuccess();
     gfsh.executeAndAssertThat("create region --name=region2 
--type=PARTITION").statusIsSuccess();
     setupDatabase();
     try {
       gfsh.executeAndAssertThat(
-          "create jdbc-mapping --region=region1 --data-source=simple 
--pdx-name="
+          "create jdbc-mapping --region=region1 --data-source=pool --pdx-name="
               + IdAndName.class.getName() + " --schema=mySchema");
       gfsh.executeAndAssertThat(
-          "create jdbc-mapping --region=region2 --data-source=simple 
--pdx-name="
+          "create jdbc-mapping --region=region2 --data-source=pool --pdx-name="
               + IdAndName.class.getName() + " --schema=mySchema");
 
-      CommandResultAssert result = gfsh.executeAndAssertThat("describe 
data-source --name=simple");
+      CommandResultAssert result = gfsh.executeAndAssertThat("describe 
data-source --name=pool");
 
       result.statusIsSuccess()
-          .tableHasRowWithValues("Property", "Value", "name", "simple")
+          .tableHasRowWithValues("Property", "Value", "name", "pool")
           .tableHasRowWithValues("Property", "Value", "pooled", "true")
           .tableHasRowWithValues("Property", "Value", "url", 
"jdbc:derby:memory:newDB;create=true");
       InfoResultModel infoSection = result.getResultModel()