You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/03/25 10:45:47 UTC
[shardingsphere] branch master updated: Change log display level
for IT (#9819)
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 09f0727 Change log display level for IT (#9819)
09f0727 is described below
commit 09f07270dd80df8b32fadba67a3db0d63541f8a8
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Mar 25 18:45:13 2021 +0800
Change log display level for IT (#9819)
* Refactor BaseITCase
* Change log display level for IT
---
.../auth/model/privilege/ShardingSpherePrivilege.java | 3 +--
.../test/integration/engine/it/BaseITCase.java | 15 ++++-----------
.../src/test/resources/logback-test.xml | 2 +-
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/ShardingSpherePrivilege.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/ShardingSpherePrivilege.java
index 3ef4bfe..1efba77f 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/ShardingSpherePrivilege.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/ShardingSpherePrivilege.java
@@ -48,8 +48,7 @@ public final class ShardingSpherePrivilege {
* @return is empty or not
*/
public boolean isEmpty() {
- return administrativePrivilege.getPrivileges().isEmpty()
- && databasePrivilege.getGlobalPrivileges().isEmpty() && databasePrivilege.getSpecificPrivileges().isEmpty();
+ return administrativePrivilege.getPrivileges().isEmpty() && databasePrivilege.getGlobalPrivileges().isEmpty() && databasePrivilege.getSpecificPrivileges().isEmpty();
}
/**
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseITCase.java
index 47d03f6..ca13841 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseITCase.java
@@ -57,11 +57,9 @@ public abstract class BaseITCase {
public static final String NOT_VERIFY_FLAG = "NOT_VERIFY";
- @Getter
@OnContainer(name = "adapter")
private ShardingSphereAdapterContainer proxy;
- @Getter
@OnContainer(name = "storage", type = ContainerType.STORAGE, hostName = "mysql.db.host")
private ShardingSphereStorageContainer storage;
@@ -74,7 +72,6 @@ public abstract class BaseITCase {
@ShardingSphereITInject
private String statement;
- @Getter
@ShardingSphereITInject
private TestCaseDescription description;
@@ -84,7 +81,7 @@ public abstract class BaseITCase {
@ShardingSphereITInject
private String parentPath;
- private DataSource dataSource;
+ private DataSource targetDataSource;
static {
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
@@ -99,11 +96,7 @@ public abstract class BaseITCase {
@Before
public void createDataSource() {
- dataSource = proxy.getDataSource();
- }
-
- protected DataSource getTargetDataSource() {
- return dataSource;
+ targetDataSource = proxy.getDataSource();
}
protected String getStatement() throws ParseException {
@@ -124,8 +117,8 @@ public abstract class BaseITCase {
@After
public final void tearDown() {
- if (dataSource instanceof ShardingSphereDataSource) {
- ((ShardingSphereDataSource) dataSource).getMetaDataContexts().getExecutorEngine().close();
+ if (targetDataSource instanceof ShardingSphereDataSource) {
+ ((ShardingSphereDataSource) targetDataSource).getMetaDataContexts().getExecutorEngine().close();
}
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/logback-test.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/logback-test.xml
index 0c97702..ed7f0db 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/logback-test.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/logback-test.xml
@@ -22,7 +22,7 @@
<pattern>[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
- <logger name="org.apache.shardingsphere" level="info" additivity="true">
+ <logger name="org.apache.shardingsphere" level="warn" additivity="true">
<appender-ref ref="console" />
</logger>
</configuration>