Skip to content

Commit 7c5afa8

Browse files
bertrikbertrik
committed
Use static imports for junit 5.
1 parent dae6a55 commit 7c5afa8

File tree

17 files changed

+177
-141
lines changed

17 files changed

+177
-141
lines changed

‎cayenne/src/test/java/nl/sikken/bertrik/cayenne/CayenneMessageTest.java‎

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
package nl.sikken.bertrik.cayenne;
22

3-
import org.junit.jupiter.api.Assertions;
43
import org.junit.jupiter.api.Test;
54
import org.slf4j.Logger;
65
import org.slf4j.LoggerFactory;
76

87
import java.util.Base64;
98

9+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
10+
import static org.junit.jupiter.api.Assertions.assertEquals;
11+
import static org.junit.jupiter.api.Assertions.assertNotNull;
12+
import static org.junit.jupiter.api.Assertions.assertNull;
13+
import static org.junit.jupiter.api.Assertions.assertThrows;
14+
import static org.junit.jupiter.api.Assertions.assertTrue;
15+
1016
/**
1117
* Unit tests for CayenneMessage.
1218
*/
@@ -28,8 +34,8 @@ public void testTwoTemperatureSensors() throws CayenneException {
2834
payload.parse(data);
2935
LOG.info("payload: {}", payload);
3036

31-
Assertions.assertArrayEquals(new String[]{"27.2"}, payload.ofChannel(3).format());
32-
Assertions.assertArrayEquals(new String[]{"25.5"}, payload.ofChannel(5).format());
37+
assertArrayEquals(new String[]{"27.2"}, payload.ofChannel(3).format());
38+
assertArrayEquals(new String[]{"25.5"}, payload.ofChannel(5).format());
3339
}
3440

