[shardingsphere] branch master updated: Checkstyle for IntegrationTestEnvironment (#9319)

[me...@apache.org]

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

menghaoran 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 dc37a95  Checkstyle for IntegrationTestEnvironment (#9319)
dc37a95 is described below

commit dc37a95ae78f155dff269ae72ab90e5c862609ca
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Feb 4 16:42:31 2021 +0800

    Checkstyle for IntegrationTestEnvironment (#9319)
---
 .../test/integration/env/IntegrationTestEnvironment.java         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
index 538f30c..e44268a 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
@@ -54,10 +54,10 @@ public final class IntegrationTestEnvironment {
     
     private final Collection<String> adapters;
     
-    private final boolean runAdditionalTestCases;
-    
     private final Collection<String> scenarios;
     
+    private final boolean runAdditionalTestCases;
+    
     private final Map<DatabaseType, Map<String, DataSourceEnvironment>> dataSourceEnvironments;
     
     private final Map<String, DataSourceEnvironment> proxyEnvironments;
@@ -66,8 +66,8 @@ public final class IntegrationTestEnvironment {
         Properties engineEnvProps = EnvironmentProperties.loadProperties("env/engine-env.properties");
         envType = getEnvironmentType(engineEnvProps);
         adapters = Splitter.on(",").trimResults().splitToList(engineEnvProps.getProperty("it.adapters"));
-        runAdditionalTestCases = Boolean.parseBoolean(engineEnvProps.getProperty("it.run.additional.cases"));
         scenarios = getScenarios(engineEnvProps);
+        runAdditionalTestCases = Boolean.parseBoolean(engineEnvProps.getProperty("it.run.additional.cases"));
         Map<String, DatabaseScenarioProperties> databaseProps = getDatabaseScenarioProperties();
         dataSourceEnvironments = createDataSourceEnvironments(getDatabaseTypes(engineEnvProps), databaseProps);
         if (EnvironmentType.EMBEDDED == envType) {
@@ -109,7 +109,8 @@ public final class IntegrationTestEnvironment {
         return Arrays.stream(engineEnvProps.getProperty("it.databases", "H2").split(",")).map(each -> DatabaseTypeRegistry.getActualDatabaseType(each.trim())).collect(Collectors.toList());
     }
     
-    private Map<DatabaseType, Map<String, DataSourceEnvironment>> createDataSourceEnvironments(final Collection<DatabaseType> databaseTypes, final Map<String, DatabaseScenarioProperties> databaseProps) {
+    private Map<DatabaseType, Map<String, DataSourceEnvironment>> createDataSourceEnvironments(final Collection<DatabaseType> databaseTypes, 
+                                                                                               final Map<String, DatabaseScenarioProperties> databaseProps) {
         Map<DatabaseType, Map<String, DataSourceEnvironment>> result = new LinkedHashMap<>(databaseTypes.size(), 1);
         for (DatabaseType each : databaseTypes) {
             Map<String, DataSourceEnvironment> dataSourceEnvs = new LinkedHashMap<>(scenarios.size(), 1);