(shardingsphere) branch master updated: Fix sonar issue on SubqueryExtractUtilsTest (#32670)

[zhangliang]

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 2f4f9807bcf Fix sonar issue on SubqueryExtractUtilsTest (#32670)
2f4f9807bcf is described below

commit 2f4f9807bcf0c33746ddff84c195a46717859eff
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Aug 25 17:41:04 2024 +0800

    Fix sonar issue on SubqueryExtractUtilsTest (#32670)
---
 .../statement/core/util/SubqueryExtractUtilsTest.java  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git 
a/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/util/SubqueryExtractUtilsTest.java
 
b/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/util/SubqueryExtractUtilsTest.java
index 030a4a86331..9ac7bc44264 100644
--- 
a/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/util/SubqueryExtractUtilsTest.java
+++ 
b/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/util/SubqueryExtractUtilsTest.java
@@ -164,35 +164,27 @@ class SubqueryExtractUtilsTest {
     @Test
     void assertGetSubquerySegmentsWithMultiNestedSubquery() {
         SelectStatement selectStatement = mock(SelectStatement.class);
-        SubquerySegment subquerySelect = createSubquerySegmentForFrom();
+        SubquerySegment subquerySelect = createSubquerySegment();
         when(selectStatement.getFrom()).thenReturn(Optional.of(new 
SubqueryTableSegment(0, 0, subquerySelect)));
         Collection<SubquerySegment> actual = 
SubqueryExtractUtils.getSubquerySegments(selectStatement);
         assertThat(actual.size(), is(2));
     }
     
-    private SubquerySegment createSubquerySegmentForFrom() {
-        SelectStatement selectStatement = mock(SelectStatement.class);
-        ExpressionSegment left = new ColumnSegment(0, 0, new 
IdentifierValue("order_id"));
-        when(selectStatement.getWhere()).thenReturn(Optional.of(new 
WhereSegment(0, 0, new InExpression(0, 0,
-                left, new SubqueryExpressionSegment(new SubquerySegment(0, 0, 
mock(SelectStatement.class), "")), false))));
-        return new SubquerySegment(0, 0, selectStatement, "");
-    }
-    
     @Test
     void assertGetSubquerySegmentsWithCombineSegment() {
         SelectStatement selectStatement = mock(SelectStatement.class);
         SubquerySegment left = new SubquerySegment(0, 0, 
mock(SelectStatement.class), "");
-        SubquerySegment right = createSelectStatementForCombineSegment();
+        SubquerySegment right = createSubquerySegment();
         when(selectStatement.getCombine()).thenReturn(Optional.of(new 
CombineSegment(0, 0, left, CombineType.UNION, right)));
         Collection<SubquerySegment> actual = 
SubqueryExtractUtils.getSubquerySegments(selectStatement);
         assertThat(actual.size(), is(3));
     }
     
-    private SubquerySegment createSelectStatementForCombineSegment() {
+    private SubquerySegment createSubquerySegment() {
         SelectStatement selectStatement = mock(SelectStatement.class);
         ExpressionSegment left = new ColumnSegment(0, 0, new 
IdentifierValue("order_id"));
-        when(selectStatement.getWhere())
-                .thenReturn(Optional.of(new WhereSegment(0, 0, new 
InExpression(0, 0, left, new SubqueryExpressionSegment(new SubquerySegment(0, 
0, mock(SelectStatement.class), "")), false))));
+        when(selectStatement.getWhere()).thenReturn(
+                Optional.of(new WhereSegment(0, 0, new InExpression(0, 0, 
left, new SubqueryExpressionSegment(new SubquerySegment(0, 0, 
mock(SelectStatement.class), "")), false))));
         return new SubquerySegment(0, 0, selectStatement, "");
     }