[shardingsphere] branch master updated: Add test case for DataSourceConverter.getDataSourceParameter (#7004)

[panjuan]

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

panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 0bba6ef  Add test case for DataSourceConverter.getDataSourceParameter 
(#7004)
     new ebdf4f9  Merge pull request #7092 from victorzhangchn/7004
0bba6ef is described below

commit 0bba6efc11d24722c18e5ad59e71c6f3e64d66e7
Author: victorzhangchn <victorzhang...@qq.com>
AuthorDate: Wed Aug 26 20:15:34 2020 +0800

    Add test case for DataSourceConverter.getDataSourceParameter (#7004)
---
 .../proxy/config/util/DataSourceConverterTest.java | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceConverterTest.java
 
b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceConverterTest.java
index f8f6cef..234877b 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceConverterTest.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceConverterTest.java
@@ -26,7 +26,11 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import javax.sql.DataSource;
 
 public final class DataSourceConverterTest {
     
@@ -76,4 +80,39 @@ public final class DataSourceConverterTest {
         assertThat(props.get("username"), is("root"));
         assertThat(props.get("password"), is("root"));
     }
+    
+    @Test
+    public void assertGetDataSourceParameter() {
+        DataSource dataSource = createDataSource();
+        DataSourceParameter actual = 
DataSourceConverter.getDataSourceParameter(dataSource);
+        assertDataSourceParameter(actual);
+    }
+    
+    private DataSource createDataSource() {
+        HikariDataSource hikariDataSource = new HikariDataSource();
+        hikariDataSource.setJdbcUrl("jdbc:mysql://localhost:3306/demo_ds");
+        hikariDataSource.setUsername("root");
+        hikariDataSource.setPassword("root");
+        hikariDataSource.setConnectionTimeout(30 * 1000L);
+        hikariDataSource.setIdleTimeout(60 * 1000L);
+        hikariDataSource.setMaxLifetime(0L);
+        hikariDataSource.setMaximumPoolSize(50);
+        hikariDataSource.setMinimumIdle(1);
+        hikariDataSource.setReadOnly(true);
+        return hikariDataSource;
+    }
+    
+    private void assertDataSourceParameter(final DataSourceParameter actual) {
+        assertNotNull(actual);
+        assertThat(actual.getUrl(), is("jdbc:mysql://localhost:3306/demo_ds"));
+        assertThat(actual.getUsername(), is("root"));
+        assertThat(actual.getPassword(), is("root"));
+        assertThat(actual.getConnectionTimeoutMilliseconds(), is(30 * 1000L));
+        assertThat(actual.getIdleTimeoutMilliseconds(), is(60 * 1000L));
+        assertThat(actual.getMaxLifetimeMilliseconds(), is(0L));
+        assertThat(actual.getMaintenanceIntervalMilliseconds(), is(30 * 
1000L));
+        assertThat(actual.getMaxPoolSize(), is(50));
+        assertThat(actual.getMinPoolSize(), is(1));
+        assertTrue(actual.isReadOnly());
+    }
 }