community
/
device-mgt-plugins
10
0
Fork 39
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix android web app deploying issue

Browse Source
merge-requests/126/head
lasanthaDLPDS 5 years ago
parent a04338e09e
commit 47e569fa08
13 changed files with 157 additions and 60 deletions
Show Stats Download Patch File Download Diff File

4
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.addons/pom.xml
Unescape View File

@ -93,5 +93,9 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>org.wso2.carbon.logging</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.common/src/main/java/org/wso2/carbon/device/mgt/mobile/android/common/exception/AndroidAgentException.java → components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.addons/src/main/java/org/wso2/carbon/device/mgt/mobile/android/addons/AndroidAgentException.java
Unescape View File

@ -15,7 +15,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.mobile.android.common.exception; package org.wso2.carbon.device.mgt.mobile.android.addons;
/** /**
* *

4
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.common/src/main/java/org/wso2/carbon/device/mgt/mobile/android/common/ErrorHandler.java → components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.addons/src/main/java/org/wso2/carbon/device/mgt/mobile/android/addons/ErrorHandler.java
Unescape View File

@ -15,9 +15,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.mobile.android.common; package org.wso2.carbon.device.mgt.mobile.android.addons;
import org.wso2.carbon.device.mgt.mobile.android.common.exception.AndroidAgentException;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.common/src/main/java/org/wso2/carbon/device/mgt/mobile/android/common/ErrorMessage.java → components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.addons/src/main/java/org/wso2/carbon/device/mgt/mobile/android/addons/ErrorMessage.java
Unescape View File

@ -15,7 +15,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.mobile.android.common; package org.wso2.carbon.device.mgt.mobile.android.addons;
public class ErrorMessage { public class ErrorMessage {

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.common/src/main/java/org/wso2/carbon/device/mgt/mobile/android/common/GsonMessageBodyHandler.java → components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.addons/src/main/java/org/wso2/carbon/device/mgt/mobile/android/addons/GsonMessageBodyHandler.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.mobile.android.common; package org.wso2.carbon.device.mgt.mobile.android.addons;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;

92
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
Unescape View File

@ -90,6 +90,28 @@
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId> <artifactId>cxf-rt-frontend-jaxws</artifactId>
<exclusions>
<exclusion>
<artifactId>asm</artifactId>
<groupId>asm</groupId>
</exclusion>
<exclusion>
<artifactId>neethi</artifactId>
<groupId>org.apache.neethi</groupId>
</exclusion>
<exclusion>
<artifactId>wsdl4j</artifactId>
<groupId>wsdl4j</groupId>
</exclusion>
<exclusion>
<artifactId>xml-resolver</artifactId>
<groupId>xml-resolver</groupId>
</exclusion>
<exclusion>
<artifactId>xmlschema-core</artifactId>
<groupId>org.apache.ws.xmlschema</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
@ -108,6 +130,12 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>commons-lang</artifactId>
<groupId>commons-lang.wso2</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -130,6 +158,12 @@
<groupId>commons-httpclient.wso2</groupId> <groupId>commons-httpclient.wso2</groupId>
<artifactId>commons-httpclient</artifactId> <artifactId>commons-httpclient</artifactId>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
@ -144,12 +178,26 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>neethi</artifactId>
<groupId>org.wso2.orbit.org.apache.neethi</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics</groupId> <groupId>org.wso2.carbon.analytics</groupId>
<artifactId>org.wso2.carbon.analytics.api</artifactId> <artifactId>org.wso2.carbon.analytics.api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>asm</artifactId>
<groupId>org.ow2.asm</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
@ -183,21 +231,31 @@
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId> <artifactId>javax.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core-asl</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-androidenterprise</artifactId>
<version>v1-rev186-1.25.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.application.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.application.mgt.common</artifactId>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>neethi</artifactId>
<groupId>org.apache.neethi.wso2</groupId>
</exclusion>
<exclusion>
<artifactId>wsdl4j</artifactId>
<groupId>wsdl4j.wso2</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
@ -212,7 +270,6 @@
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.android.addons</artifactId> <artifactId>org.wso2.carbon.device.mgt.mobile.android.addons</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -227,6 +284,29 @@
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId> <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>axis2-client</artifactId>
<groupId>org.apache.axis2.wso2</groupId>
</exclusion>
<exclusion>
<artifactId>neethi</artifactId>
<groupId>org.wso2.orbit.org.apache.neethi</groupId>
</exclusion>
<exclusion>
<artifactId>wsdl4j</artifactId>
<groupId>wsdl4j.wso2</groupId>
</exclusion>
<exclusion>
<artifactId>XmlSchema</artifactId>
<groupId>org.apache.ws.commons.schema.wso2</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

3
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/device/mgt/mobile/android/api/DeviceTypeConfigurationAPI.java
Unescape View File

@ -34,7 +34,6 @@ import org.wso2.carbon.apimgt.annotations.api.Scopes;
import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
import org.wso2.carbon.device.mgt.mobile.android.common.AndroidConstants; import org.wso2.carbon.device.mgt.mobile.android.common.AndroidConstants;
import org.wso2.carbon.device.mgt.mobile.android.common.bean.AndroidPlatformConfiguration; import org.wso2.carbon.device.mgt.mobile.android.common.bean.AndroidPlatformConfiguration;
import org.wso2.carbon.device.mgt.mobile.android.common.exception.AndroidAgentException;
import javax.validation.Valid; import javax.validation.Valid;
import javax.ws.rs.*; import javax.ws.rs.*;
@ -245,6 +244,6 @@ public interface DeviceTypeConfigurationAPI {
value = "Checks if the requested variant was modified, since the specified date-time.\n" + value = "Checks if the requested variant was modified, since the specified date-time.\n" +
"Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" + "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
"Example: Mon, 05 Jan 2014 15:10:00 +0200.") "Example: Mon, 05 Jan 2014 15:10:00 +0200.")
@HeaderParam("If-Modified-Since") String ifModifiedSince) throws AndroidAgentException; @HeaderParam("If-Modified-Since") String ifModifiedSince);
} }

4
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml
Unescape View File

@ -65,8 +65,8 @@
<bean id="eventReceiverService" class="org.wso2.carbon.device.mgt.mobile.android.api.impl.EventReceiverAPIImpl"/> <bean id="eventReceiverService" class="org.wso2.carbon.device.mgt.mobile.android.api.impl.EventReceiverAPIImpl"/>
<bean id="deviceTypeConfigurationService" class="org.wso2.carbon.device.mgt.mobile.android.api.impl.DeviceTypeConfigurationAPIImpl"/> <bean id="deviceTypeConfigurationService" class="org.wso2.carbon.device.mgt.mobile.android.api.impl.DeviceTypeConfigurationAPIImpl"/>
<bean id="androidEnterprise" class="org.wso2.carbon.device.mgt.mobile.android.api.impl.AndroidEnterpriseAPIImpl"/> <bean id="androidEnterprise" class="org.wso2.carbon.device.mgt.mobile.android.api.impl.AndroidEnterpriseAPIImpl"/>
<bean id="jsonProvider" class="org.wso2.carbon.device.mgt.mobile.android.common.GsonMessageBodyHandler"/> <bean id="jsonProvider" class="org.wso2.carbon.device.mgt.mobile.android.addons.GsonMessageBodyHandler"/>
<bean id="errorHandler" class="org.wso2.carbon.device.mgt.mobile.android.common.ErrorHandler"/> <bean id="errorHandler" class="org.wso2.carbon.device.mgt.mobile.android.addons.ErrorHandler"/>
<cxf:bus> <cxf:bus>
<cxf:inInterceptors> <cxf:inInterceptors>
<ref bean="ValidationInterceptor"/> <ref bean="ValidationInterceptor"/>

5
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.core/pom.xml
Unescape View File

@ -162,11 +162,6 @@
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.android.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.mobile.android.common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.android.common</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.application.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.application.mgt.common</artifactId>

4
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.core/src/main/java/org/wso2/carbon/device/mgt/mobile/android/core/impl/AndroidServiceImpl.java
Unescape View File

@ -22,7 +22,6 @@ import com.google.api.services.androidenterprise.model.ProductsListResponse;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpStatus;
import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException; import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException;
import org.wso2.carbon.base.ServerConfiguration; import org.wso2.carbon.base.ServerConfiguration;
import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.CarbonContext;
@ -36,7 +35,6 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
import org.wso2.carbon.device.mgt.common.license.mgt.License; import org.wso2.carbon.device.mgt.common.license.mgt.License;
import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException; import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException;
@ -66,7 +64,6 @@ import org.wso2.carbon.device.mgt.mobile.android.core.util.AndroidEnterpriseUtil
import org.wso2.carbon.policy.mgt.common.PolicyManagementException; import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
import org.wso2.carbon.policy.mgt.core.PolicyManagerService; import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.io.IOException; import java.io.IOException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
@ -87,7 +84,6 @@ public class AndroidServiceImpl implements AndroidService {
private static final String OPERATION_ERROR_STATUS = "ERROR"; private static final String OPERATION_ERROR_STATUS = "ERROR";
public static final String GOOGLE_AFW_EMM_ANDROID_ID = "googleEMMAndroidId"; public static final String GOOGLE_AFW_EMM_ANDROID_ID = "googleEMMAndroidId";
public static final String GOOGLE_AFW_DEVICE_ID = "googleEMMDeviceId"; public static final String GOOGLE_AFW_DEVICE_ID = "googleEMMDeviceId";
private static final String EVENT_STREAM_DEFINITION = "org.wso2.iot.LocationStream"; private static final String EVENT_STREAM_DEFINITION = "org.wso2.iot.LocationStream";
@Override @Override

86
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.core/src/test/java/org/wso2/carbon/device/mgt/mobile/android/core/DeviceManagementAdminServiceTests.java
Unescape View File

@ -32,6 +32,7 @@ import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
import org.wso2.carbon.device.mgt.common.operation.mgt.Activity; import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
import org.wso2.carbon.device.mgt.mobile.android.common.exception.AndroidDeviceMgtPluginException;
import org.wso2.carbon.device.mgt.mobile.android.core.impl.AndroidServiceImpl; import org.wso2.carbon.device.mgt.mobile.android.core.impl.AndroidServiceImpl;
import org.wso2.carbon.device.mgt.mobile.android.core.mokcs.DeviceManagementProviderServiceMock; import org.wso2.carbon.device.mgt.mobile.android.core.mokcs.DeviceManagementProviderServiceMock;
import org.wso2.carbon.device.mgt.mobile.android.core.mokcs.utils.TestUtils; import org.wso2.carbon.device.mgt.mobile.android.core.mokcs.utils.TestUtils;
@ -60,7 +61,7 @@ public class DeviceManagementAdminServiceTests {
} }
@Test @Test
public void testConfigureDeviceLock() throws OperationManagementException { public void testConfigureDeviceLock() throws OperationManagementException, AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.configureDeviceLock(TestUtils.getDeviceLockBeanWrapper()); Activity activity = androidService.configureDeviceLock(TestUtils.getDeviceLockBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -69,7 +70,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testConfigureDeviceUnlock() public void testConfigureDeviceUnlock()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.configureDeviceUnlock(TestUtils.getDeviceIds()); Activity activity = androidService.configureDeviceUnlock(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -78,7 +80,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testGetDeviceLocation() public void testGetDeviceLocation()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.getDeviceLocation(TestUtils.getDeviceIds()); Activity activity = androidService.getDeviceLocation(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -87,7 +90,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testRemovePassword() public void testRemovePassword()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.removePassword(TestUtils.getDeviceIds()); Activity activity = androidService.removePassword(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -96,7 +100,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testConfigureCamera() public void testConfigureCamera()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.configureCamera(TestUtils.getCamerabeanWrapper()); Activity activity = androidService.configureCamera(TestUtils.getCamerabeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -105,7 +110,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testGetDeviceInformation() public void testGetDeviceInformation()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.getDeviceInformation(TestUtils.getDeviceIds()); Activity activity = androidService.getDeviceInformation(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -114,7 +120,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testGetDeviceLogcat() public void testGetDeviceLogcat()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.getDeviceLogcat(TestUtils.getDeviceIds()); Activity activity = androidService.getDeviceLogcat(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -122,8 +129,8 @@ public class DeviceManagementAdminServiceTests {
} }
@Test @Test
public void testWipeDevice() public void testWipeDevice() throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.wipeDevice(TestUtils.getDeviceIds()); Activity activity = androidService.wipeDevice(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -131,8 +138,8 @@ public class DeviceManagementAdminServiceTests {
} }
@Test @Test
public void testWipeData() public void testWipeData() throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.wipeData(TestUtils.getWipeDataBeanWrapper()); Activity activity = androidService.wipeData(TestUtils.getWipeDataBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -141,7 +148,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testGetApplications() public void testGetApplications()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.getApplications(TestUtils.getDeviceIds()); Activity activity = androidService.getApplications(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -149,8 +157,8 @@ public class DeviceManagementAdminServiceTests {
} }
@Test @Test
public void testRingDevice() public void testRingDevice() throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.ringDevice(TestUtils.getDeviceIds()); Activity activity = androidService.ringDevice(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -159,7 +167,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testRebootDevice() public void testRebootDevice()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.rebootDevice(TestUtils.getDeviceIds()); Activity activity = androidService.rebootDevice(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -168,7 +177,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testChangeLockTask() public void testChangeLockTask()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.changeLockTask(TestUtils.getDeviceIds()); Activity activity = androidService.changeLockTask(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -176,8 +186,8 @@ public class DeviceManagementAdminServiceTests {
} }
@Test @Test
public void testMuteDevice() public void testMuteDevice() throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.muteDevice(TestUtils.getDeviceIds()); Activity activity = androidService.muteDevice(TestUtils.getDeviceIds());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -186,7 +196,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testInstallApplication() public void testInstallApplication()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService Activity activity = androidService
.installApplication(TestUtils.getApplicationInstallationBeanWrapper()); .installApplication(TestUtils.getApplicationInstallationBeanWrapper());
@ -196,7 +207,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testUpdateApplication() public void testUpdateApplication()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.updateApplication(TestUtils.getApplicationUpdateBeanWrapper()); Activity activity = androidService.updateApplication(TestUtils.getApplicationUpdateBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -205,7 +217,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testUninstallApplicationPublic() public void testUninstallApplicationPublic()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService Activity activity = androidService
.uninstallApplication(TestUtils.getApplicationUninstallationBeanWrapperPublic()); .uninstallApplication(TestUtils.getApplicationUninstallationBeanWrapperPublic());
@ -215,7 +228,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testUninstallApplicationWebApp() public void testUninstallApplicationWebApp()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService Activity activity = androidService
.uninstallApplication(TestUtils.getApplicationUninstallationBeanWrapperWebApp()); .uninstallApplication(TestUtils.getApplicationUninstallationBeanWrapperWebApp());
@ -225,7 +239,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testBlacklistApplications() public void testBlacklistApplications()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService Activity activity = androidService
.blacklistApplications(TestUtils.getBlacklistApplicationsBeanWrapper()); .blacklistApplications(TestUtils.getBlacklistApplicationsBeanWrapper());
@ -235,7 +250,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testUpgradeFirmware() public void testUpgradeFirmware()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.upgradeFirmware(TestUtils.getUpgradeFirmwareBeanWrapper()); Activity activity = androidService.upgradeFirmware(TestUtils.getUpgradeFirmwareBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -244,7 +260,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testConfigureVPN() public void testConfigureVPN()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.configureVPN(TestUtils.getVpnBeanWrapper()); Activity activity = androidService.configureVPN(TestUtils.getVpnBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -253,7 +270,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testSendNotification() public void testSendNotification()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.sendNotification(TestUtils.getNotificationBeanWrapper()); Activity activity = androidService.sendNotification(TestUtils.getNotificationBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -262,7 +280,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testConfigureWifi() public void testConfigureWifi()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.configureWifi(TestUtils.getWifiBeanWrapper()); Activity activity = androidService.configureWifi(TestUtils.getWifiBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -271,7 +290,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testEncryptStorage() public void testEncryptStorage()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.encryptStorage(TestUtils.getEncryptionBeanWrapper()); Activity activity = androidService.encryptStorage(TestUtils.getEncryptionBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -280,7 +300,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testChangeLockCode() public void testChangeLockCode()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.changeLockCode(TestUtils.getLockCodeBeanWrapper()); Activity activity = androidService.changeLockCode(TestUtils.getLockCodeBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -289,7 +310,8 @@ public class DeviceManagementAdminServiceTests {
@Test @Test
public void testSetPasswordPolicy() public void testSetPasswordPolicy()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.setPasswordPolicy(TestUtils.getPasswordPolicyBeanWrapper()); Activity activity = androidService.setPasswordPolicy(TestUtils.getPasswordPolicyBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);
@ -297,8 +319,8 @@ public class DeviceManagementAdminServiceTests {
} }
@Test @Test
public void testSetWebClip() public void testSetWebClip() throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
Activity activity = androidService.setWebClip(TestUtils.getWebClipBeanWrapper()); Activity activity = androidService.setWebClip(TestUtils.getWebClipBeanWrapper());
Assert.assertNotNull(activity); Assert.assertNotNull(activity);

7
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.core/src/test/java/org/wso2/carbon/device/mgt/mobile/android/core/DeviceManagementServiceTests.java
Unescape View File

@ -36,6 +36,7 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
import org.wso2.carbon.device.mgt.mobile.android.common.Message; import org.wso2.carbon.device.mgt.mobile.android.common.Message;
import org.wso2.carbon.device.mgt.mobile.android.common.bean.wrapper.AndroidDevice; import org.wso2.carbon.device.mgt.mobile.android.common.bean.wrapper.AndroidDevice;
import org.wso2.carbon.device.mgt.mobile.android.common.exception.AndroidDeviceMgtPluginException;
import org.wso2.carbon.device.mgt.mobile.android.core.impl.AndroidServiceImpl; import org.wso2.carbon.device.mgt.mobile.android.core.impl.AndroidServiceImpl;
import org.wso2.carbon.device.mgt.mobile.android.core.mokcs.ApplicationManagementProviderServiceMock; import org.wso2.carbon.device.mgt.mobile.android.core.mokcs.ApplicationManagementProviderServiceMock;
import org.wso2.carbon.device.mgt.mobile.android.core.mokcs.DeviceInformationManagerServiceMock; import org.wso2.carbon.device.mgt.mobile.android.core.mokcs.DeviceInformationManagerServiceMock;
@ -289,7 +290,8 @@ public class DeviceManagementServiceTests {
@Test @Test
public void testModifyEnrollmentSuccess() public void testModifyEnrollmentSuccess()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
mockUser(); mockUser();
boolean status = androidService.modifyEnrollment(TestUtils.getDeviceId(), TestUtils.getBasicAndroidDevice()); boolean status = androidService.modifyEnrollment(TestUtils.getDeviceId(), TestUtils.getBasicAndroidDevice());
@ -298,7 +300,8 @@ public class DeviceManagementServiceTests {
@Test @Test
public void testModifyEnrollmentUnSuccess() public void testModifyEnrollmentUnSuccess()
throws DeviceManagementException, OperationManagementException, InvalidDeviceException { throws DeviceManagementException, OperationManagementException, InvalidDeviceException,
AndroidDeviceMgtPluginException {
mockDeviceManagementService(); mockDeviceManagementService();
mockUser(); mockUser();
AndroidDevice androidDevice = TestUtils.getBasicAndroidDevice(); AndroidDevice androidDevice = TestUtils.getBasicAndroidDevice();

2
pom.xml
Unescape View File

@ -1360,7 +1360,7 @@
<!--websocket related lib versions--> <!--websocket related lib versions-->
<tomcat.websocket.version>7.0.85</tomcat.websocket.version> <tomcat.websocket.version>7.0.85</tomcat.websocket.version>
<javax.websocket.version>1.0</javax.websocket.version> <javax.websocket.version>1.0</javax.websocket.version>
<javax.version>2.0</javax.version> <javax.version>2.0.1</javax.version>
<!-- Release plugin ID for github--> <!-- Release plugin ID for github-->
<project.scm.id>github-scm</project.scm.id> <project.scm.id>github-scm</project.scm.id>

Write Preview
Loading…
Cancel
Save