This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch fix_check_whether_file_is_deleted_in_ut in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 88294604094a168839a17b57fd0b63710c278f2d Author: xiangdong huang <[email protected]> AuthorDate: Thu Mar 28 00:17:57 2019 +0800 check whether tsfile is deleted in ut --- .../TsFileGeneratorForSeriesReaderByTimestamp.java | 13 +++++++------ .../apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java index 21e5d18..61a23f5 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java @@ -38,6 +38,7 @@ import org.apache.iotdb.tsfile.utils.RecordUtils; import org.apache.iotdb.tsfile.write.TsFileWriter; import org.apache.iotdb.tsfile.write.record.TSRecord; import org.apache.iotdb.tsfile.write.schema.FileSchema; +import org.junit.Assert; import org.junit.Ignore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,22 +81,22 @@ public class TsFileGeneratorForSeriesReaderByTimestamp { TSFileDescriptor.getInstance().getConfig().maxNumberOfPointsInPage = prePageSize; File file = new File(inputDataFile); if (file.exists()) { - file.delete(); + Assert.assertTrue(file.delete()); } file = new File(outputDataFile); if (file.exists()) { - file.delete(); + Assert.assertTrue(file.delete()); } file = new File(errorOutputDataFile); if (file.exists()) { - file.delete(); + Assert.assertTrue(file.delete()); } } static private void generateSampleInputDataFile() throws IOException { File file = new File(inputDataFile); if (file.exists()) { - file.delete(); + Assert.assertTrue(file.delete()); } file.getParentFile().mkdirs(); FileWriter fw = new FileWriter(file); @@ -149,10 +150,10 @@ public class TsFileGeneratorForSeriesReaderByTimestamp { File file = new File(outputDataFile); File errorFile = new File(errorOutputDataFile); if (file.exists()) { - file.delete(); + Assert.assertTrue(file.delete()); } if (errorFile.exists()) { - errorFile.delete(); + Assert.assertTrue(errorFile.delete()); } // LOG.info(jsonSchema.toString()); diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java index a2b6acd..6a73252 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java @@ -95,7 +95,7 @@ public class TsFileGeneratorForTest { static private void generateSampleInputDataFile(int minRowCount, int maxRowCount) throws IOException { File file = new File(inputDataFile); if (file.exists()) { - file.delete(); + Assert.assertTrue(file.delete()); } file.getParentFile().mkdirs(); FileWriter fw = new FileWriter(file); @@ -149,10 +149,10 @@ public class TsFileGeneratorForTest { File file = new File(outputDataFile); File errorFile = new File(errorOutputDataFile); if (file.exists()) { - file.delete(); + Assert.assertTrue(file.delete()); } if (errorFile.exists()) { - errorFile.delete(); + Assert.assertTrue(errorFile.delete()); } // LOG.info(jsonSchema.toString());
