This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 67f094ae7c9 Code format for test cases (#31030)
67f094ae7c9 is described below
commit 67f094ae7c9b545056fcc35a50de459321dba412
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Apr 27 14:43:16 2024 +0800
Code format for test cases (#31030)
* Code format for test cases
* Code format for test cases
* Code format for test cases
---
.../PostgreSQLArrayParameterDecoderTest.java | 76 +++++++++++-----------
...PostgreSQLBoolArrayBinaryProtocolValueTest.java | 4 +-
...stgreSQLFloat4ArrayBinaryProtocolValueTest.java | 4 +-
...stgreSQLFloat8ArrayBinaryProtocolValueTest.java | 4 +-
...PostgreSQLInt2ArrayBinaryProtocolValueTest.java | 4 +-
...PostgreSQLInt4ArrayBinaryProtocolValueTest.java | 4 +-
...PostgreSQLInt8ArrayBinaryProtocolValueTest.java | 4 +-
.../PostgreSQLNumericBinaryProtocolValueTest.java | 4 +-
...stgreSQLStringArrayBinaryProtocolValueTest.java | 4 +-
...stgreSQLUnspecifiedBinaryProtocolValueTest.java | 6 +-
.../column/EncryptColumnNameReviserTest.java | 7 +-
.../encrypt/rule/EncryptRuleTest.java | 7 +-
...ncryptDataNodeRuleConfigurationSwapperTest.java | 2 +-
...mlMaskDataNodeRuleConfigurationSwapperTest.java | 4 +-
...ittingDataNodeRuleConfigurationSwapperTest.java | 2 +-
.../DropReadwriteSplittingRuleExecutorTest.java | 3 +-
...ShadowDataNodeRuleConfigurationSwapperTest.java | 2 +-
...ardingDataNodeRuleConfigurationSwapperTest.java | 4 +-
...eateShardingTableReferenceRuleExecutorTest.java | 5 +-
.../DropDefaultShardingStrategyExecutorTest.java | 3 +-
...ataSourceProvidedDatabaseConfigurationTest.java | 2 +-
.../metadata/database/rule/RuleMetaDataTest.java | 7 +-
.../memory/MemoryPipelineChannelCreatorTest.java | 6 +-
...rdSingleTableInventoryCalculatedResultTest.java | 10 ++-
...TableDataConsistencyCheckResultSwapperTest.java | 18 ++---
.../sql/parser/core/SQLParserFactoryTest.java | 11 +---
.../common/util/ExpressionExtractUtilsTest.java | 3 +-
.../sql/common/util/SubqueryExtractUtilsTest.java | 28 ++++----
.../statement/EncryptPreparedStatementTest.java | 6 +-
.../e2e/driver/statement/EncryptStatementTest.java | 6 +-
.../statement/ShadowPreparedStatementTest.java | 24 +++----
.../e2e/driver/statement/ShadowStatementTest.java | 12 ++--
.../statement/ShardingPreparedStatementTest.java | 35 +++++-----
.../statement/plsql/PLSQLStatementAssert.java | 2 +-
.../repository/PipelineGovernanceFacadeTest.java | 2 +-
35 files changed, 156 insertions(+), 169 deletions(-)
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLArrayParameterDecoderTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLArrayParameterDecoderTest.java
index 06c086715a4..014d6f618a7 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLArrayParameterDecoderTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLArrayParameterDecoderTest.java
@@ -35,75 +35,75 @@ class PostgreSQLArrayParameterDecoderTest {
@Test
void assertParseInt2ArrayNormalTextMode() {
- short[] result = DECODER.decodeInt2Array(INT_ARRAY_STR.getBytes(),
false);
- assertThat(result.length, is(2));
- assertThat(result[0], is((short) 11));
- assertThat(result[1], is((short) 12));
+ short[] actual = DECODER.decodeInt2Array(INT_ARRAY_STR.getBytes(),
false);
+ assertThat(actual.length, is(2));
+ assertThat(actual[0], is((short) 11));
+ assertThat(actual[1], is((short) 12));
}
@Test
void assertParseInt4ArrayNormalTextMode() {
- int[] result = DECODER.decodeInt4Array(INT_ARRAY_STR.getBytes(),
false);
- assertThat(result.length, is(2));
- assertThat(result[0], is(11));
- assertThat(result[1], is(12));
+ int[] actual = DECODER.decodeInt4Array(INT_ARRAY_STR.getBytes(),
false);
+ assertThat(actual.length, is(2));
+ assertThat(actual[0], is(11));
+ assertThat(actual[1], is(12));
}
@Test
void assertParseInt8ArrayNormalTextMode() {
- long[] result = DECODER.decodeInt8Array(INT_ARRAY_STR.getBytes(),
false);
- assertThat(result.length, is(2));
- assertThat(result[0], is(11L));
- assertThat(result[1], is(12L));
+ long[] actual = DECODER.decodeInt8Array(INT_ARRAY_STR.getBytes(),
false);
+ assertThat(actual.length, is(2));
+ assertThat(actual[0], is(11L));
+ assertThat(actual[1], is(12L));
}
@Test
void assertParseFloat4ArrayNormalTextMode() {
- float[] result = DECODER.decodeFloat4Array(FLOAT_ARRAY_STR.getBytes(),
false);
- assertThat(result.length, is(2));
- assertThat(Float.compare(result[0], 11.1F), is(0));
- assertThat(Float.compare(result[1], 12.1F), is(0));
+ float[] actual = DECODER.decodeFloat4Array(FLOAT_ARRAY_STR.getBytes(),
false);
+ assertThat(actual.length, is(2));
+ assertThat(Float.compare(actual[0], 11.1F), is(0));
+ assertThat(Float.compare(actual[1], 12.1F), is(0));
}
@Test
void assertParseFloat8ArrayNormalTextMode() {
- double[] result =
DECODER.decodeFloat8Array(FLOAT_ARRAY_STR.getBytes(), false);
- assertThat(result.length, is(2));
- assertThat(Double.compare(result[0], 11.1D), is(0));
- assertThat(Double.compare(result[1], 12.1D), is(0));
+ double[] actual =
DECODER.decodeFloat8Array(FLOAT_ARRAY_STR.getBytes(), false);
+ assertThat(actual.length, is(2));
+ assertThat(Double.compare(actual[0], 11.1D), is(0));
+ assertThat(Double.compare(actual[1], 12.1D), is(0));
}
@Test
void assertParseBoolArrayNormalTextMode() {
- boolean[] result =
DECODER.decodeBoolArray("{\"true\",\"false\"}".getBytes(), false);
- assertThat(result.length, is(2));
- assertTrue(result[0]);
- assertFalse(result[1]);
+ boolean[] actual =
DECODER.decodeBoolArray("{\"true\",\"false\"}".getBytes(), false);
+ assertThat(actual.length, is(2));
+ assertTrue(actual[0]);
+ assertFalse(actual[1]);
}
@Test
void assertParseStringArrayNormalTextMode() {
- String[] result =
DECODER.decodeStringArray("{\"a\",\"b\"}".getBytes(), false);
- assertThat(result.length, is(2));
- assertThat(result[0], is("a"));
- assertThat(result[1], is("b"));
+ String[] actual =
DECODER.decodeStringArray("{\"a\",\"b\"}".getBytes(), false);
+ assertThat(actual.length, is(2));
+ assertThat(actual[0], is("a"));
+ assertThat(actual[1], is("b"));
}
@Test
void assertParseStringArrayWithEscapeTextMode() {
- String[] result =
DECODER.decodeStringArray("{\"\\\"a\",\"\\\\b\",\"c\"}".getBytes(), false);
- assertThat(result.length, is(3));
- assertThat(result[0], is("\"a"));
- assertThat(result[1], is("\\b"));
- assertThat(result[2], is("c"));
+ String[] actual =
DECODER.decodeStringArray("{\"\\\"a\",\"\\\\b\",\"c\"}".getBytes(), false);
+ assertThat(actual.length, is(3));
+ assertThat(actual[0], is("\"a"));
+ assertThat(actual[1], is("\\b"));
+ assertThat(actual[2], is("c"));
}
@Test
void assertParseStringArrayWithNullTextMode() {
- String[] result =
DECODER.decodeStringArray("{\"a\",\"b\",NULL}".getBytes(), false);
- assertThat(result.length, is(3));
- assertThat(result[0], is("a"));
- assertThat(result[1], is("b"));
- assertNull(result[2]);
+ String[] actual =
DECODER.decodeStringArray("{\"a\",\"b\",NULL}".getBytes(), false);
+ assertThat(actual.length, is(3));
+ assertThat(actual[0], is("a"));
+ assertThat(actual[1], is("b"));
+ assertNull(actual[2]);
}
}
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValueTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValueTest.java
index 84a17e17730..b3a723d2b85 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValueTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValueTest.java
@@ -49,8 +49,8 @@ class PostgreSQLBoolArrayBinaryProtocolValueTest {
byteBuf.writeCharSequence(parameterValue, StandardCharsets.ISO_8859_1);
byteBuf.readInt();
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(byteBuf,
StandardCharsets.UTF_8);
- Object result = newInstance().read(payload, parameterValue.length());
- assertThat(result, is(new boolean[]{true, false}));
+ Object actual = newInstance().read(payload, parameterValue.length());
+ assertThat(actual, is(new boolean[]{true, false}));
assertThat(byteBuf.readerIndex(), is(expectedLength));
}
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValueTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValueTest.java
index fc34429d553..091afa5ebd5 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValueTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValueTest.java
@@ -49,8 +49,8 @@ class PostgreSQLFloat4ArrayBinaryProtocolValueTest {
byteBuf.writeCharSequence(parameterValue, StandardCharsets.ISO_8859_1);
byteBuf.readInt();
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(byteBuf,
StandardCharsets.UTF_8);
- Object result = newInstance().read(payload, parameterValue.length());
- assertThat(result, is(new float[]{11.1F, 12.1F}));
+ Object actual = newInstance().read(payload, parameterValue.length());
+ assertThat(actual, is(new float[]{11.1F, 12.1F}));
assertThat(byteBuf.readerIndex(), is(expectedLength));
}
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValueTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValueTest.java
index 17a03f1be49..f59dbc7b91c 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValueTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValueTest.java
@@ -49,8 +49,8 @@ class PostgreSQLFloat8ArrayBinaryProtocolValueTest {
byteBuf.writeCharSequence(parameterValue, StandardCharsets.ISO_8859_1);
byteBuf.readInt();
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(byteBuf,
StandardCharsets.UTF_8);
- Object result = newInstance().read(payload, parameterValue.length());
- assertThat(result, is(new double[]{11.1D, 12.1D}));
+ Object actual = newInstance().read(payload, parameterValue.length());
+ assertThat(actual, is(new double[]{11.1D, 12.1D}));
assertThat(byteBuf.readerIndex(), is(expectedLength));
}
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValueTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValueTest.java
index 5a890aa015f..63f545674b0 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValueTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValueTest.java
@@ -49,8 +49,8 @@ class PostgreSQLInt2ArrayBinaryProtocolValueTest {
byteBuf.writeCharSequence(parameterValue, StandardCharsets.ISO_8859_1);
byteBuf.readInt();
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(byteBuf,
StandardCharsets.UTF_8);
- Object result = newInstance().read(payload, parameterValue.length());
- assertThat(result, is(new short[]{11, 12}));
+ Object actual = newInstance().read(payload, parameterValue.length());
+ assertThat(actual, is(new short[]{11, 12}));
assertThat(byteBuf.readerIndex(), is(expectedLength));
}
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValueTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValueTest.java
index 2d3b5503309..9f590cece93 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValueTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValueTest.java
@@ -49,8 +49,8 @@ class PostgreSQLInt4ArrayBinaryProtocolValueTest {
byteBuf.writeCharSequence(parameterValue, StandardCharsets.ISO_8859_1);
byteBuf.readInt();
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(byteBuf,
StandardCharsets.UTF_8);
- Object result = newInstance().read(payload, parameterValue.length());
- assertThat(result, is(new int[]{11, 12}));
+ Object actual = newInstance().read(payload, parameterValue.length());
+ assertThat(actual, is(new int[]{11, 12}));
assertThat(byteBuf.readerIndex(), is(expectedLength));
}
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValueTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValueTest.java
index 8f62d9b2a54..7c7e12290c8 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValueTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValueTest.java
@@ -49,8 +49,8 @@ class PostgreSQLInt8ArrayBinaryProtocolValueTest {
byteBuf.writeCharSequence(parameterValue, StandardCharsets.ISO_8859_1);
byteBuf.readInt();
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(byteBuf,
StandardCharsets.UTF_8);
- Object result = newInstance().read(payload, parameterValue.length());
- assertThat(result, is(new long[]{11, 12}));
+ Object actual = newInstance().read(payload, parameterValue.length());
+ assertThat(actual, is(new long[]{11, 12}));
assertThat(byteBuf.readerIndex(), is(expectedLength));
}
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLNumericBinaryProtocolValueTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLNumericBinaryProtocolValueTest.java
index c212447b373..f3dc059494e 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLNumericBinaryProtocolValueTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLNumericBinaryProtocolValueTest.java
@@ -50,8 +50,8 @@ class PostgreSQLNumericBinaryProtocolValueTest {
ByteBuf byteBuf = ByteBufTestUtils.createByteBuf(expectedLength);
byteBuf.writeBytes(expected);
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(byteBuf,
StandardCharsets.UTF_8);
- Object result = binaryProtocolValue.read(payload, expectedLength);
- assertThat(result, is(bigDecimal));
+ Object actual = binaryProtocolValue.read(payload, expectedLength);
+ assertThat(actual, is(bigDecimal));
assertThat(byteBuf.readerIndex(), is(expectedLength));
}
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValueTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValueTest.java
index 5244339abd4..5eb86e886e8 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValueTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValueTest.java
@@ -49,8 +49,8 @@ class PostgreSQLStringArrayBinaryProtocolValueTest {
byteBuf.writeCharSequence(parameterValue, StandardCharsets.ISO_8859_1);
byteBuf.readInt();
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(byteBuf,
StandardCharsets.UTF_8);
- Object result = newInstance().read(payload, parameterValue.length());
- assertThat(result, is(new String[]{"a", "b"}));
+ Object actual = newInstance().read(payload, parameterValue.length());
+ assertThat(actual, is(new String[]{"a", "b"}));
assertThat(byteBuf.readerIndex(), is(expectedLength));
}
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValueTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValueTest.java
index 703156ebff6..001ec2e314e 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValueTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValueTest.java
@@ -48,9 +48,9 @@ class PostgreSQLUnspecifiedBinaryProtocolValueTest {
byteBuf.writeCharSequence(timestampStr, StandardCharsets.ISO_8859_1);
byteBuf.readInt();
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(byteBuf,
StandardCharsets.UTF_8);
- Object result = new
PostgreSQLUnspecifiedBinaryProtocolValue().read(payload, timestampStr.length());
- assertThat(result,
instanceOf(PostgreSQLTypeUnspecifiedSQLParameter.class));
- assertThat(result.toString(), is(timestampStr));
+ Object actual = new
PostgreSQLUnspecifiedBinaryProtocolValue().read(payload, timestampStr.length());
+ assertThat(actual,
instanceOf(PostgreSQLTypeUnspecifiedSQLParameter.class));
+ assertThat(actual.toString(), is(timestampStr));
assertThat(byteBuf.readerIndex(), is(expectedLength));
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/reviser/column/EncryptColumnNameReviserTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/reviser/column/EncryptColumnNameReviserTest.java
index 89772a305b6..93b3b54190d 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/reviser/column/EncryptColumnNameReviserTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/reviser/column/EncryptColumnNameReviserTest.java
@@ -18,9 +18,10 @@
package org.apache.shardingsphere.encrypt.metadata.reviser.column;
import org.apache.shardingsphere.encrypt.rule.EncryptTable;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -32,7 +33,7 @@ class EncryptColumnNameReviserTest {
EncryptColumnNameReviser encryptColumnNameReviser = new
EncryptColumnNameReviser(encryptTable);
when(encryptTable.isCipherColumn("Cipher")).thenReturn(true);
when(encryptTable.getLogicColumnByCipherColumn("Cipher")).thenReturn("Logic");
- Assertions.assertEquals("Logic",
encryptColumnNameReviser.revise("Cipher"));
- Assertions.assertEquals("NonCipher",
encryptColumnNameReviser.revise("NonCipher"));
+ assertThat(encryptColumnNameReviser.revise("Cipher"), is("Logic"));
+ assertThat(encryptColumnNameReviser.revise("NonCipher"),
is("NonCipher"));
}
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
index e8520c4ec6f..50b4bd25a35 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
@@ -22,8 +22,8 @@ import
org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
import
org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration;
import
org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration;
import
org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration;
-import
org.apache.shardingsphere.encrypt.exception.metadata.MismatchedEncryptAlgorithmTypeException;
import
org.apache.shardingsphere.encrypt.exception.metadata.EncryptTableNotFoundException;
+import
org.apache.shardingsphere.encrypt.exception.metadata.MismatchedEncryptAlgorithmTypeException;
import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -41,7 +41,6 @@ import java.util.stream.Stream;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -94,12 +93,12 @@ class EncryptRuleTest {
void assertAESEncryptRuleDefaultProps() {
EncryptRuleConfiguration defaultPropsEncryptRuleConfig = new
EncryptRuleConfiguration(Collections.emptyList(),
Collections.singletonMap("aes_encryptor", new
AlgorithmConfiguration("AES", new Properties())));
- assertEquals(MessageDigestAlgorithms.SHA_1,
defaultPropsEncryptRuleConfig.getEncryptors().get("aes_encryptor").getProps().getProperty(DIGEST_ALGORITHM_NAME));
+
assertThat(defaultPropsEncryptRuleConfig.getEncryptors().get("aes_encryptor").getProps().getProperty(DIGEST_ALGORITHM_NAME),
is(MessageDigestAlgorithms.SHA_1));
Properties props = new Properties();
props.put(DIGEST_ALGORITHM_NAME, MessageDigestAlgorithms.SHA_256);
EncryptRuleConfiguration sha256EncryptRuleConfig = new
EncryptRuleConfiguration(Collections.emptyList(),
Collections.singletonMap("aes_encryptor", new
AlgorithmConfiguration("AES", props)));
- assertEquals(MessageDigestAlgorithms.SHA_256,
sha256EncryptRuleConfig.getEncryptors().get("aes_encryptor").getProps().getProperty(DIGEST_ALGORITHM_NAME));
+
assertThat(sha256EncryptRuleConfig.getEncryptors().get("aes_encryptor").getProps().getProperty(DIGEST_ALGORITHM_NAME),
is(MessageDigestAlgorithms.SHA_256));
}
private Map<String, AlgorithmConfiguration> getEncryptors(final
AlgorithmConfiguration standardEncryptConfig, final AlgorithmConfiguration
queryAssistedEncryptConfig,
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/YamlEncryptDataNodeRuleConfigurationSwapperTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/YamlEncryptDataNodeRuleConfigurationSwapperTest.java
index ee4fdc820c8..4e157851b99 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/YamlEncryptDataNodeRuleConfigurationSwapperTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/YamlEncryptDataNodeRuleConfigurationSwapperTest.java
@@ -85,6 +85,6 @@ class YamlEncryptDataNodeRuleConfigurationSwapperTest {
assertThat(actual.get().getTables().iterator().next().getColumns().iterator().next().getCipher().getEncryptorName(),
is("FOO"));
assertThat(actual.get().getEncryptors().size(), is(1));
assertThat(actual.get().getEncryptors().get("FOO").getType(),
is("FOO"));
- assertThat(actual.get().getEncryptors().get("FOO").getProps().size(),
is(0));
+
assertTrue(actual.get().getEncryptors().get("FOO").getProps().isEmpty());
}
}
diff --git
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/YamlMaskDataNodeRuleConfigurationSwapperTest.java
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/YamlMaskDataNodeRuleConfigurationSwapperTest.java
index 69aaf9b1313..e19fe4fa145 100644
---
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/YamlMaskDataNodeRuleConfigurationSwapperTest.java
+++
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/YamlMaskDataNodeRuleConfigurationSwapperTest.java
@@ -42,7 +42,7 @@ class YamlMaskDataNodeRuleConfigurationSwapperTest {
@Test
void assertSwapEmptyConfigurationToDataNodes() {
MaskRuleConfiguration config = new
MaskRuleConfiguration(Collections.emptyList(), Collections.emptyMap());
- assertThat(new
YamlMaskDataNodeRuleConfigurationSwapper().swapToRepositoryTuples(config).size(),
is(0));
+ assertTrue(new
YamlMaskDataNodeRuleConfigurationSwapper().swapToRepositoryTuples(config).isEmpty());
}
@Test
@@ -82,6 +82,6 @@ class YamlMaskDataNodeRuleConfigurationSwapperTest {
assertThat(actual.get().getTables().iterator().next().getColumns().iterator().next().getMaskAlgorithm(),
is("FIXTURE"));
assertThat(actual.get().getMaskAlgorithms().size(), is(1));
assertThat(actual.get().getMaskAlgorithms().get("FIXTURE").getType(),
is("FIXTURE"));
-
assertThat(actual.get().getMaskAlgorithms().get("FIXTURE").getProps().size(),
is(0));
+
assertTrue(actual.get().getMaskAlgorithms().get("FIXTURE").getProps().isEmpty());
}
}
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingDataNodeRuleConfigurationSwapperTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingDataNodeRuleConfigurationSwapperTest.java
index 378fd66c418..b7a2324c922 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingDataNodeRuleConfigurationSwapperTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingDataNodeRuleConfigurationSwapperTest.java
@@ -84,6 +84,6 @@ class
YamlReadwriteSplittingDataNodeRuleConfigurationSwapperTest {
assertThat(actual.get().getDataSourceGroups().iterator().next().getTransactionalReadQueryStrategy(),
is(TransactionalReadQueryStrategy.DYNAMIC));
assertThat(actual.get().getLoadBalancers().size(), is(1));
assertThat(actual.get().getLoadBalancers().get("random").getType(),
is("random"));
-
assertThat(actual.get().getLoadBalancers().get("random").getProps().size(),
is(0));
+
assertTrue(actual.get().getLoadBalancers().get("random").getProps().isEmpty());
}
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java
index d5322cadbe3..8fe5c311ece 100644
---
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java
+++
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java
@@ -47,6 +47,7 @@ import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -110,7 +111,7 @@ class DropReadwriteSplittingRuleExecutorTest {
executor.setRule(rule);
ReadwriteSplittingRuleConfiguration actual =
executor.buildToBeDroppedRuleConfiguration(createSQLStatement());
assertThat(actual.getDataSourceGroups().size(), is(1));
- assertThat(actual.getLoadBalancers().size(), is(0));
+ assertTrue(actual.getLoadBalancers().isEmpty());
}
@Test
diff --git
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/YamlShadowDataNodeRuleConfigurationSwapperTest.java
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/YamlShadowDataNodeRuleConfigurationSwapperTest.java
index c879da0b1fc..1aadaa58d0c 100644
---
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/YamlShadowDataNodeRuleConfigurationSwapperTest.java
+++
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/YamlShadowDataNodeRuleConfigurationSwapperTest.java
@@ -102,7 +102,7 @@ class YamlShadowDataNodeRuleConfigurationSwapperTest {
assertThat(actual.get().getTables().get("foo_table").getShadowAlgorithmNames().iterator().next(),
is("FIXTURE"));
assertThat(actual.get().getShadowAlgorithms().size(), is(1));
assertThat(actual.get().getShadowAlgorithms().get("FIXTURE").getType(),
is("FIXTURE"));
-
assertThat(actual.get().getShadowAlgorithms().get("FIXTURE").getProps().size(),
is(0));
+
assertTrue(actual.get().getShadowAlgorithms().get("FIXTURE").getProps().isEmpty());
assertThat(actual.get().getDefaultShadowAlgorithmName(),
is("FIXTURE"));
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingDataNodeRuleConfigurationSwapperTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingDataNodeRuleConfigurationSwapperTest.java
index d80d438ad64..a27ef157ae3 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingDataNodeRuleConfigurationSwapperTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingDataNodeRuleConfigurationSwapperTest.java
@@ -237,11 +237,11 @@ class YamlShardingDataNodeRuleConfigurationSwapperTest {
assertThat(actual.getShardingAlgorithms().get("hash_mod").getProps().get("sharding-count"),
is("4"));
assertThat(actual.getKeyGenerators().size(), is(3));
assertThat(actual.getKeyGenerators().get("uuid").getType(),
is("UUID"));
- assertThat(actual.getKeyGenerators().get("uuid").getProps().size(),
is(0));
+ assertTrue(actual.getKeyGenerators().get("uuid").getProps().isEmpty());
assertThat(actual.getKeyGenerators().get("auto_increment").getType(),
is("AUTO_INCREMENT.FIXTURE"));
assertThat(actual.getAuditors().size(), is(1));
assertThat(actual.getAuditors().get("audit_algorithm").getType(),
is("DML_SHARDING_CONDITIONS"));
-
assertThat(actual.getAuditors().get("audit_algorithm").getProps().size(),
is(0));
+
assertTrue(actual.getAuditors().get("audit_algorithm").getProps().isEmpty());
assertNull(actual.getShardingCache());
}
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleExecutorTest.java
index dfcf0e46ab7..58776339b80 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleExecutorTest.java
@@ -33,9 +33,8 @@ import org.junit.jupiter.api.Test;
import java.util.Collection;
import java.util.LinkedList;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -81,7 +80,7 @@ class CreateShardingTableReferenceRuleExecutorTest {
executor.checkBeforeUpdate(sqlStatement);
ShardingRuleConfiguration toBeCreatedRuleConfig =
executor.buildToBeCreatedRuleConfiguration(sqlStatement);
Collection<ShardingTableReferenceRuleConfiguration>
referenceRuleConfigs = toBeCreatedRuleConfig.getBindingTableGroups();
- assertThat(referenceRuleConfigs.size(), is(0));
+ assertTrue(referenceRuleConfigs.isEmpty());
}
private ShardingRuleConfiguration getCurrentRuleConfiguration() {
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java
index 627de111c10..0ea31a777a7 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java
@@ -37,6 +37,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -85,7 +86,7 @@ class DropDefaultShardingStrategyExecutorTest {
executor.setRule(rule);
ShardingRuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(createSQLStatement("Table"));
assertNull(toBeDroppedRuleConfig.getDefaultTableShardingStrategy());
- assertThat(toBeDroppedRuleConfig.getShardingAlgorithms().size(),
is(0));
+ assertTrue(toBeDroppedRuleConfig.getShardingAlgorithms().isEmpty());
}
@Test
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceProvidedDatabaseConfigurationTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceProvidedDatabaseConfigurationTest.java
index e866277eb76..64287f762af 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceProvidedDatabaseConfigurationTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceProvidedDatabaseConfigurationTest.java
@@ -71,7 +71,7 @@ class DataSourceProvidedDatabaseConfigurationTest {
DataSourceProvidedDatabaseConfiguration databaseConfig =
createDataSourceProvidedDatabaseConfiguration();
DataSourcePoolProperties props =
databaseConfig.getStorageUnits().get("foo_ds").getDataSourcePoolProperties();
Map<String, Object> poolStandardProps =
props.getPoolPropertySynonyms().getStandardProperties();
- assertThat(poolStandardProps.size(), is(0));
+ assertTrue(poolStandardProps.isEmpty());
Map<String, Object> connStandardProps =
props.getConnectionPropertySynonyms().getStandardProperties();
assertThat(connStandardProps.size(), is(3));
assertThat(connStandardProps.get("url"),
is("jdbc:mock://127.0.0.1/foo_ds"));
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/rule/RuleMetaDataTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/rule/RuleMetaDataTest.java
index 29a463f8f56..731b1e1366d 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/rule/RuleMetaDataTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/rule/RuleMetaDataTest.java
@@ -17,12 +17,9 @@
package org.apache.shardingsphere.infra.metadata.database.rule;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.junit.jupiter.api.Test;
-import java.util.Collection;
import java.util.Collections;
-import java.util.Map;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -50,8 +47,6 @@ class RuleMetaDataTest {
@Test
void assertGetInUsedStorageUnitNameAndRulesMapWhenRulesAreEmpty() {
- RuleMetaData ruleMetaData = new RuleMetaData(Collections.emptyList());
- Map<String, Collection<Class<? extends ShardingSphereRule>>> actual =
ruleMetaData.getInUsedStorageUnitNameAndRulesMap();
- assertThat(actual.size(), is(0));
+ assertTrue(new
RuleMetaData(Collections.emptyList()).getInUsedStorageUnitNameAndRulesMap().isEmpty());
}
}
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreatorTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreatorTest.java
index 21040ee8a61..d93537339bf 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreatorTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreatorTest.java
@@ -23,7 +23,6 @@ import
org.apache.shardingsphere.data.pipeline.core.task.InventoryTaskAckCallbac
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.internal.configuration.plugins.Plugins;
@@ -33,6 +32,7 @@ import java.util.concurrent.atomic.AtomicReference;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
class MemoryPipelineChannelCreatorTest {
@@ -41,7 +41,7 @@ class MemoryPipelineChannelCreatorTest {
PipelineChannelCreator creator =
TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY",
PropertiesBuilder.build(new Property("block-queue-size", "2000")));
assertThat(Plugins.getMemberAccessor().get(MemoryPipelineChannelCreator.class.getDeclaredField("queueSize"),
creator), is(2000));
PipelineChannel channel = creator.newInstance(1000, new
InventoryTaskAckCallback(new AtomicReference<>()));
- Assertions.assertInstanceOf(ArrayBlockingQueue.class,
Plugins.getMemberAccessor().get(MemoryPipelineChannel.class.getDeclaredField("queue"),
channel));
+ assertInstanceOf(ArrayBlockingQueue.class,
Plugins.getMemberAccessor().get(MemoryPipelineChannel.class.getDeclaredField("queue"),
channel));
}
@Test
@@ -49,7 +49,7 @@ class MemoryPipelineChannelCreatorTest {
PipelineChannelCreator creator =
TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY",
PropertiesBuilder.build(new Property("block-queue-size", "0")));
assertThat(Plugins.getMemberAccessor().get(MemoryPipelineChannelCreator.class.getDeclaredField("queueSize"),
creator), is(0));
PipelineChannel channel = creator.newInstance(1000, new
InventoryTaskAckCallback(new AtomicReference<>()));
- Assertions.assertInstanceOf(SynchronousQueue.class,
Plugins.getMemberAccessor().get(MemoryPipelineChannel.class.getDeclaredField("queue"),
channel));
+ assertInstanceOf(SynchronousQueue.class,
Plugins.getMemberAccessor().get(MemoryPipelineChannel.class.getDeclaredField("queue"),
channel));
}
@Test
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java
index 15e7f4a09f6..6a287f450ad 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java
@@ -62,16 +62,14 @@ class RecordSingleTableInventoryCalculatedResultTest {
@Test
void assertRecordsCountNotEquals() {
- RecordSingleTableInventoryCalculatedResult result1 = new
RecordSingleTableInventoryCalculatedResult(1000,
Collections.singletonList(buildFixedFullTypeRecord()));
- RecordSingleTableInventoryCalculatedResult result2 = new
RecordSingleTableInventoryCalculatedResult(1000, Collections.emptyList());
- assertThat(result1, not(result2));
+ assertThat(new RecordSingleTableInventoryCalculatedResult(1000,
Collections.singletonList(buildFixedFullTypeRecord())),
+ not(new RecordSingleTableInventoryCalculatedResult(1000,
Collections.emptyList())));
}
@Test
void assertMaxUniqueKeyValueNotEquals() {
- RecordSingleTableInventoryCalculatedResult result1 = new
RecordSingleTableInventoryCalculatedResult(1000,
Collections.singletonList(buildFixedFullTypeRecord()));
- RecordSingleTableInventoryCalculatedResult result2 = new
RecordSingleTableInventoryCalculatedResult(1001,
Collections.singletonList(buildFixedFullTypeRecord()));
- assertThat(result1, not(result2));
+ assertThat(new RecordSingleTableInventoryCalculatedResult(1000,
Collections.singletonList(buildFixedFullTypeRecord())),
+ not(new RecordSingleTableInventoryCalculatedResult(1001,
Collections.singletonList(buildFixedFullTypeRecord()))));
}
@Test
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/yaml/YamlTableDataConsistencyCheckResultSwapperTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/yaml/YamlTableDataConsistencyCheckResultSwapperTest.java
index 08b11da43d7..36699ab2d10 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/yaml/YamlTableDataConsistencyCheckResultSwapperTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/yaml/YamlTableDataConsistencyCheckResultSwapperTest.java
@@ -41,9 +41,9 @@ class YamlTableDataConsistencyCheckResultSwapperTest {
@Test
void
assertSwapToYamlConfigurationWithTableDataConsistencyCheckIgnoredType() {
TableDataConsistencyCheckResult data = new
TableDataConsistencyCheckResult(TableDataConsistencyCheckIgnoredType.NO_UNIQUE_KEY);
- YamlTableDataConsistencyCheckResult result =
yamlTableDataConsistencyCheckResultSwapper.swapToYamlConfiguration(data);
- assertThat(result.getIgnoredType(), is("NO_UNIQUE_KEY"));
- assertFalse(result.isMatched());
+ YamlTableDataConsistencyCheckResult actual =
yamlTableDataConsistencyCheckResultSwapper.swapToYamlConfiguration(data);
+ assertThat(actual.getIgnoredType(), is("NO_UNIQUE_KEY"));
+ assertFalse(actual.isMatched());
}
@Test
@@ -58,9 +58,9 @@ class YamlTableDataConsistencyCheckResultSwapperTest {
void
assertSwapToObjectWithYamlTableDataConsistencyCheckResultIgnoredType() {
YamlTableDataConsistencyCheckResult yamlConfig = new
YamlTableDataConsistencyCheckResult();
yamlConfig.setIgnoredType("NO_UNIQUE_KEY");
- TableDataConsistencyCheckResult result =
yamlTableDataConsistencyCheckResultSwapper.swapToObject(yamlConfig);
- assertThat(result.getIgnoredType(),
is(TableDataConsistencyCheckIgnoredType.NO_UNIQUE_KEY));
- assertFalse(result.isMatched());
+ TableDataConsistencyCheckResult actual =
yamlTableDataConsistencyCheckResultSwapper.swapToObject(yamlConfig);
+ assertThat(actual.getIgnoredType(),
is(TableDataConsistencyCheckIgnoredType.NO_UNIQUE_KEY));
+ assertFalse(actual.isMatched());
}
@Test
@@ -96,9 +96,9 @@ class YamlTableDataConsistencyCheckResultSwapperTest {
@Test
void assertSwapToObjectWithString() {
- TableDataConsistencyCheckResult result =
yamlTableDataConsistencyCheckResultSwapper.swapToObject("ignoredType:
NO_UNIQUE_KEY");
- assertThat(result.getIgnoredType(),
is(TableDataConsistencyCheckIgnoredType.NO_UNIQUE_KEY));
- assertFalse(result.isMatched());
+ TableDataConsistencyCheckResult actual =
yamlTableDataConsistencyCheckResultSwapper.swapToObject("ignoredType:
NO_UNIQUE_KEY");
+ assertThat(actual.getIgnoredType(),
is(TableDataConsistencyCheckIgnoredType.NO_UNIQUE_KEY));
+ assertFalse(actual.isMatched());
}
@Test
diff --git
a/parser/sql/engine/src/test/java/org/apache/shardingsphere/sql/parser/core/SQLParserFactoryTest.java
b/parser/sql/engine/src/test/java/org/apache/shardingsphere/sql/parser/core/SQLParserFactoryTest.java
index 64198e3ae2d..2268eb79ee0 100644
---
a/parser/sql/engine/src/test/java/org/apache/shardingsphere/sql/parser/core/SQLParserFactoryTest.java
+++
b/parser/sql/engine/src/test/java/org/apache/shardingsphere/sql/parser/core/SQLParserFactoryTest.java
@@ -17,15 +17,13 @@
package org.apache.shardingsphere.sql.parser.core;
-import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
-import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
import org.apache.shardingsphere.sql.parser.fixture.LexerFixture;
import org.apache.shardingsphere.sql.parser.fixture.ParserFixture;
import org.junit.jupiter.api.Test;
-import static org.mockito.Mockito.mock;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
class SQLParserFactoryTest {
@@ -33,9 +31,6 @@ class SQLParserFactoryTest {
@Test
void assertNewInstance() {
- SQLLexer sqlLexer = mock(LexerFixture.class);
- SQLParser sqlParser = mock(ParserFixture.class);
- SQLParser result = SQLParserFactory.newInstance(SQL,
sqlLexer.getClass(), sqlParser.getClass());
- assertThat(result, instanceOf(ParserFixture.class));
+ assertThat(SQLParserFactory.newInstance(SQL,
mock(LexerFixture.class).getClass(), mock(ParserFixture.class).getClass()),
instanceOf(ParserFixture.class));
}
}
diff --git
a/parser/sql/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilsTest.java
b/parser/sql/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilsTest.java
index 173db7f1220..cb93decd294 100644
---
a/parser/sql/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilsTest.java
+++
b/parser/sql/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilsTest.java
@@ -121,8 +121,7 @@ class ExpressionExtractUtilsTest {
functionSegment.getParameters().add(param1);
functionSegment.getParameters().add(param2);
functionSegment.getParameters().add(param3);
- List<ParameterMarkerExpressionSegment> result =
ExpressionExtractUtils.getParameterMarkerExpressions(Collections.singleton(functionSegment));
- assertThat(result.size(), is(1));
+
assertThat(ExpressionExtractUtils.getParameterMarkerExpressions(Collections.singleton(functionSegment)).size(),
is(1));
}
@Test
diff --git
a/parser/sql/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/SubqueryExtractUtilsTest.java
b/parser/sql/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/SubqueryExtractUtilsTest.java
index b021f6176a3..0d511f565fb 100644
---
a/parser/sql/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/SubqueryExtractUtilsTest.java
+++
b/parser/sql/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/SubqueryExtractUtilsTest.java
@@ -69,9 +69,9 @@ class SubqueryExtractUtilsTest {
SubqueryExpressionSegment right = new SubqueryExpressionSegment(new
SubquerySegment(51, 100, subquerySelectStatement, ""));
WhereSegment whereSegment = new WhereSegment(34, 100, new
BinaryOperationExpression(40, 100, left, right, "=", "order_id = (SELECT
order_id FROM t_order WHERE status = 'OK')"));
selectStatement.setWhere(whereSegment);
- Collection<SubquerySegment> result =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
- assertThat(result.size(), is(1));
- assertThat(result.iterator().next(), is(right.getSubquery()));
+ Collection<SubquerySegment> actual =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
+ assertThat(actual.size(), is(1));
+ assertThat(actual.iterator().next(), is(right.getSubquery()));
}
@Test
@@ -85,9 +85,9 @@ class SubqueryExtractUtilsTest {
MySQLSelectStatement selectStatement = new MySQLSelectStatement();
selectStatement.setProjections(new ProjectionsSegment(7, 79));
selectStatement.getProjections().getProjections().add(subqueryProjectionSegment);
- Collection<SubquerySegment> result =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
- assertThat(result.size(), is(1));
- assertThat(result.iterator().next(), is(subquerySegment));
+ Collection<SubquerySegment> actual =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
+ assertThat(actual.size(), is(1));
+ assertThat(actual.iterator().next(), is(subquerySegment));
}
@Test
@@ -104,9 +104,9 @@ class SubqueryExtractUtilsTest {
selectStatement.getProjections().getProjections().add(new
ColumnProjectionSegment(new ColumnSegment(7, 16, new
IdentifierValue("order_id"))));
SubqueryTableSegment subqueryTableSegment = new
SubqueryTableSegment(0, 0, new SubquerySegment(23, 71, subquery, ""));
selectStatement.setFrom(subqueryTableSegment);
- Collection<SubquerySegment> result =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
- assertThat(result.size(), is(1));
- assertThat(result.iterator().next(),
is(subqueryTableSegment.getSubquery()));
+ Collection<SubquerySegment> actual =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
+ assertThat(actual.size(), is(1));
+ assertThat(actual.iterator().next(),
is(subqueryTableSegment.getSubquery()));
}
@Test
@@ -145,9 +145,9 @@ class SubqueryExtractUtilsTest {
from.setLeft(leftSubquerySegment);
from.setRight(rightSubquerySegment);
selectStatement.setFrom(from);
- Collection<SubquerySegment> result =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
- assertThat(result.size(), is(2));
- Iterator<SubquerySegment> iterator = result.iterator();
+ Collection<SubquerySegment> actual =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
+ assertThat(actual.size(), is(2));
+ Iterator<SubquerySegment> iterator = actual.iterator();
assertThat(iterator.next(), is(leftSubquerySegment.getSubquery()));
assertThat(iterator.next(), is(rightSubquerySegment.getSubquery()));
}
@@ -156,8 +156,8 @@ class SubqueryExtractUtilsTest {
void assertGetSubquerySegmentsWithMultiNestedSubquery() {
SelectStatement selectStatement = new MySQLSelectStatement();
selectStatement.setFrom(new SubqueryTableSegment(0, 0,
createSubquerySegmentForFrom()));
- Collection<SubquerySegment> result =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
- assertThat(result.size(), is(2));
+ Collection<SubquerySegment> actual =
SubqueryExtractUtils.getSubquerySegments(selectStatement);
+ assertThat(actual.size(), is(2));
}
private SubquerySegment createSubquerySegmentForFrom() {
diff --git
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/EncryptPreparedStatementTest.java
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/EncryptPreparedStatementTest.java
index 8df05e2da3c..c9632c76be5 100644
---
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/EncryptPreparedStatementTest.java
+++
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/EncryptPreparedStatementTest.java
@@ -117,13 +117,13 @@ class EncryptPreparedStatementTest extends
AbstractEncryptDriverTest {
@Test
void assertUpdateWithExecuteUpdate() throws SQLException {
- int result;
+ int actual;
try (PreparedStatement preparedStatement =
getEncryptConnection().prepareStatement(UPDATE_SQL)) {
preparedStatement.setObject(1, 'f');
preparedStatement.setObject(2, 'a');
- result = preparedStatement.executeUpdate();
+ actual = preparedStatement.executeUpdate();
}
- assertThat(result, is(2));
+ assertThat(actual, is(2));
assertResultSet(2, 1, "encryptValue", "assistedEncryptValue");
}
diff --git
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/EncryptStatementTest.java
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/EncryptStatementTest.java
index 8a178147951..8407136c081 100644
---
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/EncryptStatementTest.java
+++
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/EncryptStatementTest.java
@@ -90,11 +90,11 @@ class EncryptStatementTest extends
AbstractEncryptDriverTest {
@Test
void assertUpdateWithExecuteUpdate() throws SQLException {
- int result;
+ int actual;
try (Statement statement = getEncryptConnection().createStatement()) {
- result = statement.executeUpdate(UPDATE_SQL);
+ actual = statement.executeUpdate(UPDATE_SQL);
}
- assertThat(result, is(2));
+ assertThat(actual, is(2));
assertResultSet(2, 1, "encryptValue");
}
diff --git
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShadowPreparedStatementTest.java
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShadowPreparedStatementTest.java
index 23ea3575043..5ffac74655e 100644
---
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShadowPreparedStatementTest.java
+++
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShadowPreparedStatementTest.java
@@ -94,7 +94,7 @@ class ShadowPreparedStatementTest extends
AbstractShadowDriverTest {
@Test
void assertUpdateNativeCase() throws SQLException {
- int result;
+ int actual;
try (Connection connection = getShadowDataSource().getConnection()) {
PreparedStatement insertPreparedStatement =
connection.prepareStatement(INSERT_SQL);
insertPreparedStatement.setObject(1, 2);
@@ -104,16 +104,16 @@ class ShadowPreparedStatementTest extends
AbstractShadowDriverTest {
PreparedStatement updatePreparedStatement =
connection.prepareStatement(UPDATE_SQL);
updatePreparedStatement.setString(1, "cipher_pwd");
updatePreparedStatement.setObject(2, 2);
- result = updatePreparedStatement.executeUpdate();
+ actual = updatePreparedStatement.executeUpdate();
}
- assertThat(result, is(1));
+ assertThat(actual, is(1));
assertResultSet(true, 0, "cipher_pwd");
assertResultSet(false, 1, "cipher_pwd");
}
@Test
void assertUpdateShadowCase() throws SQLException {
- int result;
+ int actual;
try (Connection connection = getShadowDataSource().getConnection()) {
PreparedStatement insertPreparedStatement =
connection.prepareStatement(INSERT_SQL);
insertPreparedStatement.setObject(1, 1);
@@ -123,16 +123,16 @@ class ShadowPreparedStatementTest extends
AbstractShadowDriverTest {
PreparedStatement updatePreparedStatement =
connection.prepareStatement(UPDATE_SQL);
updatePreparedStatement.setString(1, "cipher_pwd");
updatePreparedStatement.setObject(2, 1);
- result = updatePreparedStatement.executeUpdate();
+ actual = updatePreparedStatement.executeUpdate();
}
- assertThat(result, is(1));
+ assertThat(actual, is(1));
assertResultSet(true, 1, "cipher_pwd");
assertResultSet(false, 0, "cipher_pwd");
}
@Test
void assertDeleteNativeCase() throws SQLException {
- int result;
+ int actual;
try (Connection connection = getShadowDataSource().getConnection()) {
PreparedStatement insertPreparedStatement1 =
connection.prepareStatement(INSERT_SQL);
insertPreparedStatement1.setObject(1, 2);
@@ -146,16 +146,16 @@ class ShadowPreparedStatementTest extends
AbstractShadowDriverTest {
insertPreparedStatement2.execute();
PreparedStatement deletePreparedStatement =
connection.prepareStatement(DELETE_SQL);
deletePreparedStatement.setObject(1, 2);
- result = deletePreparedStatement.executeUpdate();
+ actual = deletePreparedStatement.executeUpdate();
}
- assertThat(result, is(1));
+ assertThat(actual, is(1));
assertResultSet(true, 1, "cipher_pwd");
assertResultSet(false, 0, "cipher_pwd");
}
@Test
void assertDeleteShadowCase() throws SQLException {
- int result;
+ int actual;
try (Connection connection = getShadowDataSource().getConnection()) {
PreparedStatement insertPreparedStatement1 =
connection.prepareStatement(INSERT_SQL);
insertPreparedStatement1.setObject(1, 1);
@@ -169,9 +169,9 @@ class ShadowPreparedStatementTest extends
AbstractShadowDriverTest {
insertPreparedStatement2.execute();
PreparedStatement deletePreparedStatement =
connection.prepareStatement(DELETE_SQL);
deletePreparedStatement.setObject(1, 1);
- result = deletePreparedStatement.executeUpdate();
+ actual = deletePreparedStatement.executeUpdate();
}
- assertThat(result, is(1));
+ assertThat(actual, is(1));
assertResultSet(true, 0, "cipher_pwd");
assertResultSet(false, 1, "cipher");
}
diff --git
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShadowStatementTest.java
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShadowStatementTest.java
index f590dec2bdd..68dd1cc78b3 100644
---
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShadowStatementTest.java
+++
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShadowStatementTest.java
@@ -94,12 +94,12 @@ class ShadowStatementTest extends AbstractShadowDriverTest {
@Test
void assertUpdateNativeCase() throws SQLException {
- int result;
+ int actual;
try (Statement statement =
getShadowDataSource().getConnection().createStatement()) {
statement.execute(INSERT_SQL);
- result = statement.executeUpdate(UPDATE_SQL);
+ actual = statement.executeUpdate(UPDATE_SQL);
}
- assertThat(result, is(1));
+ assertThat(actual, is(1));
assertResultSet(true, 0, "cipher_pwd");
assertResultSet(false, 1, "cipher_pwd");
@@ -107,12 +107,12 @@ class ShadowStatementTest extends
AbstractShadowDriverTest {
@Test
void assertUpdateShadowCase() throws SQLException {
- int result;
+ int actual;
try (Statement statement =
getShadowDataSource().getConnection().createStatement()) {
statement.execute(INSERT_SHADOW_SQL);
- result = statement.executeUpdate(UPDATE_SHADOW_SQL);
+ actual = statement.executeUpdate(UPDATE_SHADOW_SQL);
}
- assertThat(result, is(1));
+ assertThat(actual, is(1));
assertResultSet(true, 1, "cipher_pwd");
assertResultSet(false, 0, "cipher_pwd");
}
diff --git
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShardingPreparedStatementTest.java
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShardingPreparedStatementTest.java
index 99f3ddfb115..cd119bf312e 100644
---
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShardingPreparedStatementTest.java
+++
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/statement/ShardingPreparedStatementTest.java
@@ -128,8 +128,8 @@ class ShardingPreparedStatementTest extends
AbstractShardingDriverTest {
preparedStatement.setString(2, "BATCH2");
preparedStatement.setString(3, "BATCH3");
preparedStatement.setString(4, "BATCH4");
- int result = preparedStatement.executeUpdate();
- assertThat(result, is(4));
+ int actual = preparedStatement.executeUpdate();
+ assertThat(actual, is(4));
ResultSet generateKeyResultSet =
preparedStatement.getGeneratedKeys();
assertTrue(generateKeyResultSet.next());
assertThat(generateKeyResultSet.getLong(1), is(1L));
@@ -358,9 +358,9 @@ class ShardingPreparedStatementTest extends
AbstractShardingDriverTest {
preparedStatement.setInt(4, 12);
preparedStatement.setInt(5, 12);
preparedStatement.setString(6, "MULTI");
- int result = preparedStatement.executeUpdate();
+ int actual = preparedStatement.executeUpdate();
ResultSet generateKeyResultSet =
preparedStatement.getGeneratedKeys();
- assertThat(result, is(2));
+ assertThat(actual, is(2));
assertTrue(generateKeyResultSet.next());
assertThat(generateKeyResultSet.getInt(1), is(1));
assertTrue(generateKeyResultSet.next());
@@ -460,8 +460,8 @@ class ShardingPreparedStatementTest extends
AbstractShardingDriverTest {
preparedStatement.setInt(7, userId2);
preparedStatement.setString(8, status);
preparedStatement.setString(9, updatedStatus);
- int result = preparedStatement.executeUpdate();
- assertThat(result, is(2));
+ int actual = preparedStatement.executeUpdate();
+ assertThat(actual, is(2));
queryStatement.setInt(1, orderId);
queryStatement.setInt(2, userId1);
try (ResultSet resultSet = queryStatement.executeQuery()) {
@@ -490,8 +490,8 @@ class ShardingPreparedStatementTest extends
AbstractShardingDriverTest {
preparedStatement.setInt(7, userId2);
preparedStatement.setString(8, status);
preparedStatement.setString(9, updatedStatus);
- int result = preparedStatement.executeUpdate();
- assertThat(result, is(4));
+ int actual = preparedStatement.executeUpdate();
+ assertThat(actual, is(4));
queryStatement.setInt(1, orderId);
queryStatement.setInt(2, userId1);
try (ResultSet resultSet = queryStatement.executeQuery()) {
@@ -523,11 +523,11 @@ class ShardingPreparedStatementTest extends
AbstractShardingDriverTest {
preparedStatement.setString(1, "init");
preparedStatement.setString(2, "batch");
preparedStatement.addBatch();
- int[] result = preparedStatement.executeBatch();
- assertThat(result.length, is(3));
- assertThat(result[0], is(4));
- assertThat(result[1], is(0));
- assertThat(result[2], is(4));
+ int[] actual = preparedStatement.executeBatch();
+ assertThat(actual.length, is(3));
+ assertThat(actual[0], is(4));
+ assertThat(actual[1], is(0));
+ assertThat(actual[2], is(4));
}
}
@@ -575,17 +575,17 @@ class ShardingPreparedStatementTest extends
AbstractShardingDriverTest {
@Test
void assertExecuteSelectAutoTableGetResultSet() throws SQLException {
- Collection<Integer> result = Arrays.asList(1001, 1100, 1101);
+ Collection<Integer> actual = Arrays.asList(1001, 1100, 1101);
try (PreparedStatement preparedStatement =
getShardingSphereDataSource().getConnection().prepareStatement(SELECT_AUTO_SQL))
{
preparedStatement.setInt(1, 1001);
int count = 0;
try (ResultSet resultSet = preparedStatement.executeQuery()) {
while (resultSet.next()) {
- assertTrue(result.contains(resultSet.getInt(2)));
+ assertTrue(actual.contains(resultSet.getInt(2)));
count++;
}
}
- assertThat(result.size(), is(count));
+ assertThat(actual.size(), is(count));
}
}
@@ -615,8 +615,7 @@ class ShardingPreparedStatementTest extends
AbstractShardingDriverTest {
preparedStatement.setString(4, "BATCH");
preparedStatement.addBatch();
preparedStatement.clearBatch();
- int[] result = preparedStatement.executeBatch();
- assertThat(result.length, is(0));
+ assertThat(preparedStatement.executeBatch().length, is(0));
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/plsql/PLSQLStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/plsql/PLSQLStatementAssert.java
index c90091e97c2..604470c9c25 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/plsql/PLSQLStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/plsql/PLSQLStatementAssert.java
@@ -83,7 +83,7 @@ public final class PLSQLStatementAssert {
assertThat(assertContext.getText("Procedure name mismatched:"),
actual.getProcedureName().get().getIdentifier().getValue(),
is(expected.getProcedureName().getName()));
}
if (null == expected.getProcedureBodyEndNameSegments()) {
- assertThat(assertContext.getText("Procedure body end names size
mismatched:"), actual.getProcedureBodyEndNameSegments().size(), is(0));
+ assertThat(assertContext.getText("Procedure body end names size
mismatched:"), actual.getProcedureBodyEndNameSegments().isEmpty());
} else {
assertThat(assertContext.getText("Procedure body end names size
mismatched:"), actual.getProcedureBodyEndNameSegments().size(),
is(expected.getProcedureBodyEndNameSegments().size()));
for (int i = 0; i <
expected.getProcedureBodyEndNameSegments().size(); i++) {
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
index 7e6ba5f6d37..b7c263eef31 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
@@ -139,7 +139,7 @@ class PipelineGovernanceFacadeTest {
assertThat(actualCheckJobIds.size(), is(1));
assertThat(actualCheckJobIds.iterator().next(), is(checkJobId));
governanceFacade.getJobFacade().getCheck().deleteCheckJobResult(jobItemContext.getJobId(),
checkJobId);
-
assertThat(governanceFacade.getJobFacade().getCheck().listCheckJobIds(jobItemContext.getJobId()).size(),
is(0));
+
assertTrue(governanceFacade.getJobFacade().getCheck().listCheckJobIds(jobItemContext.getJobId()).isEmpty());
}
@Test