3541
/**
@@ -44,8 +50,8 @@ public void testTemperaturePlusAccel() throws CayenneException {
4450
CayenneMessage payload = new CayenneMessage();
4551
payload.parse(data);
4652

47-
Assertions.assertArrayEquals(new String[]{"-4.1"}, payload.ofChannel(1).format());
48-
Assertions.assertArrayEquals(new String[]{"1.234", "-1.234", "0.000"}, payload.ofChannel(6).format());
53+
assertArrayEquals(new String[]{"-4.1"}, payload.ofChannel(1).format());
54+
assertArrayEquals(new String[]{"1.234", "-1.234", "0.000"}, payload.ofChannel(6).format());
4955
}
5056

5157
/**
@@ -59,7 +65,7 @@ public void testGps() throws CayenneException {
5965
CayenneMessage payload = new CayenneMessage();
6066
payload.parse(data);
6167

62-
Assertions.assertArrayEquals(new String[]{"42.3519", "-87.9094", "10.00"}, payload.ofChannel(1).format());
68+
assertArrayEquals(new String[]{"42.3519", "-87.9094", "10.00"}, payload.ofChannel(1).format());
6369
}
6470

6571
/**
@@ -73,7 +79,7 @@ public void testHumidity() throws CayenneException {
7379
CayenneMessage payload = new CayenneMessage();
7480
payload.parse(data);
7581

76-
Assertions.assertArrayEquals(new String[]{"50.0"}, payload.ofChannel(1).format());
82+
assertArrayEquals(new String[]{"50.0"}, payload.ofChannel(1).format());
7783
}
7884

7985
/**
@@ -88,9 +94,9 @@ public void testActualData() throws CayenneException {
8894
CayenneMessage payload = new CayenneMessage();
8995
payload.parse(data);
9096

91-
Assertions.assertArrayEquals(new String[]{"52.0225", "4.6928", "-2.00"}, payload.ofChannel(1).format());
92-
Assertions.assertArrayEquals(new String[]{"247.84"}, payload.ofChannel(2).format());
93-
Assertions.assertArrayEquals(new String[]{"27.0"}, payload.ofChannel(3).format());
97+
assertArrayEquals(new String[]{"52.0225", "4.6928", "-2.00"}, payload.ofChannel(1).format());
98+
assertArrayEquals(new String[]{"247.84"}, payload.ofChannel(2).format());
99+
assertArrayEquals(new String[]{"27.0"}, payload.ofChannel(3).format());
94100
}
95101

96102
/**
@@ -107,22 +113,22 @@ public void testActualData2() throws CayenneException {
107113
payload.parse(data);
108114

109115
// verify we can get at the data by channel
110-
Assertions.assertArrayEquals(new String[]{"52.0225", "4.6925", "-17.00"}, payload.ofChannel(1).format());
111-
Assertions.assertArrayEquals(new String[]{"4.15"}, payload.ofChannel(2).format());
112-
Assertions.assertArrayEquals(new String[]{"24.0"}, payload.ofChannel(3).format());
116+
assertArrayEquals(new String[]{"52.0225", "4.6925", "-17.00"}, payload.ofChannel(1).format());
117+
assertArrayEquals(new String[]{"4.15"}, payload.ofChannel(2).format());
118+
assertArrayEquals(new String[]{"24.0"}, payload.ofChannel(3).format());
113119

114120
// verify we can also get data by type
115-
Assertions.assertArrayEquals(new String[]{"52.0225", "4.6925", "-17.00"},
121+
assertArrayEquals(new String[]{"52.0225", "4.6925", "-17.00"},
116122
payload.ofType(ECayenneItem.GPS_LOCATION).format());
117-
Assertions.assertArrayEquals(new String[]{"4.15"}, payload.ofType(ECayenneItem.ANALOG_INPUT).format());
118-
Assertions.assertArrayEquals(new String[]{"24.0"}, payload.ofType(ECayenneItem.TEMPERATURE).format());
123+
assertArrayEquals(new String[]{"4.15"}, payload.ofType(ECayenneItem.ANALOG_INPUT).format());
124+
assertArrayEquals(new String[]{"24.0"}, payload.ofType(ECayenneItem.TEMPERATURE).format());
119125

120126
// verify non-existing channel and type
121-
Assertions.assertNull(payload.ofChannel(0));
122-
Assertions.assertNull(payload.ofType(ECayenneItem.BAROMETER));
127+
assertNull(payload.ofChannel(0));
128+
assertNull(payload.ofType(ECayenneItem.BAROMETER));
123129

124130
// verify toString method
125-
Assertions.assertNotNull(payload.toString());
131+
assertNotNull(payload.toString());
126132
}
127133

128134
/**
@@ -134,31 +140,31 @@ public void testActualData2() throws CayenneException {
134140
public void testParseEmpty() throws CayenneException {
135141
CayenneMessage payload = new CayenneMessage();
136142
payload.parse(new byte[0]);
137-
Assertions.assertTrue(payload.getItems().isEmpty());
143+
assertTrue(payload.getItems().isEmpty());
138144
}
139145

140146
/**
141147
* Verifies parsing a short buffer
142148
*/
143149
@Test
144150
public void testShortBuffer() {
145-
Assertions.assertThrows(CayenneException.class, () -> new CayenneMessage().parse(new byte[]{0}));
151+
assertThrows(CayenneException.class, () -> new CayenneMessage().parse(new byte[]{0}));
146152
}
147153

148154
/**
149155
* Verifies parsing of a buffer containing a non-supported data type.
150156
*/
151157
@Test
152158
public void testInvalidType() {
153-
Assertions.assertThrows(CayenneException.class, () -> new CayenneMessage().parse(new byte[]{0, 100}));
159+
assertThrows(CayenneException.class, () -> new CayenneMessage().parse(new byte[]{0, 100}));
154160
}
155161

