(shardingsphere) branch master updated: Fix CI for windows (#29444)

[jianglongtao]

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

jianglongtao 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 f8f90126f69 Fix CI for windows (#29444)
f8f90126f69 is described below

commit f8f90126f698cefe1ba83f5fbe953455f1971559
Author: ChenJiaHao <chenjia...@apache.org>
AuthorDate: Tue Dec 19 14:36:19 2023 +0800

    Fix CI for windows (#29444)
    
    * Fix CI for windows
    
    * Update rat for exclusion test file
    
    * Update test file name
---
 .../ral/queryable/ExportMetaDataExecutorTest.java      | 18 +++++++++++++++---
 ...ata => export-metadata-configuration_for_unix.data} |  0
 .../export-metadata-configuration_for_win.data         |  1 +
 src/resources/rat.txt                                  |  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
index 6a5cf996dc8..ae40c928043 100644
--- 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
+++ 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
@@ -84,9 +84,12 @@ import static org.mockito.Mockito.when;
 @StaticMockSettings(ProxyContext.class)
 class ExportMetaDataExecutorTest {
     
-    private static final String METADATA_VALUE_EXPECTED = 
"eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7ImVtcHR5X21ldGFkYXRhIjoiZGF0YWJhc2VOYW1lOiBudWxsXG5kYXRhU291cmNlczpcbn"
+    private static final String METADATA_VALUE_EXPECTED_FOR_UNIX = 
"eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7ImVtcHR5X21ldGFkYXRhIjoiZGF0YWJhc2VOYW1lOiBudWxsXG5kYXRhU291cmNlczpcbn"
             + 
"J1bGVzOlxuIn0sInByb3BzIjoiIiwicnVsZXMiOiJydWxlczpcbi0gIUdMT0JBTF9DTE9DS1xuICBlbmFibGVkOiBmYWxzZVxuICBwcm92aWRlcjogbG9jYWxcbiAgdHlwZTogVFNPXG4ifX0=";
     
+    private static final String METADATA_VALUE_EXPECTED_FOR_WIN = 
"eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7ImVtcHR5X21ldGFkYXRhIjoiZGF0YWJhc2VOYW1lOiBudWxsXHJcbmRhdGFTb3VyY2VzO"
+            + 
"lxyXG5ydWxlczpcclxuIn0sInByb3BzIjoiIiwicnVsZXMiOiJydWxlczpcclxuLSAhR0xPQkFMX0NMT0NLXHJcbiAgZW5hYmxlZDogZmFsc2VcclxuICBwcm92aWRlcjogbG9jYWxcclxuICB0eXBlOiBUU09cclxuIn19";
+    
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private ShardingSphereDatabase database;
     
@@ -117,7 +120,11 @@ class ExportMetaDataExecutorTest {
         Collection<LocalDataQueryResultRow> actual = new 
ExportMetaDataExecutor().getRows(contextManager.getMetaDataContexts().getMetaData(),
 sqlStatement);
         assertThat(actual.size(), is(1));
         LocalDataQueryResultRow row = actual.iterator().next();
-        assertThat(row.getCell(3), is(METADATA_VALUE_EXPECTED));
+        if (System.getProperty("os.name").toLowerCase().contains("windows")) {
+            assertThat(row.getCell(3), is(METADATA_VALUE_EXPECTED_FOR_WIN));
+        } else {
+            assertThat(row.getCell(3), is(METADATA_VALUE_EXPECTED_FOR_UNIX));
+        }
     }
     
     private ContextManager mockEmptyContextManager() {
@@ -194,7 +201,12 @@ class ExportMetaDataExecutorTest {
     @SneakyThrows(IOException.class)
     private String loadExpectedRow() {
         StringBuilder result = new StringBuilder();
-        String fileName = 
Objects.requireNonNull(ExportMetaDataExecutorTest.class.getResource("/expected/export-metadata-configuration.data")).getFile();
+        String fileName;
+        if (System.getProperty("os.name").toLowerCase().contains("windows")) {
+            fileName = 
Objects.requireNonNull(ExportMetaDataExecutorTest.class.getResource("/expected/export-metadata-configuration_for_win.data")).getFile();
+        } else {
+            fileName = 
Objects.requireNonNull(ExportMetaDataExecutorTest.class.getResource("/expected/export-metadata-configuration_for_unix.data")).getFile();
+        }
         try (
                 FileReader fileReader = new FileReader(fileName);
                 BufferedReader reader = new BufferedReader(fileReader)) {
diff --git 
a/proxy/backend/core/src/test/resources/expected/export-metadata-configuration.data
 
b/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_unix.data
similarity index 100%
rename from 
proxy/backend/core/src/test/resources/expected/export-metadata-configuration.data
rename to 
proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_unix.data
diff --git 
a/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_win.data
 
b/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_win.data
new file mode 100644
index 00000000000..7c768173bb3
--- /dev/null
+++ 
b/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_win.data
@@ -0,0 +1 @@
+eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7Im5vcm1hbF9kYiI6ImRhdGFiYXNlTmFtZTogbm9ybWFsX2RiXHJcbmRhdGFTb3VyY2VzOlxyXG4gIGRzXzA6XHJcbiAgICBwYXNzd29yZDogXHJcbiAgICB1cmw6IGpkYmM6b3BlbmdhdXNzOi8vMTI3LjAuMC4xOjU0MzIvZGVtb19kc18wXHJcbiAgICB1c2VybmFtZTogcm9vdFxyXG4gICAgbWluUG9vbFNpemU6IDFcclxuICAgIG1heFBvb2xTaXplOiA1MFxyXG4gIGRzXzE6XHJcbiAgICBwYXNzd29yZDogXHJcbiAgICB1cmw6IGpkYmM6b3BlbmdhdXNzOi8vMTI3LjAuMC4xOjU0MzIvZGVtb19kc18xXHJcbiAgICB1c2VybmFtZTogcm9vdFxyXG4gICAgbWluUG9vbFNpemU6IDFcclxuICAgIG1heFBv
 [...]
diff --git a/src/resources/rat.txt b/src/resources/rat.txt
index ccd80d2a8e3..7d3b9c3255e 100644
--- a/src/resources/rat.txt
+++ b/src/resources/rat.txt
@@ -61,5 +61,6 @@
 
 # test files
 
-**/export-metadata-configuration.data
+**/export-metadata-configuration_for_unix.data
+**/export-metadata-configuration_for_win.data