Commit 90e4ff61259521aacf80103622a085b1ceacad25

Authored by Igor Kulikov
1 parent 20df02ed

Fixed tests.

@@ -155,7 +155,7 @@ public class TbAlarmNodeTest { @@ -155,7 +155,7 @@ public class TbAlarmNodeTest {
155 verify(ctx).createJsScriptEngine("DETAILS"); 155 verify(ctx).createJsScriptEngine("DETAILS");
156 verify(ctx, times(1)).getJsExecutor(); 156 verify(ctx, times(1)).getJsExecutor();
157 verify(ctx).getAlarmService(); 157 verify(ctx).getAlarmService();
158 - verify(ctx, times(2)).getDbCallbackExecutor(); 158 + verify(ctx, times(3)).getDbCallbackExecutor();
159 verify(ctx).getTenantId(); 159 verify(ctx).getTenantId();
160 verify(alarmService).findLatestByOriginatorAndType(tenantId, originator, "SomeType"); 160 verify(alarmService).findLatestByOriginatorAndType(tenantId, originator, "SomeType");
161 161
@@ -18,11 +18,14 @@ package org.thingsboard.rule.engine.transform; @@ -18,11 +18,14 @@ package org.thingsboard.rule.engine.transform;
18 import com.datastax.driver.core.utils.UUIDs; 18 import com.datastax.driver.core.utils.UUIDs;
19 import com.fasterxml.jackson.databind.ObjectMapper; 19 import com.fasterxml.jackson.databind.ObjectMapper;
20 import com.google.common.util.concurrent.Futures; 20 import com.google.common.util.concurrent.Futures;
  21 +import com.google.common.util.concurrent.ListenableFuture;
  22 +import org.junit.Before;
21 import org.junit.Test; 23 import org.junit.Test;
22 import org.junit.runner.RunWith; 24 import org.junit.runner.RunWith;
23 import org.mockito.ArgumentCaptor; 25 import org.mockito.ArgumentCaptor;
24 import org.mockito.Mock; 26 import org.mockito.Mock;
25 import org.mockito.runners.MockitoJUnitRunner; 27 import org.mockito.runners.MockitoJUnitRunner;
  28 +import org.thingsboard.rule.engine.api.ListeningExecutor;
26 import org.thingsboard.rule.engine.api.TbContext; 29 import org.thingsboard.rule.engine.api.TbContext;
27 import org.thingsboard.rule.engine.api.TbNodeConfiguration; 30 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
28 import org.thingsboard.rule.engine.api.TbNodeException; 31 import org.thingsboard.rule.engine.api.TbNodeException;
@@ -36,6 +39,8 @@ import org.thingsboard.server.common.msg.TbMsg; @@ -36,6 +39,8 @@ import org.thingsboard.server.common.msg.TbMsg;
36 import org.thingsboard.server.common.msg.TbMsgMetaData; 39 import org.thingsboard.server.common.msg.TbMsgMetaData;
37 import org.thingsboard.server.dao.asset.AssetService; 40 import org.thingsboard.server.dao.asset.AssetService;
38 41
  42 +import java.util.concurrent.Callable;
  43 +
39 import static org.junit.Assert.assertEquals; 44 import static org.junit.Assert.assertEquals;
40 import static org.mockito.Matchers.same; 45 import static org.mockito.Matchers.same;
41 import static org.mockito.Mockito.verify; 46 import static org.mockito.Mockito.verify;
@@ -52,6 +57,26 @@ public class TbChangeOriginatorNodeTest { @@ -52,6 +57,26 @@ public class TbChangeOriginatorNodeTest {
52 @Mock 57 @Mock
53 private AssetService assetService; 58 private AssetService assetService;
54 59
  60 + private ListeningExecutor dbExecutor;
  61 +
  62 + @Before
  63 + public void before() {
  64 + dbExecutor = new ListeningExecutor() {
  65 + @Override
  66 + public <T> ListenableFuture<T> executeAsync(Callable<T> task) {
  67 + try {
  68 + return Futures.immediateFuture(task.call());
  69 + } catch (Exception e) {
  70 + throw new RuntimeException(e);
  71 + }
  72 + }
  73 +
  74 + @Override
  75 + public void execute(Runnable command) {
  76 + command.run();
  77 + }
  78 + };
  79 + }
55 80
56 @Test 81 @Test
57 public void originatorCanBeChangedToCustomerId() throws TbNodeException { 82 public void originatorCanBeChangedToCustomerId() throws TbNodeException {
@@ -134,6 +159,8 @@ public class TbChangeOriginatorNodeTest { @@ -134,6 +159,8 @@ public class TbChangeOriginatorNodeTest {
134 ObjectMapper mapper = new ObjectMapper(); 159 ObjectMapper mapper = new ObjectMapper();
135 TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); 160 TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config));
136 161
  162 + when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
  163 +
137 node = new TbChangeOriginatorNode(); 164 node = new TbChangeOriginatorNode();
138 node.init(null, nodeConfiguration); 165 node.init(null, nodeConfiguration);
139 } 166 }