Browse Source

Removed unnecessary method

pull/5038/head
Volodymyr Babak 5 years ago
parent
commit
f0f387e710
  1. 7
      application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java

7
application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java

@ -1354,7 +1354,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
Awaitility.await() Awaitility.await()
.atMost(2, TimeUnit.SECONDS) .atMost(2, TimeUnit.SECONDS)
.until(() -> isTimeseriesAlreadyAvailable(device, timeseriesKey)); .until(() -> loadDeviceTimeseries(device, timeseriesKey).containsKey(timeseriesKey));
Map<String, List<Map<String, String>>> timeseries = loadDeviceTimeseries(device, timeseriesKey); Map<String, List<Map<String, String>>> timeseries = loadDeviceTimeseries(device, timeseriesKey);
Assert.assertTrue(timeseries.containsKey(timeseriesKey)); Assert.assertTrue(timeseries.containsKey(timeseriesKey));
@ -1365,11 +1365,6 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
Assert.assertEquals(1, attributes.size()); Assert.assertEquals(1, attributes.size());
Assert.assertEquals(attributes.get(0).get("key"), attributesKey); Assert.assertEquals(attributes.get(0).get("key"), attributesKey);
Assert.assertEquals(attributes.get(0).get("value"), attributesValue); Assert.assertEquals(attributes.get(0).get("value"), attributesValue);
}
private boolean isTimeseriesAlreadyAvailable(Device device, String timeseriesKey) throws Exception {
return loadDeviceTimeseries(device, timeseriesKey).containsKey(timeseriesKey);
} }
private Map<String, List<Map<String, String>>> loadDeviceTimeseries(Device device, String timeseriesKey) throws Exception { private Map<String, List<Map<String, String>>> loadDeviceTimeseries(Device device, String timeseriesKey) throws Exception {

Loading…
Cancel
Save