Adding more operation management testcases.

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java

@@ -741,7 +741,11 @@ public class OperationManagerImpl implements OperationManager {
         if (operationId == 0) {
             throw new IllegalArgumentException("Operation ID cannot be null or zero (0).");
         }
-
+        if (!isActionAuthorized(deviceId)) {
+            throw new OperationManagementException("User '" + getUser() + "' is not authorized to access the '" +
+                    deviceId.getType() + "' device, which carries the identifier '" +
+                    deviceId.getId() + "'");
+        }
         Device device = this.getDevice(deviceId);
         try {
             OperationManagementDAOFactory.openConnection();

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/operation/OperationManagementTests.java

@@ -63,7 +63,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.TimeZone;
 
 /**
  * This is the testcase which covers the methods from {@link OperationManager}
@@ -84,6 +83,7 @@ public class OperationManagementTests {
     private List<DeviceIdentifier> deviceIds = new ArrayList<>();
     private OperationManager operationMgtService;
     private Activity commandActivity;
+    private long commandActivityBeforeUpdatedTimestamp;
 
     @BeforeClass
     public void init() throws Exception {
@@ -149,15 +149,19 @@ public class OperationManagementTests {
     @Test
     public void addNonAdminUserDevicesCommandOperation() throws DeviceManagementException, OperationManagementException,
             InvalidDeviceException {
-        PrivilegedCarbonContext.startTenantFlow();
+        startTenantFlowAsNonAdmin();
-        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID, true);
-        PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(NON_ADMIN_USER);
         Activity activity = this.operationMgtService.addOperation(getOperation(new CommandOperation(), Operation.Type.COMMAND, COMMAND_OPERATON_CODE),
                 deviceIds);
         PrivilegedCarbonContext.endTenantFlow();
         validateOperationResponse(activity, ActivityStatus.Status.UNAUTHORIZED);
     }
 
+    private void startTenantFlowAsNonAdmin() {
+        PrivilegedCarbonContext.startTenantFlow();
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID, true);
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(NON_ADMIN_USER);
+    }
+
     @Test(dependsOnMethods = "addCommandOperation")
     public void addPolicyOperation() throws DeviceManagementException, OperationManagementException, InvalidDeviceException {
         Activity activity = this.operationMgtService.addOperation(getOperation(new PolicyOperation(), Operation.Type.POLICY, POLICY_OPERATION_CODE),
@@ -203,6 +207,18 @@ public class OperationManagementTests {
         }
     }
 
+    @Test(dependsOnMethods = "addProfileOperation", expectedExceptions = OperationManagementException.class)
+    public void getOperationsAsNonAdmin() throws DeviceManagementException, OperationManagementException, InvalidDeviceException {
+        try {
+            startTenantFlowAsNonAdmin();
+            for (DeviceIdentifier deviceIdentifier : deviceIds) {
+                this.operationMgtService.getOperations(deviceIdentifier);
+            }
+        } finally {
+            PrivilegedCarbonContext.endTenantFlow();
+        }
+    }
+
     @Test(dependsOnMethods = "getOperations")
     public void getPendingOperations() throws DeviceManagementException, OperationManagementException, InvalidDeviceException {
         for (DeviceIdentifier deviceIdentifier : deviceIds) {
@@ -211,6 +227,18 @@ public class OperationManagementTests {
         }
     }
 
+    @Test(dependsOnMethods = "getOperations", expectedExceptions = OperationManagementException.class)
+    public void getPendingOperationsAsNonAdmin() throws DeviceManagementException, OperationManagementException, InvalidDeviceException {
+        try {
+            startTenantFlowAsNonAdmin();
+            for (DeviceIdentifier deviceIdentifier : deviceIds) {
+                this.operationMgtService.getPendingOperations(deviceIdentifier);
+            }
+        } finally {
+            PrivilegedCarbonContext.endTenantFlow();
+        }
+    }
+
     @Test(dependsOnMethods = "getPendingOperations")
     public void getPaginatedRequestAsAdmin() throws OperationManagementException {
         PrivilegedCarbonContext.startTenantFlow();
@@ -228,11 +256,10 @@ public class OperationManagementTests {
         PrivilegedCarbonContext.endTenantFlow();
     }
 
-    @Test(dependsOnMethods = "getPendingOperations")
+    @Test(dependsOnMethods = "getPendingOperations", expectedExceptions = OperationManagementException.class)
     public void getPaginatedRequestAsNonAdmin() throws OperationManagementException {
-        PrivilegedCarbonContext.startTenantFlow();
+        try {
-        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID, true);
+            startTenantFlowAsNonAdmin();
-        PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(NON_ADMIN_USER);
             PaginationRequest request = new PaginationRequest(1, 2);
             request.setDeviceType(DEVICE_TYPE);
             request.setOwner(ADMIN_USER);
@@ -243,14 +270,18 @@ public class OperationManagementTests {
                     if (ex.getMessage() == null) {
                         Assert.assertTrue(ex.getMessage().contains("User '" + NON_ADMIN_USER + "' is not authorized"));
                     }
+                    throw ex;
                 }
             }
+        } finally {
             PrivilegedCarbonContext.endTenantFlow();
         }
+    }
 
     @Test(dependsOnMethods = "getPaginatedRequestAsAdmin")
     public void updateOperation() throws OperationManagementException {
         //This is required to introduce a delay for the update operation of the device.
+        this.commandActivityBeforeUpdatedTimestamp = System.currentTimeMillis();
         try {
             Thread.sleep(2000);
         } catch (InterruptedException ignored) {
@@ -266,6 +297,30 @@ public class OperationManagementTests {
         Assert.assertEquals(pendingOperations.size(), 3);
     }
 
+    @Test(dependsOnMethods = "updateOperation", expectedExceptions = OperationManagementException.class)
+    public void updateOperationAsNonAdmin() throws OperationManagementException {
+        //This is required to introduce a delay for the update operation of the device.
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException ignored) {
+        }
+        try {
+            DeviceIdentifier deviceIdentifier = this.deviceIds.get(0);
+            List operations = this.operationMgtService.getPendingOperations(deviceIdentifier);
+            Assert.assertTrue(operations != null && operations.size() == 3);
+            startTenantFlowAsNonAdmin();
+            Operation operation = (Operation) operations.get(0);
+            operation.setStatus(Operation.Status.COMPLETED);
+            operation.setOperationResponse("The operation is successfully completed, and updated by non admin!");
+            this.operationMgtService.updateOperation(deviceIdentifier, operation);
+            List pendingOperations = this.operationMgtService.getPendingOperations(deviceIdentifier);
+            Assert.assertEquals(pendingOperations.size(), 3);
+        } finally {
+            PrivilegedCarbonContext.endTenantFlow();
+        }
+
+    }
+
     @Test(dependsOnMethods = "updateOperation")
     public void getNextPendingOperation() throws OperationManagementException {
         DeviceIdentifier deviceIdentifier = this.deviceIds.get(0);
@@ -284,6 +339,20 @@ public class OperationManagementTests {
         Assert.assertTrue(operation.getType().equals(Operation.Type.COMMAND));
     }
 
+    @Test(dependsOnMethods = "getNextPendingOperation", expectedExceptions = OperationManagementException.class)
+    public void getOperationByDeviceAndOperationIdNonAdmin() throws OperationManagementException {
+        startTenantFlowAsNonAdmin();
+        try {
+            DeviceIdentifier deviceIdentifier = this.deviceIds.get(0);
+            String operationId = this.commandActivity.getActivityId().
+                    replace(DeviceManagementConstants.OperationAttributes.ACTIVITY, "");
+            this.operationMgtService.getOperationByDeviceAndOperationId(deviceIdentifier,
+                    Integer.parseInt(operationId));
+        } finally {
+            PrivilegedCarbonContext.endTenantFlow();
+        }
+    }
+
     @Test(dependsOnMethods = "getOperationByDeviceAndOperationId")
     public void getOperationsByDeviceAndStatus() throws OperationManagementException, DeviceManagementException {
         DeviceIdentifier deviceIdentifier = this.deviceIds.get(0);
@@ -291,6 +360,17 @@ public class OperationManagementTests {
         Assert.assertEquals(operation.size(), 3);
     }
 
+    @Test(dependsOnMethods = "getOperationByDeviceAndOperationId", expectedExceptions = OperationManagementException.class)
+    public void getOperationsByDeviceAndStatusByNonAdmin() throws OperationManagementException, DeviceManagementException {
+        startTenantFlowAsNonAdmin();
+        try {
+            DeviceIdentifier deviceIdentifier = this.deviceIds.get(0);
+            this.operationMgtService.getOperationsByDeviceAndStatus(deviceIdentifier, Operation.Status.PENDING);
+        } finally {
+            PrivilegedCarbonContext.endTenantFlow();
+        }
+    }
+
     @Test(dependsOnMethods = "getOperationsByDeviceAndStatus")
     public void getOperation() throws OperationManagementException, DeviceManagementException {
         String operationId = this.commandActivity.getActivityId().
@@ -319,13 +399,21 @@ public class OperationManagementTests {
         Assert.assertEquals(activity.getActivityStatus().get(0).getStatus(), ActivityStatus.Status.COMPLETED);
     }
 
+    @Test(dependsOnMethods = "getOperationActivity", expectedExceptions = OperationManagementException.class)
+    public void getOperationByActivityIdAndDeviceAsNonAdmin() throws OperationManagementException {
+        startTenantFlowAsNonAdmin();
+        try {
+            this.operationMgtService.
+                    getOperationByActivityIdAndDevice(this.commandActivity.getActivityId(), this.deviceIds.get(0));
+        } finally {
+            PrivilegedCarbonContext.endTenantFlow();
+        }
+    }
+
     @Test(dependsOnMethods = "updateOperation")
-    public void getOperationUpdatedAfterWithLimitAndOffet() throws OperationManagementException, ParseException {
+    public void getOperationUpdatedAfterWithLimitAndOffset() throws OperationManagementException, ParseException {
-        String timestamp = this.commandActivity.getCreatedTimeStamp();
+        List<Activity> operations = this.operationMgtService.getActivitiesUpdatedAfter
-        SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM dd hh:mm:ss Z yyyy");
+                (this.commandActivityBeforeUpdatedTimestamp / 1000, 10, 0);
-        dateFormat.setTimeZone(TimeZone.getTimeZone("IST"));
-        Date date = dateFormat.parse(timestamp);
-        List<Activity> operations = this.operationMgtService.getActivitiesUpdatedAfter(date.getTime() / 1000, 10, 0);
         Assert.assertTrue(operations != null && operations.size() == 1,
                 "The operations updated after the created should be 1");
         Activity operation = operations.get(0);
@@ -338,12 +426,9 @@ public class OperationManagementTests {
     }
 
     @Test(dependsOnMethods = "updateOperation")
-    public void getOperationUpdatedAfter() throws OperationManagementException, ParseException {
+    public void getActivitiesUpdatedAfter() throws OperationManagementException, ParseException {
-        String timestamp = this.commandActivity.getCreatedTimeStamp();
+        List<Activity> operations = this.operationMgtService.getActivitiesUpdatedAfter
-        SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM dd hh:mm:ss Z yyyy");
+                (this.commandActivityBeforeUpdatedTimestamp / 1000);
-        dateFormat.setTimeZone(TimeZone.getTimeZone("IST"));
-        Date date = dateFormat.parse(timestamp);
-        List<Activity> operations = this.operationMgtService.getActivitiesUpdatedAfter(date.getTime() / 1000);
         Assert.assertTrue(operations != null && operations.size() == 1,
                 "The operations updated after the created should be 1");
         Activity operation = operations.get(0);
@@ -355,13 +440,10 @@ public class OperationManagementTests {
                 deviceIds.get(0).getType());
     }
 
-    @Test(dependsOnMethods = "getOperationUpdatedAfter")
+    @Test(dependsOnMethods = "getActivitiesUpdatedAfter")
     public void getActivityCountUpdatedAfter() throws OperationManagementException, ParseException {
-        String timestamp = this.commandActivity.getCreatedTimeStamp();
+        int activityCount = this.operationMgtService.getActivityCountUpdatedAfter
-        SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM dd hh:mm:ss Z yyyy");
+                (this.commandActivityBeforeUpdatedTimestamp / 1000);
-        dateFormat.setTimeZone(TimeZone.getTimeZone("IST"));
-        Date date = dateFormat.parse(timestamp);
-        int activityCount = this.operationMgtService.getActivityCountUpdatedAfter(date.getTime() / 1000);
         Assert.assertTrue(activityCount == 1,
                 "The activities updated after the created should be 1");
     }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/operation/PushNotificationTests.java

@@ -0,0 +1,100 @@
+/*
+*  Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*  WSO2 Inc. licenses this file to you under the Apache License,
+*  Version 2.0 (the "License"); you may not use this file except
+*  in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*    http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*/
+package org.wso2.carbon.device.mgt.core.operation;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import org.wso2.carbon.device.mgt.common.operation.mgt.ActivityStatus;
+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.OperationManager;
+import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
+import org.wso2.carbon.device.mgt.core.TestDeviceManagementService;
+import org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl;
+import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
+import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
+import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
+import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
+import org.wso2.carbon.device.mgt.core.operation.mgt.OperationManagerImpl;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
+import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderServiceImpl;
+import org.wso2.carbon.registry.core.config.RegistryContext;
+import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import org.wso2.carbon.registry.core.internal.RegistryDataHolder;
+import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService;
+import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.user.core.service.RealmService;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PushNotificationTests {
+    private static final String DEVICE_TYPE = "OP_TEST_TYPE";
+    private static final String DEVICE_ID_PREFIX = "OP-TEST-DEVICE-ID-";
+    private static final String COMMAND_OPERATON_CODE = "COMMAND-TEST";
+    private static final String POLICY_OPERATION_CODE = "POLICY-TEST";
+    private static final String CONFIG_OPERATION_CODE = "CONFIG-TEST";
+    private static final String PROFILE_OPERATION_CODE = "PROFILE-TEST";
+    private static final String DATE_FORMAT_NOW = "yyyy-MM-dd HH:mm:ss";
+    private static final int NO_OF_DEVICES = 5;
+    private static final String ADMIN_USER = "admin";
+    private static final String NON_ADMIN_USER = "test";
+
+    private List<DeviceIdentifier> deviceIds = new ArrayList<>();
+    private OperationManager operationMgtService;
+    private Activity commandActivity;
+
+    @BeforeClass
+    public void init() throws Exception {
+        DeviceConfigurationManager.getInstance().initConfig();
+        for (int i = 0; i < NO_OF_DEVICES; i++) {
+            deviceIds.add(new DeviceIdentifier(DEVICE_ID_PREFIX + i, DEVICE_TYPE));
+        }
+        List<Device> devices = TestDataHolder.generateDummyDeviceData(this.deviceIds);
+        DeviceManagementProviderService deviceMgtService = new DeviceManagementProviderServiceImpl();
+        deviceMgtService.registerDeviceType(new TestDeviceManagementService(DEVICE_TYPE,
+                MultitenantConstants.SUPER_TENANT_DOMAIN_NAME));
+        for (Device device : devices) {
+            deviceMgtService.enrollDevice(device);
+        }
+        List<Device> returnedDevices = deviceMgtService.getAllDevices(DEVICE_TYPE);
+        for (Device device : returnedDevices) {
+            if (!device.getDeviceIdentifier().startsWith(DEVICE_ID_PREFIX)) {
+                throw new Exception("Incorrect device with ID - " + device.getDeviceIdentifier() + " returned!");
+            }
+        }
+        NotificationStrategy notificationStrategy = new TestNotificationStrategy();
+        this.operationMgtService = new OperationManagerImpl(DEVICE_TYPE, notificationStrategy);
+    }
+
+//    @Test
+//    public void addPushNotificationOperation() throws DeviceManagementException, OperationManagementException, InvalidDeviceException {
+//        this.commandActivity = this.operationMgtService.addOperation(getOperation(new CommandOperation(), Operation.Type.COMMAND, COMMAND_OPERATON_CODE),
+//                this.deviceIds);
+//        validateOperationResponse(this.commandActivity, ActivityStatus.Status.PENDING);
+//    }
+}