You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/06/09 10:50:57 UTC
[shardingsphere] branch master updated: Fix CI ParseDistSQLBackendHandlerTest ERROR (#18264)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 7b121cc3887 Fix CI ParseDistSQLBackendHandlerTest ERROR (#18264)
7b121cc3887 is described below
commit 7b121cc38879585580c00bec1f3715eba01cb76d
Author: cheese8 <yi...@163.com>
AuthorDate: Thu Jun 9 18:50:50 2022 +0800
Fix CI ParseDistSQLBackendHandlerTest ERROR (#18264)
* Update RC4EncryptAlgorithm.java
* fix ci ut error
---
.../ral/advance/ParseDistSQLBackendHandlerTest.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advance/ParseDistSQLBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advance/ParseDistSQLBackendHandlerTest.java
index 8a81e22b22c..3ddf8027e51 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advance/ParseDistSQLBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advance/ParseDistSQLBackendHandlerTest.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.proxy.backend.text.distsql.ral.advance;
import com.google.gson.Gson;
import org.apache.shardingsphere.distsql.parser.statement.ral.advanced.ParseStatement;
+import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
@@ -42,7 +43,6 @@ import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
@@ -53,17 +53,25 @@ public final class ParseDistSQLBackendHandlerTest extends ProxyContextRestorer {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ContextManager contextManager;
+ @Mock
+ private MySQLDatabaseType mySQLDatabaseType;
+
+ @Mock
+ private ConnectionSession connectionSession;
+
@Before
public void setUp() throws SQLException {
ProxyContext.init(contextManager);
when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().findSingleRule(SQLParserRule.class)).thenReturn(Optional.of(sqlParserRule));
+ when(mySQLDatabaseType.getType()).thenReturn("MySQL");
+ when(connectionSession.getDatabaseType()).thenReturn(mySQLDatabaseType);
}
@Test
public void assertGetRowData() throws SQLException {
String sql = "select * from t_order";
ParseStatement parseStatement = new ParseStatement(sql);
- ParseDistSQLBackendHandler parseDistSQLBackendHandler = new ParseDistSQLBackendHandler().init(new HandlerParameter<>(parseStatement, mock(ConnectionSession.class)));
+ ParseDistSQLBackendHandler parseDistSQLBackendHandler = new ParseDistSQLBackendHandler().init(new HandlerParameter<>(parseStatement, connectionSession));
parseDistSQLBackendHandler.execute();
parseDistSQLBackendHandler.next();
SQLStatement statement = sqlParserRule.getSQLParserEngine("MySQL").parse(sql, false);
@@ -75,7 +83,7 @@ public final class ParseDistSQLBackendHandlerTest extends ProxyContextRestorer {
public void assertExecute() throws SQLException {
String sql = "wrong sql";
ParseStatement parseStatement = new ParseStatement(sql);
- ParseDistSQLBackendHandler parseDistSQLBackendHandler = new ParseDistSQLBackendHandler().init(new HandlerParameter<>(parseStatement, mock(ConnectionSession.class)));
+ ParseDistSQLBackendHandler parseDistSQLBackendHandler = new ParseDistSQLBackendHandler().init(new HandlerParameter<>(parseStatement, connectionSession));
parseDistSQLBackendHandler.execute();
}
}