Skip to content

Commit 0c384bd

Browse files
majst01majst01
committed
Adoption of tests to changes related to value precision.
1 parent b70c1ad commit 0c384bd

File tree

2 files changed

+83
-80
lines changed

2 files changed

+83
-80
lines changed

‎src/test/java/org/influxdb/TicketTests.java‎

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
package org.influxdb;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
53
import java.io.IOException;
6-
import java.math.BigDecimal;
7-
import java.math.BigInteger;
84
import java.util.concurrent.TimeUnit;
9-
import java.util.concurrent.atomic.AtomicInteger;
10-
import java.util.concurrent.atomic.AtomicLong;
115
import java.util.logging.Level;
126
import java.util.logging.Logger;
137

@@ -148,76 +142,4 @@ public void testTicket40() {
148142
this.influxDB.deleteDatabase(dbName);
149143
}
150144

151-
/**
152-
* Test for ticket #44
153-
*/
154-
@Test(enabled = true)
155-
public void testTicket44() {
156-
Point point = Point.measurement("test").time(1, TimeUnit.MICROSECONDS).field("a", 1).build();
157-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1 1000");
158-
159-
point = Point.measurement("test").time(1, TimeUnit.MILLISECONDS).field("a", 1).build();
160-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1 1000000");
161-
162-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", 1).build();
163-
BatchPoints batchPoints = BatchPoints.database("db").point(point).build();
164-
assertThat(batchPoints.lineProtocol()).asString().isEqualTo("test a=1 1\n");
165-
166-
point = Point.measurement("test").time(1, TimeUnit.MICROSECONDS).field("a", 1).build();
167-
batchPoints = BatchPoints.database("db").point(point).build();
168-
assertThat(batchPoints.lineProtocol()).asString().isEqualTo("test a=1 1000\n");
169-
170-
point = Point.measurement("test").time(1, TimeUnit.MILLISECONDS).field("a", 1).build();
171-
batchPoints = BatchPoints.database("db").point(point).build();
172-
assertThat(batchPoints.lineProtocol()).asString().isEqualTo("test a=1 1000000\n");
173-
174-
point = Point.measurement("test").field("a", 1).time(1, TimeUnit.MILLISECONDS).build();
175-
batchPoints = BatchPoints.database("db").build();
176-
batchPoints = batchPoints.point(point);
177-
assertThat(batchPoints.lineProtocol()).asString().isEqualTo("test a=1 1000000\n");
178-
179-
}
180-
181-
@Test
182-
public void testTicket54() {
183-
Byte byteNumber = 100;
184-
Point point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", byteNumber).build();
185-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100 1");
186-
187-
int intNumber = 100000000;
188-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", intNumber).build();
189-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000 1");
190-
191-
Integer integerNumber = 100000000;
192-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", integerNumber).build();
193-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000 1");
194-
195-
AtomicInteger atomicIntegerNumber = new AtomicInteger(100000000);
196-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", atomicIntegerNumber).build();
197-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000 1");
198-
199-
Long longNumber = 1000000000000000000L;
200-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", longNumber).build();
201-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1000000000000000000 1");
202-
203-
AtomicLong atomicLongNumber = new AtomicLong(1000000000000000000L);
204-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", atomicLongNumber).build();
205-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1000000000000000000 1");
206-
207-
BigInteger bigIntegerNumber = BigInteger.valueOf(100000000);
208-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", bigIntegerNumber).build();
209-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000 1");
210-
211-
Double doubleNumber = Double.valueOf(100000000.0001);
212-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", doubleNumber).build();
213-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000.0001 1");
214-
215-
Float floatNumber = Float.valueOf(0.1f);
216-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", floatNumber).build();
217-
assertThat(point.lineProtocol()).asString().startsWith("test a=0.10");
218-
219-
BigDecimal bigDecimalNumber = BigDecimal.valueOf(100000000.00000001);
220-
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", bigDecimalNumber).build();
221-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000.00000001 1");
222-
}
223145
}

‎src/test/java/org/influxdb/dto/PointTest.java‎

Lines changed: 83 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
import org.testng.annotations.Test;
44
import static org.assertj.core.api.Assertions.*;
55

6+
import java.math.BigDecimal;
7+
import java.math.BigInteger;
68
import java.util.concurrent.TimeUnit;
9+
import java.util.concurrent.atomic.AtomicInteger;
10+
import java.util.concurrent.atomic.AtomicLong;
711

