(bookkeeper) branch master updated: fix: windows test failure in ConfigDefTest (#4273)

[nicoloboschi]

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

nicoloboschi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new f37145e2e2 fix: windows test failure in ConfigDefTest (#4273)
f37145e2e2 is described below

commit f37145e2e2bffa9926d19bb4ae6403581c09cbf1
Author: ZhangJian He <shoot...@gmail.com>
AuthorDate: Fri Apr 12 17:01:10 2024 +0800

    fix: windows test failure in ConfigDefTest (#4273)
    
    Signed-off-by: ZhangJian He <shoot...@gmail.com>
---
 .../apache/bookkeeper/common/conf/ConfigDefTest.java    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git 
a/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/conf/ConfigDefTest.java
 
b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/conf/ConfigDefTest.java
index 7ba3e71cca..eb295d8557 100644
--- 
a/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/conf/ConfigDefTest.java
+++ 
b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/conf/ConfigDefTest.java
@@ -27,10 +27,11 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.Lists;
-import com.google.common.io.ByteStreams;
+import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Iterator;
 import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
@@ -280,11 +281,15 @@ public class ConfigDefTest {
 
     @Test
     public void testSaveConfigDef() throws IOException  {
-        byte[] confData;
-        try (InputStream is = 
this.getClass().getClassLoader().getResourceAsStream("test_conf_2.conf")) {
-            confData = new byte[is.available()];
-            ByteStreams.readFully(is, confData);
+        StringBuilder sb = new StringBuilder();
+        try (InputStream is = 
this.getClass().getClassLoader().getResourceAsStream("test_conf_2.conf");
+             BufferedReader reader = new BufferedReader(new 
InputStreamReader(is, UTF_8))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line).append(System.lineSeparator());
+            }
         }
+        String confData = sb.toString();
 
         ConfigDef configDef = ConfigDef.of(TestConfig2.class);
         String readConf;
@@ -294,7 +299,7 @@ public class ConfigDefTest {
             log.info("\n{}", readConf);
         }
 
-        assertEquals(new String(confData, UTF_8), readConf);
+        assertEquals(confData, readConf);
     }
 
 }