Showing
1 changed file
with
1 additions
and
6 deletions
| @@ -1354,7 +1354,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { | @@ -1354,7 +1354,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { | ||
| 1354 | 1354 | ||
| 1355 | Awaitility.await() | 1355 | Awaitility.await() |
| 1356 | .atMost(2, TimeUnit.SECONDS) | 1356 | .atMost(2, TimeUnit.SECONDS) |
| 1357 | - .until(() -> isTimeseriesAlreadyAvailable(device, timeseriesKey)); | 1357 | + .until(() -> loadDeviceTimeseries(device, timeseriesKey).containsKey(timeseriesKey)); |
| 1358 | 1358 | ||
| 1359 | Map<String, List<Map<String, String>>> timeseries = loadDeviceTimeseries(device, timeseriesKey); | 1359 | Map<String, List<Map<String, String>>> timeseries = loadDeviceTimeseries(device, timeseriesKey); |
| 1360 | Assert.assertTrue(timeseries.containsKey(timeseriesKey)); | 1360 | Assert.assertTrue(timeseries.containsKey(timeseriesKey)); |
| @@ -1365,11 +1365,6 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { | @@ -1365,11 +1365,6 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { | ||
| 1365 | Assert.assertEquals(1, attributes.size()); | 1365 | Assert.assertEquals(1, attributes.size()); |
| 1366 | Assert.assertEquals(attributes.get(0).get("key"), attributesKey); | 1366 | Assert.assertEquals(attributes.get(0).get("key"), attributesKey); |
| 1367 | Assert.assertEquals(attributes.get(0).get("value"), attributesValue); | 1367 | Assert.assertEquals(attributes.get(0).get("value"), attributesValue); |
| 1368 | - | ||
| 1369 | - } | ||
| 1370 | - | ||
| 1371 | - private boolean isTimeseriesAlreadyAvailable(Device device, String timeseriesKey) throws Exception { | ||
| 1372 | - return loadDeviceTimeseries(device, timeseriesKey).containsKey(timeseriesKey); | ||
| 1373 | } | 1368 | } |
| 1374 | 1369 | ||
| 1375 | private Map<String, List<Map<String, String>>> loadDeviceTimeseries(Device device, String timeseriesKey) throws Exception { | 1370 | private Map<String, List<Map<String, String>>> loadDeviceTimeseries(Device device, String timeseriesKey) throws Exception { |