Commit 0bc4252f976582d378bdbc9a6c700ee928a11c4a

Authored by Andrew Shvayka
1 parent 89e9d27b

Fixed unit tests after TTL feature

... ... @@ -239,7 +239,7 @@ public class DefaultActorServiceTest {
239 239 List<TsKvEntry> expected = new ArrayList<>();
240 240 expected.add(new BasicTsKvEntry(ts, entry1));
241 241 expected.add(new BasicTsKvEntry(ts, entry2));
242   - verify(tsService, Mockito.timeout(5000)).save(deviceId, expected);
  242 + verify(tsService, Mockito.timeout(5000)).save(deviceId, expected, 0L);
243 243 }
244 244
245 245 }
... ...
... ... @@ -103,7 +103,7 @@ public class RuleControllerTest extends AbstractControllerTest {
103 103 "\"name\":\"TelemetryFilter\", " +
104 104 "\"configuration\": {\"messageTypes\":[\"POST_TELEMETRY\",\"POST_ATTRIBUTES\",\"GET_ATTRIBUTES\"]}}]"));
105 105 doPost("/api/rule", rule).andExpect(status().isBadRequest());
106   - rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{}}"));
  106 + rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{\"timeUnit\":\"DAYS\", \"ttlValue\":1}}"));
107 107
108 108 RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class);
109 109 Assert.assertNotNull(savedRule);
... ... @@ -240,7 +240,8 @@ public class RuleControllerTest extends AbstractControllerTest {
240 240 rule.setFilters(mapper.readTree("[{\"clazz\":\"org.thingsboard.server.extensions.core.filter.MsgTypeFilter\", " +
241 241 "\"name\":\"TelemetryFilter\", " +
242 242 "\"configuration\": {\"messageTypes\":[\"POST_TELEMETRY\",\"POST_ATTRIBUTES\",\"GET_ATTRIBUTES\"]}}]"));
243   - rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{}}"));
  243 + rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", " +
  244 + "\"configuration\":{\"timeUnit\":\"DAYS\", \"ttlValue\":1}}"));
244 245 return rule;
245 246 }
246 247 }
... ...