156162
/**
157163
* Verifies parsing of a buffer containing insufficient data during parsing.
158164
*/
159165
@Test
160166
public void testShortData() {
161-
Assertions.assertThrows(CayenneException.class, () ->
167+
assertThrows(CayenneException.class, () ->
162168
new CayenneMessage().parse(new byte[]{2, 1}));
163169
}
164170

@@ -176,7 +182,7 @@ public void encodeFloat() throws CayenneException {
176182

177183
CayenneMessage decoded = new CayenneMessage();
178184
decoded.parse(encoded);
179-
Assertions.assertEquals(-12.34, decoded.getItems().get(0).getValues()[0].doubleValue(), 0.01);
185+
assertEquals(-12.34, decoded.getItems().get(0).getValues()[0].doubleValue(), 0.01);
180186
}
181187

182188
/**
@@ -194,9 +200,9 @@ public void encodeHumidity() throws CayenneException {
194200
decoded.parse(encoded);
195201

196202
CayenneItem item = decoded.getItems().get(0);
197-
Assertions.assertEquals(ECayenneItem.HUMIDITY, item.getType());
198-
Assertions.assertEquals(35.5, item.getValues()[0].doubleValue(), 0.1);
199-
Assertions.assertEquals("35.5", item.format()[0]);
203+
assertEquals(ECayenneItem.HUMIDITY, item.getType());
204+
assertEquals(35.5, item.getValues()[0].doubleValue(), 0.1);
205+
assertEquals("35.5", item.format()[0]);
200206
}
201207

202208
/**
@@ -214,8 +220,8 @@ public void testDigitalInput() throws CayenneException {
214220
decoded.parse(encoded);
215221

216222
CayenneItem item = decoded.getItems().get(0);
217-
Assertions.assertEquals(ECayenneItem.DIGITAL_INPUT, item.getType());
218-
Assertions.assertEquals(1, item.getValues()[0].intValue());
223+
assertEquals(ECayenneItem.DIGITAL_INPUT, item.getType());
224+
assertEquals(1, item.getValues()[0].intValue());
219225
}
220226

221227
/**
@@ -231,9 +237,9 @@ public void testPresence() throws CayenneException {
231237
decoded.parse(encoded);
232238

233239
CayenneItem item = decoded.getItems().get(0);
234-
Assertions.assertEquals(ECayenneItem.PRESENCE, item.getType());
235-
Assertions.assertEquals(7, item.getValues()[0].intValue());
236-
Assertions.assertEquals("7", item.format()[0]);
240+
assertEquals(ECayenneItem.PRESENCE, item.getType());
241+
assertEquals(7, item.getValues()[0].intValue());
242+
assertEquals("7", item.format()[0]);
237243
}
238244

239245
/**
@@ -245,8 +251,8 @@ public void testPackedFormat() throws CayenneException {
245251
byte[] data = {0x67, 0x01, 0x10, 0x67, 0x00, (byte) 0xFF};
246252
message.parse(data);
247253

248-
Assertions.assertEquals(27.2, message.ofChannel(0).getValue().doubleValue(), 0.01);
249-
Assertions.assertEquals(25.5, message.ofChannel(1).getValue().doubleValue(), 0.01);
254+
assertEquals(27.2, message.ofChannel(0).getValue().doubleValue(), 0.01);
255+
assertEquals(25.5, message.ofChannel(1).getValue().doubleValue(), 0.01);
250256
}
251257

252258
}

‎cayenne/src/test/java/nl/sikken/bertrik/cayenne/CayennePayloadFormatTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
package nl.sikken.bertrik.cayenne;
22

3-
import org.junit.jupiter.api.Assertions;
43
import org.junit.jupiter.api.Test;
54

5+
import static org.junit.jupiter.api.Assertions.assertEquals;
6+
import static org.junit.jupiter.api.Assertions.assertNull;
7+
68
/**
79
* See https://community.mydevices.com/t/cayenne-lpp-2-0/7510
810
*/
911
public final class CayennePayloadFormatTest {
1012

1113
@Test
1214
public void testPort() {
13-
Assertions.assertNull(ECayennePayloadFormat.fromPort(0));
14-
Assertions.assertEquals(ECayennePayloadFormat.DYNAMIC_SENSOR_PAYLOAD, ECayennePayloadFormat.fromPort(1));
15-
Assertions.assertEquals(ECayennePayloadFormat.PACKED_SENSOR_PAYLOAD, ECayennePayloadFormat.fromPort(2));
15+
assertNull(ECayennePayloadFormat.fromPort(0));
16+
assertEquals(ECayennePayloadFormat.DYNAMIC_SENSOR_PAYLOAD, ECayennePayloadFormat.fromPort(1));
17+
assertEquals(ECayennePayloadFormat.PACKED_SENSOR_PAYLOAD, ECayennePayloadFormat.fromPort(2));
1618
}
1719

1820
}

‎cayenne/src/test/java/nl/sikken/bertrik/cayenne/SimpleCayenneTest.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package nl.sikken.bertrik.cayenne;
22

3-
import org.junit.jupiter.api.Assertions;
43
import org.junit.jupiter.api.Test;
54
import org.slf4j.Logger;
65
import org.slf4j.LoggerFactory;
76

7+
import static org.junit.jupiter.api.Assertions.assertEquals;
8+
import static org.junit.jupiter.api.Assertions.assertNotNull;
9+
import static org.junit.jupiter.api.Assertions.assertThrows;
10+
811
/**
912
* Unit test for SimpleCayenne.
1013
*/
@@ -37,18 +40,18 @@ public void testEncode() throws CayenneException {
3740

3841
// encode it
3942
byte[] data = cayenne.encode(500);
40-
Assertions.assertNotNull(data);
43+
assertNotNull(data);
4144

4245
// decode it
4346
CayenneMessage message = new CayenneMessage();
4447
message.parse(data);
45-
Assertions.assertEquals(12, message.getItems().size());
46-
Assertions.assertEquals(3.82, message.ofType(ECayenneItem.ANALOG_INPUT).getValue().doubleValue(), 0.01);
47-
Assertions.assertEquals(55, message.ofType(ECayenneItem.DIGITAL_INPUT).getValue().intValue());
48-
Assertions.assertEquals(66, message.ofType(ECayenneItem.DIGITAL_OUTPUT).getValue().intValue());
49-
Assertions.assertEquals(52.0, message.ofType(ECayenneItem.GPS_LOCATION).getValues()[0].doubleValue(), 0.1);
50-
Assertions.assertEquals(42, message.ofType(ECayenneItem.PRESENCE).getValue().intValue(), 42);
51-
Assertions.assertEquals(19.0, message.ofType(ECayenneItem.TEMPERATURE).getValue().doubleValue(), 0.1);
48+
assertEquals(12, message.getItems().size());
49+
assertEquals(3.82, message.ofType(ECayenneItem.ANALOG_INPUT).getValue().doubleValue(), 0.01);
50+
assertEquals(55, message.ofType(ECayenneItem.DIGITAL_INPUT).getValue().intValue());
51+
assertEquals(66, message.ofType(ECayenneItem.DIGITAL_OUTPUT).getValue().intValue());
52+
assertEquals(52.0, message.ofType(ECayenneItem.GPS_LOCATION).getValues()[0].doubleValue(), 0.1);
53+
assertEquals(42, message.ofType(ECayenneItem.PRESENCE).getValue().intValue(), 42);
54+
assertEquals(19.0, message.ofType(ECayenneItem.TEMPERATURE).getValue().doubleValue(), 0.1);
5255
}
5356

5457
/**
@@ -60,7 +63,7 @@ public void testEncode() throws CayenneException {
6063
public void testNonUniqueChannel() throws CayenneException {
6164
SimpleCayenne cayenne = new SimpleCayenne();
6265
cayenne.addTemperature(1, 19.0);
63-
Assertions.assertThrows(CayenneException.class, () ->
66+
assertThrows(CayenneException.class, () ->
6467
cayenne.addAnalogInput(1, 3.90));
6568
}
6669

‎cayenne/src/test/java/nl/sikken/bertrik/cayenne/formatter/GpsFormatterTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package nl.sikken.bertrik.cayenne.formatter;
22

3-
import org.junit.jupiter.api.Assertions;
43
import org.junit.jupiter.api.Test;
54

65
import java.nio.ByteBuffer;
76

7+
import static org.junit.jupiter.api.Assertions.assertEquals;
8+
89
public final class GpsFormatterTest {
910

1011
@Test
@@ -19,9 +20,9 @@ public void testEncodeDecode() {
1920
// decode
2021
bb.flip();
2122
Double[] parsed = formatter.parse(bb);
22-
Assertions.assertEquals(coords[0], parsed[0], 0.01);
23-
Assertions.assertEquals(coords[1], parsed[1], 0.01);
24-
Assertions.assertEquals(coords[2], parsed[2], 0.01);
23+
assertEquals(coords[0], parsed[0], 0.01);
24+
assertEquals(coords[1], parsed[1], 0.01);
25+
assertEquals(coords[2], parsed[2], 0.01);
2526
}
2627

2728
}

‎sensor-data-bridge/src/test/java/nl/bertriksikken/geo/SimpleGeoModelTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package nl.bertriksikken.geo;
22

3-
import org.junit.jupiter.api.Assertions;
43
import org.junit.jupiter.api.Test;
54

5+
import static org.junit.jupiter.api.Assertions.assertEquals;
6+
67
public final class SimpleGeoModelTest {
78

89
@Test
@@ -12,7 +13,7 @@ public void testDistance() {
1213
SimpleGeoModel model = new SimpleGeoModel();
1314
double d = model.distance(gouda, groningen);
1415

15-
Assertions.assertEquals(183557, d, 1);
16+
assertEquals(183557, d, 1);
1617
}
1718

1819
}

‎sensor-data-bridge/src/test/java/nl/bertriksikken/helium/HeliumUplinkMessageTest.java‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import nl.bertriksikken.helium.HeliumUplinkMessage.HotSpot;
5-
import org.junit.jupiter.api.Assertions;
65
import org.junit.jupiter.api.Test;
76

87
import java.io.IOException;
98
import java.io.InputStream;
109

10+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
11+
import static org.junit.jupiter.api.Assertions.assertEquals;
12+
import static org.junit.jupiter.api.Assertions.assertNotNull;
13+
1114
public class HeliumUplinkMessageTest {
1215

1316
@Test
@@ -16,23 +19,23 @@ public void testDecode() throws IOException {
1619
try (InputStream is = this.getClass().getResourceAsStream("/helium_uplink.json")) {
1720
ObjectMapper mapper = new ObjectMapper();
1821
HeliumUplinkMessage uplink = mapper.readValue(is, HeliumUplinkMessage.class);
19-
Assertions.assertNotNull(uplink);
22+
assertNotNull(uplink);
2023

21-
Assertions.assertEquals("6081F9D16837130E", uplink.appEui());
22-
Assertions.assertEquals("5A010048", uplink.devAddr());
23-
Assertions.assertEquals("0004A30B001F21FA", uplink.devEui());
24-
Assertions.assertEquals(0, uplink.fcnt());
25-
Assertions.assertEquals("kissmapper", uplink.name());
26-
Assertions.assertEquals(1, uplink.port());
27-
Assertions.assertEquals(1631457565832L, uplink.reportedAt());
28-
Assertions.assertArrayEquals(new byte[]{3}, uplink.payload());
24+
assertEquals("6081F9D16837130E", uplink.appEui());
25+
assertEquals("5A010048", uplink.devAddr());
26+
assertEquals("0004A30B001F21FA", uplink.devEui());
27+
assertEquals(0, uplink.fcnt());
28+
assertEquals("kissmapper", uplink.name());
29+
assertEquals(1, uplink.port());
30+
assertEquals(1631457565832L, uplink.reportedAt());
31+
assertArrayEquals(new byte[]{3}, uplink.payload());
2932

3033
HotSpot hotSpot = uplink.hotSpots().get(0);
31-
Assertions.assertEquals(52.01745, hotSpot.latitude(), 0.00001);
32-
Assertions.assertEquals(4.729876, hotSpot.longitude(), 0.00001);
33-
Assertions.assertEquals("melted-quartz-antelope", hotSpot.name());
34-
Assertions.assertEquals(-120, hotSpot.rssi(), 0.1);
35-
Assertions.assertEquals(-7.5, hotSpot.snr(), 0.1);
34+
assertEquals(52.01745, hotSpot.latitude(), 0.00001);
35+
assertEquals(4.729876, hotSpot.longitude(), 0.00001);
36+
assertEquals("melted-quartz-antelope", hotSpot.name());
37+
assertEquals(-120, hotSpot.rssi(), 0.1);
38+
assertEquals(-7.5, hotSpot.snr(), 0.1);
3639
}
3740

3841
}

0 commit comments

Comments
 (0)