From 1eb2e54ae85fafa46d66af74d1d5a811efb4320b Mon Sep 17 00:00:00 2001 From: charitha Date: Mon, 30 Oct 2017 11:15:20 +0530 Subject: [PATCH] Resolve test failures and issues after merging with upstream --- .../mgt/jaxrs/service/impl/util/DeviceMgtAPITestHelper.java | 4 ---- .../resources/carbon-home/repository/conf/cdm-config.xml | 6 +++--- .../org.wso2.carbon.device.mgt.basics.feature/pom.xml | 3 +-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/DeviceMgtAPITestHelper.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/DeviceMgtAPITestHelper.java index 5fa279b6a0..f1f0d1628d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/DeviceMgtAPITestHelper.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/DeviceMgtAPITestHelper.java @@ -19,7 +19,6 @@ package org.wso2.carbon.device.mgt.jaxrs.service.impl.util; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; -import org.wso2.carbon.device.mgt.common.Feature; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypeMetaDefinition; @@ -37,7 +36,6 @@ public class DeviceMgtAPITestHelper { private static final String DEVICE_TYPE_DESCRIPTION = "Dummy Description"; public static final String DEVICE_TYPE = "TEST_DEVICE_TYPE"; public static final String DEVICE_NAME = "TEST_DEVICE"; - public static final String DEVICE_IDENTIFIER = "12345"; public final static String OWNER = "admin"; /** @@ -110,8 +108,6 @@ public class DeviceMgtAPITestHelper { public static DeviceInfo generateDeviceInfo() { DeviceInfo deviceInfo = new DeviceInfo(); - deviceInfo.setIMEI("IMEI-12345"); - deviceInfo.setIMSI("IMSI-12344"); deviceInfo.setDeviceModel("DUMMY_MODEL"); deviceInfo.setVendor("WSO2"); deviceInfo.setOsVersion("OREO"); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml index 9097a645cb..ff6b302002 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -87,10 +87,10 @@ false 86400 - + false - false - + false + BYOD,COPE diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml index 5f072d95d5..4f44e1cdc7 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml @@ -23,14 +23,13 @@ org.wso2.carbon.devicemgt device-mgt-feature - 3.0.136-SNAPSHOT + 3.0.170-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.basics.feature pom - 3.0.136-SNAPSHOT WSO2 Carbon - Device Management Basics Feature http://wso2.org This feature contains the core bundles required for Basic Device Management functionality