812
/**
913
* Test for the Point DTO.
@@ -22,10 +26,10 @@ public class PointTest {
2226
@Test
2327
public void lineProtocol() {
2428
Point point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", 1).build();
25-
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1 1");
29+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1.0 1");
2630

2731
point = Point.measurement("test,1").time(1, TimeUnit.NANOSECONDS).field("a", 1).build();
28-
assertThat(point.lineProtocol()).asString().isEqualTo("test\\,1 a=1 1");
32+
assertThat(point.lineProtocol()).asString().isEqualTo("test\\,1 a=1.0 1");
2933

3034
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", "A").build();
3135
assertThat(point.lineProtocol()).asString().isEqualTo("test a=\"A\" 1");
@@ -48,4 +52,81 @@ public void lineProtocol() {
4852
assertThat(point.lineProtocol()).asString().isEqualTo("test a=\"A\\\"B\",b=\"D E \\\"F\" 1");
4953

5054
}
55+
56+
/**
57+
* Test for ticket #44
58+
*/
59+
@Test(enabled = true)
60+
public void testTicket44() {
61+
Point point = Point.measurement("test").time(1, TimeUnit.MICROSECONDS).field("a", 1).build();
62+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1.0 1000");
63+
64+
point = Point.measurement("test").time(1, TimeUnit.MILLISECONDS).field("a", 1).build();
65+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1.0 1000000");
66+
67+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", 1).build();
68+
BatchPoints batchPoints = BatchPoints.database("db").point(point).build();
69+
assertThat(batchPoints.lineProtocol()).asString().isEqualTo("test a=1.0 1\n");
70+
71+
point = Point.measurement("test").time(1, TimeUnit.MICROSECONDS).field("a", 1).build();
72+
batchPoints = BatchPoints.database("db").point(point).build();
73+
assertThat(batchPoints.lineProtocol()).asString().isEqualTo("test a=1.0 1000\n");
74+
75+
point = Point.measurement("test").time(1, TimeUnit.MILLISECONDS).field("a", 1).build();
76+
batchPoints = BatchPoints.database("db").point(point).build();
77+
assertThat(batchPoints.lineProtocol()).asString().isEqualTo("test a=1.0 1000000\n");
78+
79+
point = Point.measurement("test").field("a", 1).time(1, TimeUnit.MILLISECONDS).build();
80+
batchPoints = BatchPoints.database("db").build();
81+
batchPoints = batchPoints.point(point);
82+
assertThat(batchPoints.lineProtocol()).asString().isEqualTo("test a=1.0 1000000\n");
83+
84+
}
85+
86+
/**
87+
* Test for ticket #54
88+
*/
89+
@Test
90+
public void testTicket54() {
91+
Byte byteNumber = 100;
92+
Point point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", byteNumber).build();
93+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100.0 1");
94+
95+
int intNumber = 100000000;
96+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", intNumber).build();
97+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000.0 1");
98+
99+
Integer integerNumber = 100000000;
100+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", integerNumber).build();
101+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000.0 1");
102+
103+
AtomicInteger atomicIntegerNumber = new AtomicInteger(100000000);
104+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", atomicIntegerNumber).build();
105+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000.0 1");
106+
107+
Long longNumber = 1000000000000000000L;
108+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", longNumber).build();
109+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1000000000000000000.0 1");
110+
111+
AtomicLong atomicLongNumber = new AtomicLong(1000000000000000000L);
112+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", atomicLongNumber).build();
113+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=1000000000000000000.0 1");
114+
115+
BigInteger bigIntegerNumber = BigInteger.valueOf(100000000);
116+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", bigIntegerNumber).build();
117+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000.0 1");
118+
119+
Double doubleNumber = Double.valueOf(100000000.0001);
120+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", doubleNumber).build();
121+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000.0001 1");
122+
123+
Float floatNumber = Float.valueOf(0.1f);
124+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", floatNumber).build();
125+
assertThat(point.lineProtocol()).asString().startsWith("test a=0.10");
126+
127+
BigDecimal bigDecimalNumber = BigDecimal.valueOf(100000000.00000001);
128+
point = Point.measurement("test").time(1, TimeUnit.NANOSECONDS).field("a", bigDecimalNumber).build();
129+
assertThat(point.lineProtocol()).asString().isEqualTo("test a=100000000.00000001 1");
130+
}
131+
51132
}

0 commit comments

Comments
 (0)