Adding negative tests to device type manager

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java

@@ -130,6 +130,17 @@ public class DeviceTypeManager implements DeviceManager {
             //Check whether device dao definition exist.
             String tableName = deviceTypeConfiguration.getDeviceDetails().getTableId();
             if (tableName != null && !tableName.isEmpty()) {
+                DataSource dataSource = deviceTypeConfiguration.getDataSource();
+                if (dataSource == null) {
+                    throw new DeviceTypeDeployerPayloadException("Could not find the datasource related with the "
+                            + "table id " +  tableName + " for the device type " + deviceType);
+                }
+                TableConfig tableConfig = dataSource.getTableConfig();
+
+                if (tableConfig == null) {
+                    throw new DeviceTypeDeployerPayloadException("Could not find the table config with the "
+                            + "table id " +  tableName + " for the device type " + deviceType);
+                }
                 List<Table> tables = deviceTypeConfiguration.getDataSource().getTableConfig().getTable();
                 Table deviceDefinitionTable = null;
                 for (Table table : tables) {

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/exception/DeviceTypeDeployerPayloadException.java

@@ -26,20 +26,9 @@ public class DeviceTypeDeployerPayloadException extends RuntimeException {
         super(msg, nestedEx);
     }
 
-    public DeviceTypeDeployerPayloadException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
     public DeviceTypeDeployerPayloadException(String msg) {
         super(msg);
     }
 
-    public DeviceTypeDeployerPayloadException() {
-        super();
-    }
-
-    public DeviceTypeDeployerPayloadException(Throwable cause) {
-        super(cause);
-    }
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/exception/DeviceTypeMgtPluginException.java

@@ -26,20 +26,4 @@ public class DeviceTypeMgtPluginException extends Exception{
         super(msg, nestedEx);
     }
 
-    public DeviceTypeMgtPluginException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public DeviceTypeMgtPluginException(String msg) {
-        super(msg);
-    }
-
-    public DeviceTypeMgtPluginException() {
-        super();
-    }
-
-    public DeviceTypeMgtPluginException(Throwable cause) {
-        super(cause);
-    }
-
 }

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/template/BaseExtensionsTest.java

@@ -51,7 +51,7 @@ public class BaseExtensionsTest {
     @BeforeSuite
     public void init() throws RegistryException, IOException {
         ClassLoader classLoader = getClass().getClassLoader();
-        URL resourceUrl = classLoader.getResource("license.rxt");
+        URL resourceUrl = classLoader.getResource("device-types/license.rxt");
         String rxt = null;
         File carbonHome;
         if (resourceUrl != null) {

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManagerNegativeTest.java

@@ -0,0 +1,124 @@
+/*
+ * 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.extensions.device.type.template;
+
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import org.wso2.carbon.base.MultitenantConstants;
+import org.wso2.carbon.device.mgt.extensions.device.type.template.config.DataSource;
+import org.wso2.carbon.device.mgt.extensions.device.type.template.config.DeviceTypeConfiguration;
+import org.wso2.carbon.device.mgt.extensions.device.type.template.config.exception.DeviceTypeConfigurationException;
+import org.wso2.carbon.device.mgt.extensions.device.type.template.exception.DeviceTypeDeployerPayloadException;
+import org.wso2.carbon.device.mgt.extensions.utils.Utils;
+import org.xml.sax.SAXException;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * This class tests the negative scenarios in {@link DeviceTypeManager} initialization;
+ */
+public class DeviceTypeManagerNegativeTest {
+    private DeviceTypeConfiguration defectiveDeviceTypeConfiguration1;
+    private DeviceTypeConfiguration defectiveDeviceTypeConfiguration2;
+    private DeviceTypeConfiguration androidDeviceTypeConfiguration;
+    private DeviceTypeConfigIdentifier deviceTypeConfigIdentifier;
+    private final String DEFECTIVE_DEVICE_TYPE = "defectiveDeviceType";
+    private final String TABLE_NAME = "DEFECTIVE_DEVICE";
+
+    @BeforeTest
+    public void setup()
+            throws SAXException, JAXBException, ParserConfigurationException, DeviceTypeConfigurationException,
+            IOException {
+        ClassLoader classLoader = getClass().getClassLoader();
+        URL resourceUrl = classLoader.getResource("device-types/defective-devicetype.xml");
+        File configurationFile = null;
+        if (resourceUrl != null) {
+            configurationFile = new File(resourceUrl.getFile());
+        }
+        if (configurationFile != null) {
+            defectiveDeviceTypeConfiguration1 = Utils.getDeviceTypeConfiguration(configurationFile.getAbsoluteFile());
+        }
+        deviceTypeConfigIdentifier = new DeviceTypeConfigIdentifier(DEFECTIVE_DEVICE_TYPE,MultitenantConstants
+                .SUPER_TENANT_DOMAIN_NAME);
+
+        resourceUrl = classLoader.getResource("device-types/defective-devicetype2.xml");
+        if (resourceUrl != null) {
+            configurationFile = new File(resourceUrl.getFile());
+        }
+        if (configurationFile != null) {
+            defectiveDeviceTypeConfiguration2 = Utils.getDeviceTypeConfiguration(configurationFile.getAbsoluteFile());
+        }
+
+        resourceUrl = classLoader.getResource("device-types/android.xml");
+        if (resourceUrl != null) {
+            configurationFile = new File(resourceUrl.getFile());
+        }
+        if (configurationFile != null) {
+            androidDeviceTypeConfiguration = Utils.getDeviceTypeConfiguration(configurationFile.getAbsoluteFile());
+        }
+    }
+
+    @Test(description = "This test case tests the behaviour of the DeviceTypeManager creation without defining the "
+            + "datasource but by specifying the table id", expectedExceptions = { DeviceTypeDeployerPayloadException
+            .class}, expectedExceptionsMessageRegExp = "Could not find the datasource related with the table id "
+            + TABLE_NAME + " for the device type " + DEFECTIVE_DEVICE_TYPE)
+    public void testWithoutDataSource() {
+        new DeviceTypeManager(deviceTypeConfigIdentifier, defectiveDeviceTypeConfiguration1);
+
+    }
+
+    @Test(description = "This test case tests the behaviour of the DeviceTypeManager creation without defining the "
+            + "table config",expectedExceptions = { DeviceTypeDeployerPayloadException.class},
+            expectedExceptionsMessageRegExp = "Could not find the table config with the table id " + TABLE_NAME
+                    + " for the device type " + DEFECTIVE_DEVICE_TYPE,
+            dependsOnMethods = {"testWithoutDataSource"})
+    public void testWithoutTableConfig() {
+        DataSource dataSource = new DataSource();
+        defectiveDeviceTypeConfiguration1.setDataSource(dataSource);
+        new DeviceTypeManager(deviceTypeConfigIdentifier, defectiveDeviceTypeConfiguration1);
+    }
+
+    @Test(description = "This test case tests the behaviour of the DeviceTypeManager creation without defining the "
+            + "correct table as per the device details",
+            expectedExceptions = { DeviceTypeDeployerPayloadException.class},
+            expectedExceptionsMessageRegExp = "Could not find definition for table: " + TABLE_NAME)
+    public void testWithoutTable() {
+        new DeviceTypeManager(deviceTypeConfigIdentifier, defectiveDeviceTypeConfiguration2);
+    }
+
+    @Test(description = "This test case tests the behaviour of the DeviceTypeManager creation without having the "
+            + "actual datasource", expectedExceptions = {DeviceTypeDeployerPayloadException.class},
+            expectedExceptionsMessageRegExp = "Error while looking up the data source.*")
+    public void testWithoutProperDataSource() {
+        new DeviceTypeManager(deviceTypeConfigIdentifier, androidDeviceTypeConfiguration);
+    }
+
+    @Test(description = "This test case tests the behaviour of the DeviceTypeManager creation without having the "
+            + "actual datasource", expectedExceptions = {DeviceTypeDeployerPayloadException.class},
+            expectedExceptionsMessageRegExp = "Error while looking up the data source.*")
+    public void testWithSetupParameters() {
+        System.setProperty("setup", "true");
+        new DeviceTypeManager(deviceTypeConfigIdentifier, androidDeviceTypeConfiguration);
+
+    }
+}

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManagerServiceTest.java

@@ -124,7 +124,7 @@ public class DeviceTypeManagerServiceTest {
         operationMonitoringConfigs.set(rasberrypiDeviceTypeManagerService, new OperationMonitoringTaskConfig());
         initialOperationConfig.set(rasberrypiDeviceTypeManagerService, new InitialOperationConfig());
 
-        URL resourceUrl = classLoader.getResource("android.xml");
+        URL resourceUrl = classLoader.getResource("device-types/android.xml");
 
         File androidConfiguration = null;
         if (resourceUrl != null) {
@@ -132,7 +132,7 @@ public class DeviceTypeManagerServiceTest {
         }
         androidDeviceConfiguration = Utils.getDeviceTypeConfiguration(androidConfiguration);
 
-        resourceUrl = classLoader.getResource("raspberrypi.xml");
+        resourceUrl = classLoader.getResource("device-types/raspberrypi.xml");
         File raspberrypiConfiguration = null;
         if (resourceUrl != null) {
             raspberrypiConfiguration = new File(resourceUrl.getFile());
@@ -304,7 +304,7 @@ public class DeviceTypeManagerServiceTest {
             throws RegistryException, IOException, SAXException, ParserConfigurationException,
             DeviceTypeConfigurationException, JAXBException {
         ClassLoader classLoader = getClass().getClassLoader();
-        URL resourceUrl = classLoader.getResource("arduino.xml");
+        URL resourceUrl = classLoader.getResource("device-types/arduino.xml");
         File arduinoConfiguration = null;
         if (resourceUrl != null) {
             arduinoConfiguration = new File(resourceUrl.getFile());

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManagerTest.java

@@ -76,7 +76,7 @@ public class DeviceTypeManagerTest {
     public void setup() throws NoSuchFieldException, IllegalAccessException, IOException, SQLException, SAXException,
             ParserConfigurationException, DeviceTypeConfigurationException, JAXBException {
         ClassLoader classLoader = getClass().getClassLoader();
-        URL resourceUrl = classLoader.getResource("android_h2.sql");
+        URL resourceUrl = classLoader.getResource("sql-files/android_h2.sql");
         androidDeviceType = "android";
         File androidDatabaseScript = null;
         javax.sql.DataSource dataSource = null;
@@ -85,7 +85,7 @@ public class DeviceTypeManagerTest {
         if (resourceUrl != null) {
             androidDatabaseScript = new File(resourceUrl.getFile());
         }
-        resourceUrl = classLoader.getResource("android.xml");
+        resourceUrl = classLoader.getResource("device-types/android.xml");
 
         if (resourceUrl != null) {
             androidConfiguration = new File(resourceUrl.getFile());
@@ -295,7 +295,7 @@ public class DeviceTypeManagerTest {
     private DeviceTypePluginDAOManager createPluginBasedDeviceTypeManager()
             throws IOException, SQLException, NoSuchFieldException, IllegalAccessException {
         ClassLoader classLoader = getClass().getClassLoader();
-        URL resourceUrl = classLoader.getResource("h2.sql");
+        URL resourceUrl = classLoader.getResource("sql-files/h2.sql");
         File cdmDataScript = null;
         javax.sql.DataSource dataSource = null;
         if (resourceUrl != null) {

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HttpDeviceTypeManagerServiceAndDeviceTypeGeneratorServceTest.java

@@ -38,11 +38,8 @@ import org.wso2.carbon.device.mgt.extensions.utils.Utils;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.xml.sax.SAXException;
 
-import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.soap.Node;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -157,7 +154,7 @@ public class HttpDeviceTypeManagerServiceAndDeviceTypeGeneratorServceTest {
             throws SAXException, JAXBException, ParserConfigurationException, DeviceTypeConfigurationException,
             IOException {
         ClassLoader classLoader = getClass().getClassLoader();
-        URL resourceUrl = classLoader.getResource("android_sense.xml");
+        URL resourceUrl = classLoader.getResource("device-types/android_sense.xml");
         File androidSenseConfiguration = null;
 
         if (resourceUrl != null) {

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ 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.
+  -->
+<DeviceTypeConfiguration name="defective-devicetype">
+    <DeviceDetails table-id="DEFECTIVE_DEVICE"/>
+
+    <Features>
+        <Feature code="bulb">
+            <Name>Control Bulb</Name>
+            <Description>Control Bulb on Arduino Uno</Description>
+            <Operation context="/arduino/device/{deviceId}/bulb" method="POST">
+                <QueryParameters>
+                    <Parameter>state</Parameter>
+                </QueryParameters>
+            </Operation>
+        </Feature>
+    </Features>
+
+    <ProvisioningConfig>
+        <SharedWithAllTenants>true</SharedWithAllTenants>
+    </ProvisioningConfig>
+
+    <License>
+        <Language>en_US</Language>
+        <Version>1.0.0</Version>
+        <Text>This is license text</Text>
+    </License>
+
+</DeviceTypeConfiguration>

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype2.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ 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.
+  -->
+<DeviceTypeConfiguration name="defective-devicetype">
+    <DeviceDetails table-id="DEFECTIVE_DEVICE"/>
+
+    <Features>
+        <Feature code="bulb">
+            <Name>Control Bulb</Name>
+            <Description>Control Bulb on Arduino Uno</Description>
+            <Operation context="/arduino/device/{deviceId}/bulb" method="POST">
+                <QueryParameters>
+                    <Parameter>state</Parameter>
+                </QueryParameters>
+            </Operation>
+        </Feature>
+    </Features>
+
+    <ProvisioningConfig>
+        <SharedWithAllTenants>true</SharedWithAllTenants>
+    </ProvisioningConfig>
+
+    <License>
+        <Language>en_US</Language>
+        <Version>1.0.0</Version>
+        <Text>This is license text</Text>
+    </License>
+
+    <DataSource>
+        <JndiConfig>
+            <Name>jdbc/MobileAndroidDM_DS</Name>
+        </JndiConfig>
+        <TableConfig>
+            <Table name="AD_DEVICE">
+            </Table>
+        </TableConfig>
+    </DataSource>
+
+</DeviceTypeConfiguration>

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/testng.xml

@@ -28,6 +28,7 @@
             <class name="org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeManagerTest"/>
             <class name="org.wso2.carbon.device.mgt.extensions.device.type.template.HttpDeviceTypeManagerServiceAndDeviceTypeGeneratorServceTest"/>
             <class name="org.wso2.carbon.device.mgt.extensions.device.type.template.dao.DeviceDAODefinitionNegativeTest"/>
+            <class name="org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeManagerNegativeTest" />
         </classes>
     </test>
 </suite>