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 580d3fc Remove @Ignored test cases (#12920)
580d3fc is described below
commit 580d3fc48c5215a143d5ddc93ac120bc4cb08a4a
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Oct 7 20:57:57 2021 +0800
Remove @Ignored test cases (#12920)
---
.../packet/handshake/MySQLHandshakeResponse41PacketTest.java | 2 --
.../SpringNamespaceWithReadwriteSplittingForClusterTest.java | 10 ++++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git
a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLHandshakeResponse41PacketTest.java
b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLHandshakeResponse41PacketTest.java
index 22b54f8..2800892 100644
---
a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLHandshakeResponse41PacketTest.java
+++
b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLHandshakeResponse41PacketTest.java
@@ -21,7 +21,6 @@ import
org.apache.shardingsphere.db.protocol.mysql.constant.MySQLAuthenticationM
import
org.apache.shardingsphere.db.protocol.mysql.constant.MySQLCapabilityFlag;
import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLServerInfo;
import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -58,7 +57,6 @@ public final class MySQLHandshakeResponse41PacketTest {
}
@Test
- @Ignore("readAuthPluginName method need to rewrite")
public void assertNewWithPayloadWithAuthPluginName() {
when(payload.readInt1()).thenReturn(1, MySQLServerInfo.CHARSET);
when(payload.readInt4()).thenReturn(MySQLCapabilityFlag.CLIENT_PLUGIN_AUTH.getValue(),
1000);
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/SpringNamespaceWithReadwriteSplittingForClusterTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/SpringNamespaceWithReadwriteSplittingForClusterTest.java
index 9950f7a..cf6c36f 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/SpringNamespaceWithReadwriteSplittingForClusterTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/SpringNamespaceWithReadwriteSplittingForClusterTest.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.spring.namespace;
import
org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
-import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.infra.database.DefaultSchema;
+import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.readwritesplitting.algorithm.RandomReplicaLoadBalanceAlgorithm;
import
org.apache.shardingsphere.readwritesplitting.algorithm.RoundRobinReplicaLoadBalanceAlgorithm;
import
org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceRule;
@@ -30,7 +30,6 @@ import
org.apache.shardingsphere.readwritesplitting.spi.ReplicaLoadBalanceAlgori
import org.apache.shardingsphere.spring.namespace.util.EmbedTestingServer;
import org.apache.shardingsphere.spring.namespace.util.FieldValueUtil;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@@ -83,15 +82,14 @@ public final class
SpringNamespaceWithReadwriteSplittingForClusterTest extends A
}
@Test
- @Ignore
- // TODO load balance algorithm have been construct twice for
SpringDatasource extends ReplicaQueryDatasource.
public void assertRefReadwriteSplittingDataSource() {
ReplicaLoadBalanceAlgorithm randomLoadBalanceAlgorithm =
applicationContext.getBean("randomLoadBalanceAlgorithm",
ReplicaLoadBalanceAlgorithm.class);
Optional<ReadwriteSplittingRule> rule =
getReadwriteSplittingRule("refGovernanceDataSource");
assertTrue(rule.isPresent());
- Optional<ReadwriteSplittingDataSourceRule> dataSourceRule =
rule.get().findDataSourceRule("randomLoadBalanceAlgorithm");
+ Optional<ReadwriteSplittingDataSourceRule> dataSourceRule =
rule.get().findDataSourceRule("random_dbtbl_1");
assertTrue(dataSourceRule.isPresent());
- assertThat(dataSourceRule.get().getLoadBalancer(),
is(randomLoadBalanceAlgorithm));
+ // TODO load balance algorithm have been construct twice for
SpringDatasource extends ReplicaQueryDatasource. just assert type for temp
+ assertThat(dataSourceRule.get().getLoadBalancer().getType(),
is(randomLoadBalanceAlgorithm.getType()));
}
private Optional<ReadwriteSplittingRule> getReadwriteSplittingRule(final
String dataSourceName) {
