(shardingsphere) branch master updated: Refactor E2ETestCasesLoader (#32175)

[sunnianjun]

This is an automated email from the ASF dual-hosted git repository.

sunnianjun 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 1c31a780828 Refactor E2ETestCasesLoader (#32175)
1c31a780828 is described below

commit 1c31a78082800316263266f6932704c19a0a97b5
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Jul 18 19:16:56 2024 +0800

    Refactor E2ETestCasesLoader (#32175)
---
 .../test/e2e/cases/E2ETestCasesLoader.java             | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCasesLoader.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCasesLoader.java
index 7e222b919d5..15b66cfe26c 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCasesLoader.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCasesLoader.java
@@ -69,21 +69,21 @@ public final class E2ETestCasesLoader {
      * @return E2E test case contexts
      */
     public Collection<E2ETestCaseContext> getTestCaseContexts(final 
SQLCommandType sqlCommandType) {
-        return testCaseContexts.computeIfAbsent(sqlCommandType, 
this::loadIntegrationTestCaseContexts);
+        return testCaseContexts.computeIfAbsent(sqlCommandType, 
this::loadE2ETestCaseContexts);
     }
     
     @SneakyThrows({IOException.class, URISyntaxException.class, 
JAXBException.class})
-    private Collection<E2ETestCaseContext> 
loadIntegrationTestCaseContexts(final SQLCommandType sqlCommandType) {
+    private Collection<E2ETestCaseContext> loadE2ETestCaseContexts(final 
SQLCommandType sqlCommandType) {
         URL url = 
Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource("cases/"));
-        return loadIntegrationTestCaseContexts(url, sqlCommandType);
+        return loadE2ETestCaseContexts(url, sqlCommandType);
     }
     
-    private Collection<E2ETestCaseContext> 
loadIntegrationTestCaseContexts(final URL url, final SQLCommandType 
sqlCommandType) throws IOException, URISyntaxException, JAXBException {
+    private Collection<E2ETestCaseContext> loadE2ETestCaseContexts(final URL 
url, final SQLCommandType sqlCommandType) throws IOException, 
URISyntaxException, JAXBException {
         Collection<File> files = getFiles(url, sqlCommandType);
-        Preconditions.checkNotNull(files, "Can not find integration test 
cases.");
+        Preconditions.checkNotNull(files, "Can not find E2E test cases.");
         Collection<E2ETestCaseContext> result = new LinkedList<>();
         for (File each : files) {
-            result.addAll(getIntegrationTestCaseContexts(each));
+            result.addAll(getE2ETestCaseContexts(each));
         }
         return result;
     }
@@ -103,12 +103,12 @@ public final class E2ETestCasesLoader {
         return result;
     }
     
-    private Collection<E2ETestCaseContext> 
getIntegrationTestCaseContexts(final File file) throws IOException, 
JAXBException {
+    private Collection<E2ETestCaseContext> getE2ETestCaseContexts(final File 
file) throws IOException, JAXBException {
         return unmarshal(file.getPath()).getTestCases().stream().map(each -> 
new E2ETestCaseContext(each, file.getParent())).collect(Collectors.toList());
     }
     
-    private E2ETestCases unmarshal(final String integrateCasesFile) throws 
IOException, JAXBException {
-        try (FileReader reader = new FileReader(integrateCasesFile)) {
+    private E2ETestCases unmarshal(final String e2eCasesFile) throws 
IOException, JAXBException {
+        try (FileReader reader = new FileReader(e2eCasesFile)) {
             return (E2ETestCases) 
JAXBContext.newInstance(E2ETestCases.class).createUnmarshaller().unmarshal(reader);
         }
     }