[incubator-iotdb] branch feature_read_data_from_unclosed_tsfile updated: fix TsFileReaderWriteTest failure on Win: not close files

[hxd]

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

hxd pushed a commit to branch feature_read_data_from_unclosed_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to 
refs/heads/feature_read_data_from_unclosed_tsfile by this push:
     new d8a7ffc  fix TsFileReaderWriteTest failure on Win: not close files
d8a7ffc is described below

commit d8a7ffc2682067fddb89fc432b78e51cdf995f7d
Author: xiangdong huang <saint...@gmail.com>
AuthorDate: Wed Mar 6 16:16:07 2019 +0800

    fix TsFileReaderWriteTest failure on Win: not close files
---
 .../apache/iotdb/tsfile/write/TsFileReadWriteTest.java   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git 
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java 
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java
index 516d53f..f5e76fc 100644
--- 
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java
+++ 
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java
@@ -50,15 +50,13 @@ public class TsFileReadWriteTest {
   private final double delta = 0.0000001;
   private String path = "read_write_rle.tsfile";
   private File f;
-  private TsFileWriter tsFileWriter;
 
   @Before
   public void setUp() throws Exception {
     f = new File(path);
     if (f.exists()) {
-      f.delete();
+      assertTrue(f.delete());
     }
-    tsFileWriter = new TsFileWriter(f);
   }
 
   @After
@@ -72,6 +70,7 @@ public class TsFileReadWriteTest {
   @Test
   public void intTest() throws IOException, WriteProcessException {
     int floatCount = 1024 * 1024 * 13 + 1023;
+    TsFileWriter tsFileWriter = new TsFileWriter(f);
     // add measurements into file schema
     tsFileWriter
         .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.INT32, 
TSEncoding.RLE));
@@ -110,6 +109,7 @@ public class TsFileReadWriteTest {
   public void longTest() throws IOException, WriteProcessException {
     int floatCount = 1024 * 1024 * 13 + 1023;
     // add measurements into file schema
+    TsFileWriter tsFileWriter = new TsFileWriter(f);
     tsFileWriter
         .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.INT64, 
TSEncoding.RLE));
     for (long i = 1; i < floatCount; i++) {
@@ -147,6 +147,7 @@ public class TsFileReadWriteTest {
   public void floatTest() throws IOException, WriteProcessException {
     int floatCount = 1024 * 1024 * 13 + 1023;
     // add measurements into file schema
+    TsFileWriter tsFileWriter = new TsFileWriter(f);
     tsFileWriter
         .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.FLOAT, 
TSEncoding.RLE));
     for (long i = 1; i < floatCount; i++) {
@@ -185,6 +186,7 @@ public class TsFileReadWriteTest {
   public void doubleTest() throws IOException, WriteProcessException {
     int floatCount = 1024 * 1024 * 13 + 1023;
     // add measurements into file schema
+    TsFileWriter tsFileWriter = new TsFileWriter(f);
     tsFileWriter
         .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.DOUBLE, 
TSEncoding.RLE));
     for (long i = 1; i < floatCount; i++) {
@@ -220,13 +222,7 @@ public class TsFileReadWriteTest {
 
   @Test
   public void readEmptyMeasurementTest() throws IOException, 
WriteProcessException {
-    String path = "test.tsfile";
-    File f = new File(path);
-    if (f.exists()) {
-      assertTrue(f.delete());
-    }
-    tsFileWriter = new TsFileWriter(f);
-
+    TsFileWriter tsFileWriter = new TsFileWriter(f);
     // add measurements into file schema
     tsFileWriter
         .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.FLOAT, 
TSEncoding.RLE));