amalka.subasinghe
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Update tests for entgra/carbon-device-mgt!374

See merge request entgra/carbon-device-mgt-plugins!110
revert-dabc3590
Charitha Goonetilleke 5 years ago
parent f41fce6d5e 5724c68561
commit dc0750abf1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/ExtensionTestCase.java
Unescape View File

@ -151,7 +151,7 @@ public class ExtensionTestCase extends BaseDeviceManagementTest {
DeviceConfigurationManager.getInstance().getDeviceManagementConfig().setDeviceCacheConfiguration(configuration); DeviceConfigurationManager.getInstance().getDeviceManagementConfig().setDeviceCacheConfiguration(configuration);
List<DeviceIdentifier> list = TestDataHolder.getDeviceIdentifiersList(DEVICE_TYPE); List<DeviceIdentifier> list = TestDataHolder.getDeviceIdentifiersList(DEVICE_TYPE);
DeviceGroup deviceGroup = groupManagementProviderService.getGroup(TestDataHolder.generateDummyGroupData(1).getName()); DeviceGroup deviceGroup = groupManagementProviderService.getGroup(TestDataHolder.generateDummyGroupData(1).getName(), false);
Assert.assertNotNull(deviceGroup); Assert.assertNotNull(deviceGroup);
groupManagementProviderService.addDevices(deviceGroup.getGroupId(), list); groupManagementProviderService.addDevices(deviceGroup.getGroupId(), list);
} }
@ -199,9 +199,9 @@ public class ExtensionTestCase extends BaseDeviceManagementTest {
executionPlanRuntime.start(); executionPlanRuntime.start();
DeviceIdentifier deviceIdentifier = TestDataHolder.getDeviceIdentifiersList(DEVICE_TYPE).get(0); DeviceIdentifier deviceIdentifier = TestDataHolder.getDeviceIdentifiersList(DEVICE_TYPE).get(0);
inputHandler.send(new Object[]{groupManagementProviderService.getGroup( inputHandler.send(new Object[]{groupManagementProviderService.getGroup(
TestDataHolder.generateDummyGroupData(1).getName()).getGroupId(), deviceIdentifier.getId(), deviceIdentifier.getType()}); TestDataHolder.generateDummyGroupData(1).getName(), false).getGroupId(), deviceIdentifier.getId(), deviceIdentifier.getType()});
inputHandler.send(new Object[]{groupManagementProviderService.getGroup( inputHandler.send(new Object[]{groupManagementProviderService.getGroup(
TestDataHolder.generateDummyGroupData(2).getName()).getGroupId(), deviceIdentifier.getId(), deviceIdentifier.getType()}); TestDataHolder.generateDummyGroupData(2).getName(), false).getGroupId(), deviceIdentifier.getId(), deviceIdentifier.getType()});
SiddhiTestHelper.waitForEvents(100, 1, count, 10000); SiddhiTestHelper.waitForEvents(100, 1, count, 10000);
Assert.assertTrue(eventArrived); Assert.assertTrue(eventArrived);
Assert.assertEquals(1, count.get()); Assert.assertEquals(1, count.get());

2
pom.xml
Unescape View File

@ -1242,7 +1242,7 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.devicemgt.version>4.1.2</carbon.devicemgt.version> <carbon.devicemgt.version>4.1.3-SNAPSHOT</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range> <carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range>
<!-- Carbon Device Management Plugins --> <!-- Carbon Device Management Plugins -->

Write Preview
Loading…
Cancel
Save