You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by GitBox <gi...@apache.org> on 2022/08/03 10:14:46 UTC
[GitHub] [shardingsphere] yx9o opened a new pull request, #19838: Refactor DataSourceGeneratedDatabaseConfigurationTest.
yx9o opened a new pull request, #19838:
URL: https://github.com/apache/shardingsphere/pull/19838
Refactor DataSourceGeneratedDatabaseConfigurationTest.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] codecov-commenter commented on pull request #19838: Refactor DataSourceGeneratedDatabaseConfigurationTest.
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on PR #19838:
URL: https://github.com/apache/shardingsphere/pull/19838#issuecomment-1203825416
# [Codecov](https://codecov.io/gh/apache/shardingsphere/pull/19838?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#19838](https://codecov.io/gh/apache/shardingsphere/pull/19838?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (85483c9) into [master](https://codecov.io/gh/apache/shardingsphere/commit/23f9f718ad86e06a1d62d3e0d1f64a1c32c00ecc?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (23f9f71) will **decrease** coverage by `0.01%`.
> The diff coverage is `n/a`.
```diff
@@ Coverage Diff @@
## master #19838 +/- ##
============================================
- Coverage 60.11% 60.09% -0.02%
Complexity 2409 2409
============================================
Files 3851 3851
Lines 54907 54907
Branches 7704 7704
============================================
- Hits 33007 32999 -8
- Misses 19067 19076 +9
+ Partials 2833 2832 -1
```
| [Impacted Files](https://codecov.io/gh/apache/shardingsphere/pull/19838?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [...handler/distsql/ral/hint/enums/HintSourceType.java](https://codecov.io/gh/apache/shardingsphere/pull/19838/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC9oYW5kbGVyL2Rpc3RzcWwvcmFsL2hpbnQvZW51bXMvSGludFNvdXJjZVR5cGUuamF2YQ==) | `0.00% <0.00%> (-42.86%)` | :arrow_down: |
| [.../datasource/pool/creator/DataSourceReflection.java](https://codecov.io/gh/apache/shardingsphere/pull/19838/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtaW5mcmEvc2hhcmRpbmdzcGhlcmUtaW5mcmEtY29tbW9uL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9pbmZyYS9kYXRhc291cmNlL3Bvb2wvY3JlYXRvci9EYXRhU291cmNlUmVmbGVjdGlvbi5qYXZh) | `71.42% <0.00%> (-7.15%)` | :arrow_down: |
Help us with your feedback. Take ten seconds to tell us [how you rate us](https://about.codecov.io/nps?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] terrymanu merged pull request #19838: Refactor DataSourceGeneratedDatabaseConfigurationTest.
Posted by GitBox <gi...@apache.org>.
terrymanu merged PR #19838:
URL: https://github.com/apache/shardingsphere/pull/19838
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] yx9o commented on a diff in pull request #19838: Refactor DataSourceGeneratedDatabaseConfigurationTest.
Posted by GitBox <gi...@apache.org>.
yx9o commented on code in PR #19838:
URL: https://github.com/apache/shardingsphere/pull/19838#discussion_r937247432
##########
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java:
##########
@@ -34,32 +26,60 @@
import org.apache.shardingsphere.infra.fixture.FixtureRuleConfiguration;
import org.junit.Test;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class DataSourceGeneratedDatabaseConfigurationTest {
@Test
- public void assertDataSourceGeneratedDatabaseConfiguration() {
- String url = "jdbc:mysql://192.168.0.1:3306/foo_ds";
- String username = "root";
- String password = "root";
- ConnectionConfiguration configuration = new ConnectionConfiguration(url, username, password);
- PoolConfiguration poolConfiguration = new PoolConfiguration(2000L, 1000L, 1000L, 6, 2, false, new Properties());
- DataSourceConfiguration dataSourceConfiguration = new DataSourceConfiguration(configuration, poolConfiguration);
- Map<String, DataSourceConfiguration> dataSources = new HashMap<>(1);
- dataSources.put("dsc", dataSourceConfiguration);
- DataSourceGeneratedDatabaseConfiguration databaseConfiguration = new DataSourceGeneratedDatabaseConfiguration(dataSources,
- Collections.singletonList(new FixtureRuleConfiguration("rule0")));
- DataSource dataSource = databaseConfiguration.getDataSources().get("dsc");
- assertThat(dataSource, instanceOf(HikariDataSource.class));
- assertThat(((HikariDataSource) dataSource).getUsername(), is(username));
- assertThat(((HikariDataSource) dataSource).getPassword(), is(password));
- assertThat(((HikariDataSource) dataSource).getJdbcUrl(), is(url));
- FixtureRuleConfiguration next =
- (FixtureRuleConfiguration) databaseConfiguration.getRuleConfigurations().iterator().next();
- assertThat(next.getName(), is("rule0"));
- DataSourceProperties properties = databaseConfiguration.getDataSourceProperties().get("dsc");
- assertThat(properties.getPoolPropertySynonyms().getStandardPropertyKeys().size(), is(6));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("url"), is(url));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("username"), is(username));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("password"), is(password));
+ public void assertDataSource() {
+ DataSourceGeneratedDatabaseConfiguration databaseConfig = createDataSourceGeneratedDatabaseConfiguration();
+ HikariDataSource hikariDataSource = (HikariDataSource) databaseConfig.getDataSources().get("normal_db");
+ assertThat(hikariDataSource.getJdbcUrl(), is("jdbc:mock://127.0.0.1/normal_db"));
+ assertThat(hikariDataSource.getUsername(), is("root"));
+ assertThat(hikariDataSource.getPassword(), is(""));
+ }
+
+ @Test
+ public void assertRuleConfiguration() {
+ DataSourceGeneratedDatabaseConfiguration databaseConfig = createDataSourceGeneratedDatabaseConfiguration();
+ FixtureRuleConfiguration ruleConfig = (FixtureRuleConfiguration) databaseConfig.getRuleConfigurations().iterator().next();
+ assertThat(ruleConfig.getName(), is("test_rule"));
+ }
+
+ @Test
+ public void assertDataSourceProperties() {
Review Comment:
Done, please review again, thank you.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] terrymanu commented on a diff in pull request #19838: Refactor DataSourceGeneratedDatabaseConfigurationTest.
Posted by GitBox <gi...@apache.org>.
terrymanu commented on code in PR #19838:
URL: https://github.com/apache/shardingsphere/pull/19838#discussion_r936634670
##########
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java:
##########
@@ -34,32 +26,60 @@
import org.apache.shardingsphere.infra.fixture.FixtureRuleConfiguration;
import org.junit.Test;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class DataSourceGeneratedDatabaseConfigurationTest {
@Test
- public void assertDataSourceGeneratedDatabaseConfiguration() {
- String url = "jdbc:mysql://192.168.0.1:3306/foo_ds";
- String username = "root";
- String password = "root";
- ConnectionConfiguration configuration = new ConnectionConfiguration(url, username, password);
- PoolConfiguration poolConfiguration = new PoolConfiguration(2000L, 1000L, 1000L, 6, 2, false, new Properties());
- DataSourceConfiguration dataSourceConfiguration = new DataSourceConfiguration(configuration, poolConfiguration);
- Map<String, DataSourceConfiguration> dataSources = new HashMap<>(1);
- dataSources.put("dsc", dataSourceConfiguration);
- DataSourceGeneratedDatabaseConfiguration databaseConfiguration = new DataSourceGeneratedDatabaseConfiguration(dataSources,
- Collections.singletonList(new FixtureRuleConfiguration("rule0")));
- DataSource dataSource = databaseConfiguration.getDataSources().get("dsc");
- assertThat(dataSource, instanceOf(HikariDataSource.class));
- assertThat(((HikariDataSource) dataSource).getUsername(), is(username));
- assertThat(((HikariDataSource) dataSource).getPassword(), is(password));
- assertThat(((HikariDataSource) dataSource).getJdbcUrl(), is(url));
- FixtureRuleConfiguration next =
- (FixtureRuleConfiguration) databaseConfiguration.getRuleConfigurations().iterator().next();
- assertThat(next.getName(), is("rule0"));
- DataSourceProperties properties = databaseConfiguration.getDataSourceProperties().get("dsc");
- assertThat(properties.getPoolPropertySynonyms().getStandardPropertyKeys().size(), is(6));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("url"), is(url));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("username"), is(username));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("password"), is(password));
+ public void assertDataSource() {
+ DataSourceGeneratedDatabaseConfiguration databaseConfig = createDataSourceGeneratedDatabaseConfiguration();
+ HikariDataSource hikariDataSource = (HikariDataSource) databaseConfig.getDataSources().get("normal_db");
+ assertThat(hikariDataSource.getJdbcUrl(), is("jdbc:mock://127.0.0.1/normal_db"));
+ assertThat(hikariDataSource.getUsername(), is("root"));
+ assertThat(hikariDataSource.getPassword(), is(""));
+ }
+
+ @Test
+ public void assertRuleConfiguration() {
Review Comment:
It is better to rename method as `assertGetRuleConfigurations`
##########
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java:
##########
@@ -34,32 +26,60 @@
import org.apache.shardingsphere.infra.fixture.FixtureRuleConfiguration;
import org.junit.Test;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class DataSourceGeneratedDatabaseConfigurationTest {
@Test
- public void assertDataSourceGeneratedDatabaseConfiguration() {
- String url = "jdbc:mysql://192.168.0.1:3306/foo_ds";
- String username = "root";
- String password = "root";
- ConnectionConfiguration configuration = new ConnectionConfiguration(url, username, password);
- PoolConfiguration poolConfiguration = new PoolConfiguration(2000L, 1000L, 1000L, 6, 2, false, new Properties());
- DataSourceConfiguration dataSourceConfiguration = new DataSourceConfiguration(configuration, poolConfiguration);
- Map<String, DataSourceConfiguration> dataSources = new HashMap<>(1);
- dataSources.put("dsc", dataSourceConfiguration);
- DataSourceGeneratedDatabaseConfiguration databaseConfiguration = new DataSourceGeneratedDatabaseConfiguration(dataSources,
- Collections.singletonList(new FixtureRuleConfiguration("rule0")));
- DataSource dataSource = databaseConfiguration.getDataSources().get("dsc");
- assertThat(dataSource, instanceOf(HikariDataSource.class));
- assertThat(((HikariDataSource) dataSource).getUsername(), is(username));
- assertThat(((HikariDataSource) dataSource).getPassword(), is(password));
- assertThat(((HikariDataSource) dataSource).getJdbcUrl(), is(url));
- FixtureRuleConfiguration next =
- (FixtureRuleConfiguration) databaseConfiguration.getRuleConfigurations().iterator().next();
- assertThat(next.getName(), is("rule0"));
- DataSourceProperties properties = databaseConfiguration.getDataSourceProperties().get("dsc");
- assertThat(properties.getPoolPropertySynonyms().getStandardPropertyKeys().size(), is(6));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("url"), is(url));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("username"), is(username));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("password"), is(password));
+ public void assertDataSource() {
+ DataSourceGeneratedDatabaseConfiguration databaseConfig = createDataSourceGeneratedDatabaseConfiguration();
+ HikariDataSource hikariDataSource = (HikariDataSource) databaseConfig.getDataSources().get("normal_db");
+ assertThat(hikariDataSource.getJdbcUrl(), is("jdbc:mock://127.0.0.1/normal_db"));
+ assertThat(hikariDataSource.getUsername(), is("root"));
+ assertThat(hikariDataSource.getPassword(), is(""));
+ }
+
+ @Test
+ public void assertRuleConfiguration() {
+ DataSourceGeneratedDatabaseConfiguration databaseConfig = createDataSourceGeneratedDatabaseConfiguration();
+ FixtureRuleConfiguration ruleConfig = (FixtureRuleConfiguration) databaseConfig.getRuleConfigurations().iterator().next();
+ assertThat(ruleConfig.getName(), is("test_rule"));
+ }
+
+ @Test
+ public void assertDataSourceProperties() {
Review Comment:
It is better to rename method as `assertGetDataSourceProperties`
##########
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java:
##########
@@ -34,32 +26,60 @@
import org.apache.shardingsphere.infra.fixture.FixtureRuleConfiguration;
import org.junit.Test;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class DataSourceGeneratedDatabaseConfigurationTest {
@Test
- public void assertDataSourceGeneratedDatabaseConfiguration() {
- String url = "jdbc:mysql://192.168.0.1:3306/foo_ds";
- String username = "root";
- String password = "root";
- ConnectionConfiguration configuration = new ConnectionConfiguration(url, username, password);
- PoolConfiguration poolConfiguration = new PoolConfiguration(2000L, 1000L, 1000L, 6, 2, false, new Properties());
- DataSourceConfiguration dataSourceConfiguration = new DataSourceConfiguration(configuration, poolConfiguration);
- Map<String, DataSourceConfiguration> dataSources = new HashMap<>(1);
- dataSources.put("dsc", dataSourceConfiguration);
- DataSourceGeneratedDatabaseConfiguration databaseConfiguration = new DataSourceGeneratedDatabaseConfiguration(dataSources,
- Collections.singletonList(new FixtureRuleConfiguration("rule0")));
- DataSource dataSource = databaseConfiguration.getDataSources().get("dsc");
- assertThat(dataSource, instanceOf(HikariDataSource.class));
- assertThat(((HikariDataSource) dataSource).getUsername(), is(username));
- assertThat(((HikariDataSource) dataSource).getPassword(), is(password));
- assertThat(((HikariDataSource) dataSource).getJdbcUrl(), is(url));
- FixtureRuleConfiguration next =
- (FixtureRuleConfiguration) databaseConfiguration.getRuleConfigurations().iterator().next();
- assertThat(next.getName(), is("rule0"));
- DataSourceProperties properties = databaseConfiguration.getDataSourceProperties().get("dsc");
- assertThat(properties.getPoolPropertySynonyms().getStandardPropertyKeys().size(), is(6));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("url"), is(url));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("username"), is(username));
- assertThat(properties.getConnectionPropertySynonyms().getStandardProperties().get("password"), is(password));
+ public void assertDataSource() {
Review Comment:
It is better to rename method as `assertGetDataSources`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org