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 53d0dd3 Fixed data source command tests
53d0dd3 is described below
commit 53d0dd30a43abb10633e3b9ce6825e2ce609b56e
Author: Jianxia Chen <[email protected]>
AuthorDate: Tue Mar 12 12:05:15 2019 -0700
Fixed data source command tests
Co-authored-by: Ben Ross <[email protected]>
Co-authored-by: Jianxia Chen <[email protected]>
---
.../jdbc/internal/cli/DescribeDataSourceCommandDUnitTest.java | 4 ++--
.../jdbc/internal/cli/DestroyDataSourceCommandDUnitTest.java | 2 +-
.../jdbc/internal/cli/ListDataSourceCommandDUnitTest.java | 6 +++---
3 files changed, 6 insertions(+), 6 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 4b08344..472b4ec 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
@@ -68,7 +68,7 @@ public class DescribeDataSourceCommandDUnitTest {
result.statusIsSuccess()
.tableHasRowWithValues("Property", "Value", "name", "simple")
- .tableHasRowWithValues("Property", "Value", "pooled", "false")
+ .tableHasRowWithValues("Property", "Value", "pooled", "true")
.tableHasRowWithValues("Property", "Value", "username", "joe")
.tableHasRowWithValues("Property", "Value", "url",
"jdbc:derby:memory:newDB;create=true");
assertThat(result.getResultModel().toString()).doesNotContain("myPassword");
@@ -153,7 +153,7 @@ public class DescribeDataSourceCommandDUnitTest {
result.statusIsSuccess()
.tableHasRowWithValues("Property", "Value", "name", "simple")
- .tableHasRowWithValues("Property", "Value", "pooled", "false")
+ .tableHasRowWithValues("Property", "Value", "pooled", "true")
.tableHasRowWithValues("Property", "Value", "url",
"jdbc:derby:memory:newDB;create=true");
InfoResultModel infoSection = result.getResultModel()
.getInfoSection(DescribeDataSourceCommand.REGIONS_USING_DATA_SOURCE_SECTION);
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommandDUnitTest.java
index 1df7163..6615c06 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommandDUnitTest.java
@@ -62,7 +62,7 @@ public class DestroyDataSourceCommandDUnitTest {
gfsh.connectAndVerify(locator);
gfsh.execute(
- "create data-source --name=datasource1
--url=\"jdbc:derby:memory:newDB;create=true\"");
+ "create data-source --name=datasource1
--url=\"jdbc:derby:memory:newDB;create=true\" --pooled=false");
}
@Test
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommandDUnitTest.java
index b334ee2..66b589a 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommandDUnitTest.java
@@ -56,7 +56,7 @@ public class ListDataSourceCommandDUnitTest {
@Test
public void listDataSourceForSimpleDataSource() {
gfsh.executeAndAssertThat(
- "create data-source --name=simple
--url=\"jdbc:derby:memory:newDB;create=true\" --username=joe
--password=myPassword")
+ "create data-source --name=simple
--url=\"jdbc:derby:memory:newDB;create=true\" --username=joe
--password=myPassword --pooled=false ")
.statusIsSuccess().tableHasColumnOnlyWithValues("Member", "server-1");
CommandResultAssert result = gfsh.executeAndAssertThat("list data-source");
@@ -128,7 +128,7 @@ public class ListDataSourceCommandDUnitTest {
@Test
public void listDataSourceUsedByRegionsHasCorrectOutput() {
gfsh.executeAndAssertThat(
- "create data-source --name=simple
--url=\"jdbc:derby:memory:newDB;create=true\"")
+ "create data-source --name=simple
--url=\"jdbc:derby:memory:newDB;create=true\" --pooled=false")
.statusIsSuccess().tableHasColumnOnlyWithValues("Member", "server-1");
setupDatabase();
gfsh.executeAndAssertThat("create region --name=region1
--type=REPLICATE").statusIsSuccess();
@@ -165,7 +165,7 @@ public class ListDataSourceCommandDUnitTest {
@Test
public void listDataSourceWithMultipleDataSourcesListsAll() {
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");
gfsh.executeAndAssertThat(
"create data-source --name=pooledDataSource --pooled
--url=\"jdbc:derby:memory:newDB;create=true\"
--pooled-data-source-factory-class=org.apache.geode.internal.jta.CacheJTAPooledDataSourceFactory
--pool-properties={'name':'prop1','value':'value1'},{'name':'pool.prop2','value':'value2'}")
