简柏林 / thingskit · Commits

Commit 0e9f8e91bc9b6e8fac9e7ce6a8b4350a9359c487

Authored by Volodymyr Babak
1 parent dbbb8e3a

Refactored expected msg count

Inline Side-by-side
Showing 1 changed file with 28 additions and 14 deletions
@@ -189,46 +189,60 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { @@ -189,46 +189,60 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
189 @Test 189 @Test
190 public void test() throws Exception { 190 public void test() throws Exception {
191 testReceivedInitialData(); 191 testReceivedInitialData();
192 - Assert.assertEquals(10, edgeImitator.getDownlinkMsgs().size()); 192 + int expectedDownlinkSize = 10;
  193 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
193 194
194 testDevices(); 195 testDevices();
195 - Assert.assertEquals(14, edgeImitator.getDownlinkMsgs().size()); 196 + expectedDownlinkSize = expectedDownlinkSize + 4;
  197 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
196 198
197 testAssets(); 199 testAssets();
198 - Assert.assertEquals(18, edgeImitator.getDownlinkMsgs().size()); 200 + expectedDownlinkSize = expectedDownlinkSize + 4;
  201 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
199 202
200 testRuleChains(); 203 testRuleChains();
201 - Assert.assertEquals(21, edgeImitator.getDownlinkMsgs().size()); 204 + expectedDownlinkSize = expectedDownlinkSize + 3;
  205 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
202 206
203 testDashboards(); 207 testDashboards();
204 - Assert.assertEquals(24, edgeImitator.getDownlinkMsgs().size()); 208 + expectedDownlinkSize = expectedDownlinkSize + 3;
  209 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
205 210
206 testRelations(); 211 testRelations();
207 - Assert.assertEquals(26, edgeImitator.getDownlinkMsgs().size()); 212 + expectedDownlinkSize = expectedDownlinkSize + 2;
  213 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
208 214
209 testAlarms(); 215 testAlarms();
210 - Assert.assertEquals(29, edgeImitator.getDownlinkMsgs().size()); 216 + expectedDownlinkSize = expectedDownlinkSize + 3;
  217 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
211 218
212 testEntityView(); 219 testEntityView();
213 - Assert.assertEquals(31, edgeImitator.getDownlinkMsgs().size()); 220 + expectedDownlinkSize = expectedDownlinkSize + 2;
  221 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
214 222
215 testCustomer(); 223 testCustomer();
216 - Assert.assertEquals(33, edgeImitator.getDownlinkMsgs().size()); 224 + expectedDownlinkSize = expectedDownlinkSize + 2;
  225 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
217 226
218 testWidgetsBundleAndWidgetType(); 227 testWidgetsBundleAndWidgetType();
219 - Assert.assertEquals(37, edgeImitator.getDownlinkMsgs().size()); 228 + expectedDownlinkSize = expectedDownlinkSize + 4;
  229 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
220 230
221 testTimeseries(); 231 testTimeseries();
222 - Assert.assertEquals(38, edgeImitator.getDownlinkMsgs().size()); 232 + expectedDownlinkSize = expectedDownlinkSize + 1;
  233 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
223 234
224 testAttributes(); 235 testAttributes();
225 - Assert.assertEquals(41, edgeImitator.getDownlinkMsgs().size()); 236 + expectedDownlinkSize = expectedDownlinkSize + 3;
  237 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
226 238
227 testSendMessagesToCloud(); 239 testSendMessagesToCloud();
228 - Assert.assertEquals(50, edgeImitator.getDownlinkMsgs().size()); 240 + expectedDownlinkSize = expectedDownlinkSize + 9;
  241 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
229 242
230 testRpcCall(); 243 testRpcCall();
231 - Assert.assertEquals(51, edgeImitator.getDownlinkMsgs().size()); 244 + expectedDownlinkSize = expectedDownlinkSize + 1;
  245 + Assert.assertEquals(expectedDownlinkSize, edgeImitator.getDownlinkMsgs().size());
232 } 246 }
233 247
234 private Device findDeviceByName(String deviceName) throws Exception { 248 private Device findDeviceByName(String deviceName) throws Exception {