You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/08/26 08:31:46 UTC
[incubator-iotdb] branch master updated: Remove unnecessary code
and simplify assertEquals to assertFalse or assertTrue.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 84451ac Remove unnecessary code and simplify assertEquals to assertFalse or assertTrue.
new 35ae1c3 Merge pull request #355 from Genius-pig/master
84451ac is described below
commit 84451ace4f69383615a90d3e691b1303082089b0
Author: zhutianci <zh...@gmail.com>
AuthorDate: Mon Aug 26 15:53:06 2019 +0800
Remove unnecessary code and simplify assertEquals to assertFalse or assertTrue.
---
.../file/metadata/statistics/Statistics.java | 2 +-
.../metadata/statistics/BooleanStatisticsTest.java | 38 ++++++++++++----------
.../metadata/statistics/DoubleStatisticsTest.java | 37 +++++++++++----------
.../metadata/statistics/FloatStatisticsTest.java | 23 ++++++-------
.../metadata/statistics/IntegerStatisticsTest.java | 7 ++--
.../metadata/statistics/LongStatisticsTest.java | 24 +++++++-------
.../metadata/statistics/StringStatisticsTest.java | 13 ++++----
.../write/schema/converter/SchemaBuilderTest.java | 2 --
8 files changed, 76 insertions(+), 70 deletions(-)
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java
index 353fbf7..cdc13ad 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This class is used for recording statistic information of each measurement in a delta file.While
+ * This class is used for recording statistic information of each measurement in a delta file. While
* writing processing, the processor records the digest information. Statistics includes maximum,
* minimum and null value count up to version 0.0.1.<br> Each data type extends this Statistic as
* super class.<br>
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java
index 949c39f..4fc6d27 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.tsfile.file.metadata.statistics;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -33,14 +35,14 @@ public class BooleanStatisticsTest {
public void testUpdate() {
Statistics<Boolean> booleanStatistics = new BooleanStatistics();
booleanStatistics.updateStats(true);
- assertEquals(false, booleanStatistics.isEmpty());
+ assertFalse(booleanStatistics.isEmpty());
booleanStatistics.updateStats(false);
- assertEquals(false, booleanStatistics.isEmpty());
- assertEquals(true, (boolean) booleanStatistics.getMax());
- assertEquals(false, (boolean) booleanStatistics.getMin());
- assertEquals(0, (double) booleanStatistics.getSum(), maxError);
- assertEquals(true, (boolean) booleanStatistics.getFirst());
- assertEquals(false, (boolean) booleanStatistics.getLast());
+ assertFalse(booleanStatistics.isEmpty());
+ assertTrue(booleanStatistics.getMax());
+ assertFalse(booleanStatistics.getMin());
+ assertEquals(0, booleanStatistics.getSum(), maxError);
+ assertTrue(booleanStatistics.getFirst());
+ assertFalse(booleanStatistics.getLast());
}
@Test
@@ -55,18 +57,18 @@ public class BooleanStatisticsTest {
Statistics<Boolean> booleanStats3 = new BooleanStatistics();
booleanStats3.mergeStatistics(booleanStats1);
- assertEquals(false, booleanStats3.isEmpty());
- assertEquals(false, (boolean) booleanStats3.getMax());
- assertEquals(false, (boolean) booleanStats3.getMin());
- assertEquals(0, (double) booleanStats3.getSum(), maxError);
- assertEquals(false, (boolean) booleanStats3.getFirst());
- assertEquals(false, (boolean) booleanStats3.getLast());
+ assertFalse(booleanStats3.isEmpty());
+ assertFalse(booleanStats3.getMax());
+ assertFalse(booleanStats3.getMin());
+ assertEquals(0,booleanStats3.getSum(), maxError);
+ assertFalse(booleanStats3.getFirst());
+ assertFalse(booleanStats3.getLast());
booleanStats3.mergeStatistics(booleanStats2);
- assertEquals(true, (boolean) booleanStats3.getMax());
- assertEquals(false, (boolean) booleanStats3.getMin());
- assertEquals(0, (double) booleanStats3.getSum(), maxError);
- assertEquals(false, (boolean) booleanStats3.getFirst());
- assertEquals(true, (boolean) booleanStats3.getLast());
+ assertTrue(booleanStats3.getMax());
+ assertFalse(booleanStats3.getMin());
+ assertEquals(0, booleanStats3.getSum(), maxError);
+ assertFalse(booleanStats3.getFirst());
+ assertTrue(booleanStats3.getLast());
}
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java
index b19ffa1..7bb3433 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.tsfile.file.metadata.statistics;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import org.junit.Test;
@@ -30,14 +31,14 @@ public class DoubleStatisticsTest {
public void testUpdate() {
Statistics<Double> doubleStats = new DoubleStatistics();
doubleStats.updateStats(1.34d);
- assertEquals(false, doubleStats.isEmpty());
+ assertFalse(doubleStats.isEmpty());
doubleStats.updateStats(2.32d);
- assertEquals(false, doubleStats.isEmpty());
- assertEquals(2.32d, (double) doubleStats.getMax(), maxError);
- assertEquals(1.34d, (double) doubleStats.getMin(), maxError);
- assertEquals(2.32d + 1.34d, (double) doubleStats.getSum(), maxError);
- assertEquals(1.34d, (double) doubleStats.getFirst(), maxError);
- assertEquals(2.32d, (double) doubleStats.getLast(), maxError);
+ assertFalse(doubleStats.isEmpty());
+ assertEquals(2.32d, doubleStats.getMax(), maxError);
+ assertEquals(1.34d, doubleStats.getMin(), maxError);
+ assertEquals(2.32d + 1.34d, doubleStats.getSum(), maxError);
+ assertEquals(1.34d, doubleStats.getFirst(), maxError);
+ assertEquals(2.32d, doubleStats.getLast(), maxError);
}
@Test
@@ -52,19 +53,19 @@ public class DoubleStatisticsTest {
Statistics<Double> doubleStats3 = new DoubleStatistics();
doubleStats3.mergeStatistics(doubleStats1);
- assertEquals(false, doubleStats3.isEmpty());
- assertEquals(100.13453d, (double) doubleStats3.getMax(), maxError);
- assertEquals(1.34d, (double) doubleStats3.getMin(), maxError);
- assertEquals(100.13453d + 1.34d, (double) doubleStats3.getSum(), maxError);
- assertEquals(1.34d, (double) doubleStats3.getFirst(), maxError);
- assertEquals(100.13453d, (double) doubleStats3.getLast(), maxError);
+ assertFalse(doubleStats3.isEmpty());
+ assertEquals(100.13453d, doubleStats3.getMax(), maxError);
+ assertEquals(1.34d, doubleStats3.getMin(), maxError);
+ assertEquals(100.13453d + 1.34d, doubleStats3.getSum(), maxError);
+ assertEquals(1.34d, doubleStats3.getFirst(), maxError);
+ assertEquals(100.13453d, doubleStats3.getLast(), maxError);
doubleStats3.mergeStatistics(doubleStats2);
- assertEquals(200.435d, (double) doubleStats3.getMax(), maxError);
- assertEquals(1.34d, (double) doubleStats3.getMin(), maxError);
- assertEquals(100.13453d + 1.34d + 200.435d, (double) doubleStats3.getSum(), maxError);
- assertEquals(1.34d, (double) doubleStats3.getFirst(), maxError);
- assertEquals(200.435d, (double) doubleStats3.getLast(), maxError);
+ assertEquals(200.435d, doubleStats3.getMax(), maxError);
+ assertEquals(1.34d, doubleStats3.getMin(), maxError);
+ assertEquals(100.13453d + 1.34d + 200.435d, doubleStats3.getSum(), maxError);
+ assertEquals(1.34d, doubleStats3.getFirst(), maxError);
+ assertEquals(200.435d, doubleStats3.getLast(), maxError);
}
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java
index 867be8c..b6b9841 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.tsfile.file.metadata.statistics;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import org.junit.Test;
@@ -30,9 +31,9 @@ public class FloatStatisticsTest {
public void testUpdate() {
Statistics<Float> floatStats = new FloatStatistics();
floatStats.updateStats(1.34f);
- assertEquals(false, floatStats.isEmpty());
+ assertFalse(floatStats.isEmpty());
floatStats.updateStats(2.32f);
- assertEquals(false, floatStats.isEmpty());
+ assertFalse(floatStats.isEmpty());
assertEquals(2.32f, (double) floatStats.getMax(), maxError);
assertEquals(1.34f, (double) floatStats.getMin(), maxError);
assertEquals(2.32f + 1.34f, (double) floatStats.getSum(), maxError);
@@ -52,19 +53,19 @@ public class FloatStatisticsTest {
Statistics<Float> floatStats3 = new FloatStatistics();
floatStats3.mergeStatistics(floatStats1);
- assertEquals(false, floatStats3.isEmpty());
- assertEquals(100.13453f, (float) floatStats3.getMax(), maxError);
- assertEquals(1.34f, (float) floatStats3.getMin(), maxError);
+ assertFalse(floatStats3.isEmpty());
+ assertEquals(100.13453f, floatStats3.getMax(), maxError);
+ assertEquals(1.34f, floatStats3.getMin(), maxError);
assertEquals(100.13453f + 1.34f, (float) floatStats3.getSum(), maxError);
- assertEquals(1.34f, (float) floatStats3.getFirst(), maxError);
- assertEquals(100.13453f, (float) floatStats3.getLast(), maxError);
+ assertEquals(1.34f, floatStats3.getFirst(), maxError);
+ assertEquals(100.13453f, floatStats3.getLast(), maxError);
floatStats3.mergeStatistics(floatStats2);
- assertEquals(200.435d, (float) floatStats3.getMax(), maxError);
- assertEquals(1.34d, (float) floatStats3.getMin(), maxError);
+ assertEquals(200.435d, floatStats3.getMax(), maxError);
+ assertEquals(1.34d, floatStats3.getMin(), maxError);
assertEquals(100.13453f + 1.34f + 200.435d, (float) floatStats3.getSum(), maxError);
- assertEquals(1.34f, (float) floatStats3.getFirst(), maxError);
- assertEquals(200.435f, (float) floatStats3.getLast(), maxError);
+ assertEquals(1.34f, floatStats3.getFirst(), maxError);
+ assertEquals(200.435f, floatStats3.getLast(), maxError);
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java
index 8b6a594..f34f9cf 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.tsfile.file.metadata.statistics;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import org.junit.Test;
@@ -28,9 +29,9 @@ public class IntegerStatisticsTest {
public void testUpdate() {
Statistics<Integer> intStats = new IntegerStatistics();
intStats.updateStats(1);
- assertEquals(false, intStats.isEmpty());
+ assertFalse(intStats.isEmpty());
intStats.updateStats(2);
- assertEquals(false, intStats.isEmpty());
+ assertFalse(intStats.isEmpty());
assertEquals(2, (int) intStats.getMax());
assertEquals(1, (int) intStats.getMin());
assertEquals(1, (int) intStats.getFirst());
@@ -50,7 +51,7 @@ public class IntegerStatisticsTest {
Statistics<Integer> intStats3 = new IntegerStatistics();
intStats3.mergeStatistics(intStats1);
- assertEquals(false, intStats3.isEmpty());
+ assertFalse(intStats3.isEmpty());
assertEquals(100, (int) intStats3.getMax());
assertEquals(1, (int) intStats3.getMin());
assertEquals(1, (int) intStats3.getFirst());
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java
index 6be700f..4ddf2e1 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.tsfile.file.metadata.statistics;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
@@ -28,13 +30,13 @@ public class LongStatisticsTest {
@Test
public void testUpdate() {
Statistics<Long> longStats = new LongStatistics();
- assertEquals(true, longStats.isEmpty());
- long firstValue = -120985402913209l;
- long secondValue = 1251465332132513l;
+ assertTrue(longStats.isEmpty());
+ long firstValue = -120985402913209L;
+ long secondValue = 1251465332132513L;
longStats.updateStats(firstValue);
- assertEquals(false, longStats.isEmpty());
+ assertFalse(longStats.isEmpty());
longStats.updateStats(secondValue);
- assertEquals(false, longStats.isEmpty());
+ assertFalse(longStats.isEmpty());
assertEquals(secondValue, (long) longStats.getMax());
assertEquals(firstValue, (long) longStats.getMin());
assertEquals(firstValue, (long) longStats.getFirst());
@@ -46,17 +48,17 @@ public class LongStatisticsTest {
public void testMerge() {
Statistics<Long> longStats1 = new LongStatistics();
Statistics<Long> longStats2 = new LongStatistics();
- assertEquals(true, longStats1.isEmpty());
- assertEquals(true, longStats2.isEmpty());
- long max1 = 100000000000l;
- long max2 = 200000000000l;
- longStats1.updateStats(1l);
+ assertTrue(longStats1.isEmpty());
+ assertTrue(longStats2.isEmpty());
+ long max1 = 100000000000L;
+ long max2 = 200000000000L;
+ longStats1.updateStats(1L);
longStats1.updateStats(max1);
longStats2.updateStats(max2);
Statistics<Long> longStats3 = new LongStatistics();
longStats3.mergeStatistics(longStats1);
- assertEquals(false, longStats3.isEmpty());
+ assertFalse(longStats3.isEmpty());
assertEquals(max1, (long) longStats3.getMax());
assertEquals(1, (long) longStats3.getMin());
assertEquals(max1 + 1, (long) longStats3.getSum());
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java
index 7a6cfcd..8fd12b2 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.tsfile.file.metadata.statistics;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import org.apache.iotdb.tsfile.utils.Binary;
import org.junit.Test;
@@ -31,9 +32,9 @@ public class StringStatisticsTest {
public void testUpdate() {
Statistics<Binary> binaryStats = new BinaryStatistics();
binaryStats.updateStats(new Binary("aaa"));
- assertEquals(false, binaryStats.isEmpty());
+ assertFalse(binaryStats.isEmpty());
binaryStats.updateStats(new Binary("bbb"));
- assertEquals(false, binaryStats.isEmpty());
+ assertFalse(binaryStats.isEmpty());
assertEquals("bbb", binaryStats.getMax().getStringValue());
assertEquals("aaa", binaryStats.getMin().getStringValue());
assertEquals(0, binaryStats.getSum(), maxError);
@@ -53,11 +54,11 @@ public class StringStatisticsTest {
Statistics<Binary> stringStats3 = new BinaryStatistics();
stringStats3.mergeStatistics(stringStats1);
- assertEquals(false, stringStats3.isEmpty());
- assertEquals("ccc", (String) stringStats3.getMax().getStringValue());
- assertEquals("aaa", (String) stringStats3.getMin().getStringValue());
+ assertFalse(stringStats3.isEmpty());
+ assertEquals("ccc", stringStats3.getMax().getStringValue());
+ assertEquals("aaa", stringStats3.getMin().getStringValue());
assertEquals(0, stringStats3.getSum(), maxError);
- assertEquals("aaa", (String) stringStats3.getFirst().getStringValue());
+ assertEquals("aaa", stringStats3.getFirst().getStringValue());
assertEquals("ccc", stringStats3.getLast().getStringValue());
stringStats3.mergeStatistics(stringStats2);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java
index d59508e..d014f72 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java
@@ -42,8 +42,6 @@ public class SchemaBuilderTest {
SchemaBuilder builder = new SchemaBuilder();
Map<String, String> props = new HashMap<>();
- props.put("enum_values", "[\"MAN\",\"WOMAN\"]");
- props.clear();
props.put(JsonFormatConstant.MAX_POINT_NUMBER, "3");
builder.addSeries("s4", TSDataType.DOUBLE, TSEncoding.RLE, CompressionType.SNAPPY, props);
builder