From 0bc4252f976582d378bdbc9a6c700ee928a11c4a Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Sun, 11 Jun 2017 09:01:36 +0300 Subject: [PATCH] Fixed unit tests after TTL feature --- .../thingsboard/server/actors/DefaultActorServiceTest.java | 2 +- .../thingsboard/server/controller/RuleControllerTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/actors/DefaultActorServiceTest.java b/application/src/test/java/org/thingsboard/server/actors/DefaultActorServiceTest.java index 857e0835e3..5e12cda16d 100644 --- a/application/src/test/java/org/thingsboard/server/actors/DefaultActorServiceTest.java +++ b/application/src/test/java/org/thingsboard/server/actors/DefaultActorServiceTest.java @@ -239,7 +239,7 @@ public class DefaultActorServiceTest { List expected = new ArrayList<>(); expected.add(new BasicTsKvEntry(ts, entry1)); expected.add(new BasicTsKvEntry(ts, entry2)); - verify(tsService, Mockito.timeout(5000)).save(deviceId, expected); + verify(tsService, Mockito.timeout(5000)).save(deviceId, expected, 0L); } } diff --git a/application/src/test/java/org/thingsboard/server/controller/RuleControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RuleControllerTest.java index 80c8f433f4..8a52216e99 100644 --- a/application/src/test/java/org/thingsboard/server/controller/RuleControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/RuleControllerTest.java @@ -103,7 +103,7 @@ public class RuleControllerTest extends AbstractControllerTest { "\"name\":\"TelemetryFilter\", " + "\"configuration\": {\"messageTypes\":[\"POST_TELEMETRY\",\"POST_ATTRIBUTES\",\"GET_ATTRIBUTES\"]}}]")); doPost("/api/rule", rule).andExpect(status().isBadRequest()); - rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{}}")); + rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{\"timeUnit\":\"DAYS\", \"ttlValue\":1}}")); RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class); Assert.assertNotNull(savedRule); @@ -240,7 +240,8 @@ public class RuleControllerTest extends AbstractControllerTest { rule.setFilters(mapper.readTree("[{\"clazz\":\"org.thingsboard.server.extensions.core.filter.MsgTypeFilter\", " + "\"name\":\"TelemetryFilter\", " + "\"configuration\": {\"messageTypes\":[\"POST_TELEMETRY\",\"POST_ATTRIBUTES\",\"GET_ATTRIBUTES\"]}}]")); - rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{}}")); + rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", " + + "\"configuration\":{\"timeUnit\":\"DAYS\", \"ttlValue\":1}}")); return rule; } }