From f0f387e7102041a90d139c4762dc1f1aa1c0afc0 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Sun, 1 Aug 2021 22:25:52 +0300 Subject: [PATCH] Removed unnecessary method --- .../java/org/thingsboard/server/edge/BaseEdgeTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java index 0da275adeb..37d8b58f28 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java @@ -1354,7 +1354,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { Awaitility.await() .atMost(2, TimeUnit.SECONDS) - .until(() -> isTimeseriesAlreadyAvailable(device, timeseriesKey)); + .until(() -> loadDeviceTimeseries(device, timeseriesKey).containsKey(timeseriesKey)); Map>> timeseries = loadDeviceTimeseries(device, timeseriesKey); Assert.assertTrue(timeseries.containsKey(timeseriesKey)); @@ -1365,11 +1365,6 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { Assert.assertEquals(1, attributes.size()); Assert.assertEquals(attributes.get(0).get("key"), attributesKey); 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>> loadDeviceTimeseries(Device device, String timeseriesKey) throws Exception {