This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch enable_cache_leaderv2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a730dcd038d0fe6349d82a9f5095dea6aede0084 Author: HTHou <[email protected]> AuthorDate: Thu Jul 1 22:26:51 2021 +0800 Fix cross-tests --- .../tests/tools/importCsv/AbstractScript.java | 46 +++++++++---------- .../tests/tools/importCsv/ExportCsvTestIT.java | 51 ++++++++++++---------- .../tests/tools/importCsv/ImportCsvTestIT.java | 18 +++----- 3 files changed, 56 insertions(+), 59 deletions(-) diff --git a/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/AbstractScript.java b/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/AbstractScript.java index b5f9456..6b08cf2 100644 --- a/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/AbstractScript.java +++ b/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/AbstractScript.java @@ -34,31 +34,31 @@ public abstract class AbstractScript { protected void testOutput(ProcessBuilder builder, String[] output) throws IOException { builder.redirectErrorStream(true); Process p = builder.start(); - BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream())); - String line; - List<String> actualOutput = new ArrayList<>(); - while (true) { - line = r.readLine(); - if (line == null) { - break; - } else { - actualOutput.add(line); + try (BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream()))) { + String line; + List<String> actualOutput = new ArrayList<>(); + while (true) { + line = r.readLine(); + if (line == null) { + break; + } else { + actualOutput.add(line); + } } - } - r.close(); - p.destroy(); + p.destroy(); - System.out.println("should contains:"); - for (String s : output) { - System.out.println(s); - } + System.out.println("should contains:"); + for (String s : output) { + System.out.println(s); + } - System.out.println("actualOutput:"); - for (String out : actualOutput) { - System.out.println(out); - } + System.out.println("actualOutput:"); + for (String out : actualOutput) { + System.out.println(out); + } - assertTrue(actualOutput.get(actualOutput.size() - 1).contains(output[output.length - 1])); + assertTrue(actualOutput.get(actualOutput.size() - 1).contains(output[output.length - 1])); + } } protected String getCliPath() { @@ -79,8 +79,8 @@ public abstract class AbstractScript { + "pom" + ".properties"); Properties properties = new Properties(); - try { - properties.load(new FileReader(target)); + try (FileReader reader = new FileReader(target)) { + properties.load(reader); } catch (IOException e) { return "target" + File.separator + "iotdb-cli-"; } diff --git a/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/ExportCsvTestIT.java b/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/ExportCsvTestIT.java index 3ffb0f9..996a007 100644 --- a/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/ExportCsvTestIT.java +++ b/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/ExportCsvTestIT.java @@ -146,19 +146,20 @@ public class ExportCsvTestIT extends AbstractScript { } else { testOnUnix(output); } - FileReader fileReader = new FileReader(EXPORT_FILE); - BufferedReader br = new BufferedReader(fileReader); - String line = br.readLine(); - int i = 0; - while (line != null) { - if (i == 0) { - assertEquals(expectCsv[i], line); - } else { - String lineWithoutTime = line.substring(line.indexOf(',') + 1); - assertEquals(expectCsv[i], lineWithoutTime); + try (FileReader fileReader = new FileReader(EXPORT_FILE); + BufferedReader br = new BufferedReader(fileReader)) { + String line = br.readLine(); + int i = 0; + while (line != null) { + if (i == 0) { + assertEquals(expectCsv[i], line); + } else { + String lineWithoutTime = line.substring(line.indexOf(',') + 1); + assertEquals(expectCsv[i], lineWithoutTime); + } + i++; + line = br.readLine(); } - i++; - line = br.readLine(); } File file = new File(EXPORT_FILE); if (file.exists()) { @@ -182,19 +183,20 @@ public class ExportCsvTestIT extends AbstractScript { } else { testOnUnix(output); } - FileReader fileReader = new FileReader(EXPORT_FILE); - BufferedReader br = new BufferedReader(fileReader); - String line = br.readLine(); - int i = 0; - while (line != null) { - if (i == 0) { - assertEquals(expectCsv[i], line); - } else { - String lineWithoutTime = line.substring(line.indexOf(',') + 1); - assertEquals(expectCsv[i], lineWithoutTime); + try (FileReader fileReader = new FileReader(EXPORT_FILE); + BufferedReader br = new BufferedReader(fileReader)) { + String line = br.readLine(); + int i = 0; + while (line != null) { + if (i == 0) { + assertEquals(expectCsv[i], line); + } else { + String lineWithoutTime = line.substring(line.indexOf(',') + 1); + assertEquals(expectCsv[i], lineWithoutTime); + } + i++; + line = br.readLine(); } - i++; - line = br.readLine(); } File file = new File(EXPORT_FILE); if (file.exists()) { @@ -217,5 +219,6 @@ public class ExportCsvTestIT extends AbstractScript { values.add("\"abc\",aa"); values.add("abbe's"); session.insertRecord(deviceId, 1L, measurements, values); + session.close(); } } diff --git a/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/ImportCsvTestIT.java b/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/ImportCsvTestIT.java index e2dfb4b..a732b62 100644 --- a/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/ImportCsvTestIT.java +++ b/cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/ImportCsvTestIT.java @@ -230,16 +230,14 @@ public class ImportCsvTestIT extends AbstractScript { "2,500,'',600,700,800", "3,900,'Io\"TDB',1000,1100,1200" }; - BufferedWriter writer; - try { - writer = new BufferedWriter(new FileWriter(CSV_FILE)); + try (FileWriter fileWriter = new FileWriter(CSV_FILE); + BufferedWriter writer = new BufferedWriter(fileWriter)) { writer.write(""); for (String s : csvText) { writer.write(s); writer.newLine(); } writer.flush(); - writer.close(); return true; } catch (IOException e) { System.out.println("failed to create test csv"); @@ -253,16 +251,14 @@ public class ImportCsvTestIT extends AbstractScript { for (int i = 0; i < 25000; i++) { csvText.add(i + "," + i + "," + i + "," + i); } - BufferedWriter writer; - try { - writer = new BufferedWriter(new FileWriter(CSV_FILE)); + try (FileWriter fileWriter = new FileWriter(CSV_FILE); + BufferedWriter writer = new BufferedWriter(fileWriter)) { writer.write(""); for (String s : csvText) { writer.write(s); writer.newLine(); } writer.flush(); - writer.close(); return true; } catch (IOException e) { System.out.println("failed to create test csv"); @@ -274,16 +270,14 @@ public class ImportCsvTestIT extends AbstractScript { String[] csvText = { "Time,root.fit.d1.\"s1\",root.fit.d1.s2,root.fit.d2.s1,root.fit.d2.s3,root.fit.p.s1" }; - BufferedWriter writer; - try { - writer = new BufferedWriter(new FileWriter(CSV_FILE)); + try (FileWriter fileWriter = new FileWriter(CSV_FILE); + BufferedWriter writer = new BufferedWriter(fileWriter)) { writer.write(""); for (String s : csvText) { writer.write(s); writer.newLine(); } writer.flush(); - writer.close(); return true; } catch (IOException e) { System.out.println("failed to create test csv");
