From c8e94e8ef1ed2045aeb727bd88be456596a9be7e Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Wed, 17 May 2023 20:09:02 +0530 Subject: [PATCH] refatcoring test cases --- integration-test/pom.xml | 2 +- .../integration/test}/common/AssertUtil.java | 2 +- .../integration/test}/common/Constants.java | 2 +- .../test}/common/IOTHttpClient.java | 2 +- .../integration/test}/common/IOTResponse.java | 2 +- .../integration/test}/common/OAuthUtil.java | 2 +- .../test}/common/PayloadGenerator.java | 2 +- .../integration/test}/common/RestClient.java | 2 +- .../integration/test}/common/TestBase.java | 2 +- .../extensions/AnalyticsServerExtension.java | 2 +- .../extensions/BrokerServerExtension.java | 2 +- .../CarbonServerManagerExtension.java | 2 +- .../extensions/CustomTestServerManager.java | 2 +- .../common/extensions/IOTServerExtension.java | 2 +- ...roidDeviceManagementAPIJmeterTestCase.java | 2 +- .../src/test/resources/automation.xml | 6 +- .../AndroidDeviceManagementAPI.jmx | 334 +++++++++++------- .../src/test/resources/testng.xml | 2 +- iot-core/pom.xml | 4 +- iot-core/src/assembly/bin.xml | 2 +- iot-core/src/core/conf/deployment.toml | 4 +- iot-core/src/core/conf/tomcat/context.xml | 2 +- 22 files changed, 228 insertions(+), 156 deletions(-) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/AssertUtil.java (97%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/Constants.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/IOTHttpClient.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/IOTResponse.java (95%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/OAuthUtil.java (98%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/PayloadGenerator.java (97%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/RestClient.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/TestBase.java (98%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/AnalyticsServerExtension.java (97%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/BrokerServerExtension.java (98%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/CarbonServerManagerExtension.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/CustomTestServerManager.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/IOTServerExtension.java (98%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java (96%) diff --git a/integration-test/pom.xml b/integration-test/pom.xml index cbc9b26..eccb507 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -59,7 +59,7 @@ carbon.zip - ${basedir}/../../distribution/iot-community/target/${entgra-iot-community}.zip + ${basedir}/../distribution/iot-community/target/${entgra-iot-community}.zip diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/AssertUtil.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/AssertUtil.java similarity index 97% rename from integration-test/src/test/java/org/wso2/iot/integration/common/AssertUtil.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/AssertUtil.java index c84c619..0d949b1 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/AssertUtil.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/AssertUtil.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/Constants.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/Constants.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/Constants.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/Constants.java index a85777e..b2168ba 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/Constants.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/Constants.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import java.io.File; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTHttpClient.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTHttpClient.java index 7f6fb99..afc7801 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTHttpClient.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/IOTResponse.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTResponse.java similarity index 95% rename from integration-test/src/test/java/org/wso2/iot/integration/common/IOTResponse.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTResponse.java index 0860b95..e7de517 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/IOTResponse.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTResponse.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; /** * This class contains the functions to handle a HTTP Response diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/OAuthUtil.java similarity index 98% rename from integration-test/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/OAuthUtil.java index 2836087..cf97df2 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/OAuthUtil.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import org.apache.commons.net.util.Base64; import org.json.JSONObject; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/PayloadGenerator.java similarity index 97% rename from integration-test/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/PayloadGenerator.java index ebdc1a1..39fa1d0 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/PayloadGenerator.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/RestClient.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/RestClient.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/RestClient.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/RestClient.java index bf4901f..f502707 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/RestClient.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/RestClient.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException; import org.wso2.carbon.automation.test.utils.http.client.HttpRequestUtil; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/TestBase.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/TestBase.java similarity index 98% rename from integration-test/src/test/java/org/wso2/iot/integration/common/TestBase.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/TestBase.java index dd428b8..739f33e 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/TestBase.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/TestBase.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import org.apache.commons.net.util.Base64; import org.testng.annotations.DataProvider; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/AnalyticsServerExtension.java similarity index 97% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/AnalyticsServerExtension.java index a567571..490fbac 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/AnalyticsServerExtension.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/BrokerServerExtension.java similarity index 98% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/BrokerServerExtension.java index ad074c4..ab117a9 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/BrokerServerExtension.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java index 9f5c9fc..16c6f1e 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.DirectoryFileFilter; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CustomTestServerManager.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CustomTestServerManager.java index 600ad94..8ba2b8b 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CustomTestServerManager.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/IOTServerExtension.java similarity index 98% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/IOTServerExtension.java index 6b46b65..b50454e 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/IOTServerExtension.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java similarity index 96% rename from integration-test/src/test/java/org/wso2/iot/integration/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java index 2736f5c..c34b289 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.jmeter; +package io.entgra.community.iots.integration.test.jmeter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/resources/automation.xml b/integration-test/src/test/resources/automation.xml index 369e7a7..63d1f39 100644 --- a/integration-test/src/test/resources/automation.xml +++ b/integration-test/src/test/resources/automation.xml @@ -189,9 +189,9 @@ - - org.wso2.iot.integration.common.extensions.IOTServerExtension - + + io.entgra.community.iots.integration.test.common.extensions.IOTServerExtension + diff --git a/integration-test/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPI.jmx b/integration-test/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPI.jmx index 331dfd2..1d87b08 100644 --- a/integration-test/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPI.jmx +++ b/integration-test/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPI.jmx @@ -1,5 +1,5 @@ - + @@ -133,6 +133,7 @@ false + true @@ -141,7 +142,7 @@ rfc2109 - + @@ -163,9 +164,9 @@ urn:login true false - + - + @@ -183,7 +184,7 @@ urn:getTenant true false - + undefined @@ -193,6 +194,7 @@ false true tenant_exists + -1 @@ -208,7 +210,7 @@ false - + @@ -247,10 +249,10 @@ urn:addTenant true false - + - + @@ -265,7 +267,7 @@ urn:logout true false - + @@ -274,6 +276,7 @@ Assertion.response_code false 1 + @@ -324,6 +327,7 @@ false + true @@ -332,7 +336,7 @@ rfc2109 - + @@ -354,9 +358,9 @@ urn:login true false - + - + @@ -371,7 +375,7 @@ urn:logout true false - + @@ -380,6 +384,7 @@ Assertion.response_code false 1 + @@ -397,6 +402,7 @@ false + true @@ -408,7 +414,7 @@ false - + true @@ -417,7 +423,7 @@ { "applicationName":"app_${randAppNum}", "isAllowedToAllDomains":false, - "tags":["android", "device_management"], + "tags":["device_management"], "isMappingAnExistingOAuthApp":false } = @@ -477,7 +483,7 @@ - + clientId,clientSecret false @@ -491,7 +497,7 @@ byte[] encryptedId = Base64.encodeBase64(toEncode.getBytes()); vars.put("base64encodedId",new String(encryptedId)); - + @@ -571,7 +577,64 @@ vars.put("base64encodedId",new String(encryptedId)); - + + true + + + + false + { + "name": "android", + "deviceTypeMetaDefinition": { + "description": "android device type", + "properties": [ + "property1" + ], + "features": [ + { + "code":"aaaa1111", + "name":"newfeature1", + "description":"this is the new feature 1" + } + ] + } +} + = + + + + ${host} + ${https_port} + + + https + + /api/device-mgt/v1.0/admin/device-types + POST + false + false + true + false + HttpClient4 + false + + + + + + + Authorization + Bearer ${access_token} + + + Content-Type + application/json + + + + + + true @@ -683,7 +746,7 @@ vars.put("base64encodedId",new String(encryptedId)); https - /api/device-mgt/android/v1.0/devices + /api/device-mgt/v1.0/device/agent/enroll POST false false @@ -708,7 +771,7 @@ vars.put("base64encodedId",new String(encryptedId)); - + @@ -758,7 +821,7 @@ vars.put("base64encodedId",new String(encryptedId)); - + true @@ -830,7 +893,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -880,7 +943,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -915,7 +978,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -958,7 +1021,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -993,7 +1056,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -1069,10 +1132,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + - + @@ -1111,7 +1175,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -1176,7 +1240,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1215,7 +1279,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1254,7 +1318,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -1309,7 +1373,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1348,7 +1412,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1387,7 +1451,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1426,7 +1490,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1465,7 +1529,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1512,7 +1576,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1551,7 +1615,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1590,7 +1654,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1638,7 +1702,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1677,7 +1741,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1716,7 +1780,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -2263,6 +2327,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + @@ -4605,7 +4670,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", false - + tenant_user_name,domain_name,password false @@ -4619,7 +4684,7 @@ byte[] encryptedId = Base64.encodeBase64(toEncode.getBytes()); vars.put("encodedUserPassword","Basic " + new String(encryptedId)); - + true @@ -4690,7 +4755,7 @@ vars.put("encodedUserPassword","Basic " + new String(encrypt - + clientId,clientSecret false @@ -4704,7 +4769,7 @@ byte[] encryptedId = Base64.encodeBase64(toEncode.getBytes()); vars.put("base64encodedId",new String(encryptedId)); - + @@ -4784,13 +4849,13 @@ vars.put("base64encodedId",new String(encryptedId)); - + false true false - + true @@ -4927,7 +4992,7 @@ vars.put("base64encodedId",new String(encryptedId)); - + @@ -4977,7 +5042,7 @@ vars.put("base64encodedId",new String(encryptedId)); - + true @@ -5049,7 +5114,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5099,7 +5164,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5134,7 +5199,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -5210,10 +5275,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + - + @@ -5256,7 +5322,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5291,7 +5357,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5330,7 +5396,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -5395,7 +5461,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5434,7 +5500,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5473,7 +5539,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -5528,7 +5594,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5567,7 +5633,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5606,7 +5672,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5645,7 +5711,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5684,7 +5750,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5731,7 +5797,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5770,7 +5836,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5809,7 +5875,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5857,7 +5923,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5896,7 +5962,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5941,6 +6007,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_code true 8 + @@ -5950,10 +6017,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data true 16 + - + @@ -5992,7 +6060,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -6031,7 +6099,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6082,7 +6150,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -6117,7 +6185,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6254,7 +6322,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6395,7 +6463,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6455,7 +6523,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -6494,7 +6562,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6540,7 +6608,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6582,7 +6650,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6637,7 +6705,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6690,7 +6758,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6732,7 +6800,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6778,7 +6846,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6820,7 +6888,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6876,7 +6944,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6930,7 +6998,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6972,7 +7040,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7025,7 +7093,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7067,7 +7135,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7120,7 +7188,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7162,7 +7230,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7208,7 +7276,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7250,7 +7318,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7306,7 +7374,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7348,7 +7416,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7394,7 +7462,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7436,7 +7504,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7490,7 +7558,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7532,7 +7600,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7578,7 +7646,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7620,7 +7688,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7666,7 +7734,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7708,7 +7776,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7754,7 +7822,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7796,7 +7864,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7850,7 +7918,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7892,7 +7960,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7934,7 +8002,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7993,7 +8061,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8035,7 +8103,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8090,7 +8158,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8132,7 +8200,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8188,7 +8256,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8230,7 +8298,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8276,7 +8344,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8318,7 +8386,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8375,7 +8443,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8417,7 +8485,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8471,7 +8539,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8513,7 +8581,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8566,7 +8634,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8612,7 +8680,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8654,7 +8722,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -8693,7 +8761,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8739,7 +8807,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8781,7 +8849,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8823,7 +8891,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -8868,10 +8936,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + - + @@ -8916,10 +8985,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + - + @@ -8964,6 +9034,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data true 16 + @@ -8973,6 +9044,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_code false 8 + diff --git a/integration-test/src/test/resources/testng.xml b/integration-test/src/test/resources/testng.xml index feee9c4..c72e7c9 100644 --- a/integration-test/src/test/resources/testng.xml +++ b/integration-test/src/test/resources/testng.xml @@ -29,7 +29,7 @@ - + diff --git a/iot-core/pom.xml b/iot-core/pom.xml index e48707c..455eedf 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -185,7 +185,7 @@ - + @@ -212,7 +212,7 @@ - + diff --git a/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml index b78177f..ae67129 100644 --- a/iot-core/src/assembly/bin.xml +++ b/iot-core/src/assembly/bin.xml @@ -51,7 +51,7 @@ ${basedir}/target/${wso2am} ${entgra-iot-core} - **/repository/conf/tomcat/context.xml + **/repository/conf/deployment.toml diff --git a/iot-core/src/core/conf/deployment.toml b/iot-core/src/core/conf/deployment.toml index 738fdb0..15f4538 100644 --- a/iot-core/src/core/conf/deployment.toml +++ b/iot-core/src/core/conf/deployment.toml @@ -105,7 +105,7 @@ config_endpoint = "https://localhost:8080/auth/v1" auth_token = "" [web_app.listener] -class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"] +class_name = ["io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"] [apim.key_manager] #service_url = "https://localhost:${mgt.transport.https.port}/services/" @@ -115,7 +115,7 @@ class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPub #pool.max_idle = 100 #key_validation_handler_type = "default" #key_validation_handler_type = "custom" -key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler" +key_validation_handler_impl = "io.entgra.device.mgt.core.apimgt.keymgt.extension.KeyValidationHandler" #[apim.idp] #server_url = "https://localhost:${mgt.transport.https.port}" diff --git a/iot-core/src/core/conf/tomcat/context.xml b/iot-core/src/core/conf/tomcat/context.xml index e91129c..b0c3dcb 100644 --- a/iot-core/src/core/conf/tomcat/context.xml +++ b/iot-core/src/core/conf/tomcat/context.xml @@ -47,7 +47,7 @@ 'managed-api-isSecured' - Indicates if the 'Managed API' needs to be exposed over a secured channel. 'managed-api-transports' - Transports through which the 'Managed API' is exposed. --> - +