pasindu
/
product-iots-community
forked from community/product-iots-community
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refatcoring test cases

Browse Source
master
Amalka Subasinghe 2 years ago
parent 14d881bf70
commit c8e94e8ef1
22 changed files with 228 additions and 156 deletions
Show Stats Download Patch File Download Diff File

2
integration-test/pom.xml
Unescape View File

@ -59,7 +59,7 @@
<property> <property>
<name>carbon.zip</name> <name>carbon.zip</name>
<value> <value>
${basedir}/../../distribution/iot-community/target/${entgra-iot-community}.zip ${basedir}/../distribution/iot-community/target/${entgra-iot-community}.zip
</value> </value>
</property> </property>
<property> <property>

2
integration-test/src/test/java/org/wso2/iot/integration/common/AssertUtil.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/AssertUtil.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;

2
integration-test/src/test/java/org/wso2/iot/integration/common/Constants.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/Constants.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * under the License.
*/ */
package org.wso2.iot.integration.common; package io.entgra.community.iots.integration.test.common;
import java.io.File; import java.io.File;

2
integration-test/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTHttpClient.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * under the License.
*/ */
package org.wso2.iot.integration.common; package io.entgra.community.iots.integration.test.common;
import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;

2
integration-test/src/test/java/org/wso2/iot/integration/common/IOTResponse.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTResponse.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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 * This class contains the functions to handle a HTTP Response

2
integration-test/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/OAuthUtil.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.apache.commons.net.util.Base64;
import org.json.JSONObject; import org.json.JSONObject;

2
integration-test/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/PayloadGenerator.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;

2
integration-test/src/test/java/org/wso2/iot/integration/common/RestClient.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/RestClient.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.engine.exceptions.AutomationFrameworkException;
import org.wso2.carbon.automation.test.utils.http.client.HttpRequestUtil; import org.wso2.carbon.automation.test.utils.http.client.HttpRequestUtil;

2
integration-test/src/test/java/org/wso2/iot/integration/common/TestBase.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/TestBase.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.apache.commons.net.util.Base64;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;

2
integration-test/src/test/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/AnalyticsServerExtension.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

2
integration-test/src/test/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/BrokerServerExtension.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.iot.integration.common.extensions; package io.entgra.community.iots.integration.test.common.extensions;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

2
integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.FileUtils;
import org.apache.commons.io.filefilter.DirectoryFileFilter; import org.apache.commons.io.filefilter.DirectoryFileFilter;

2
integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CustomTestServerManager.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

2
integration-test/src/test/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/IOTServerExtension.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

2
integration-test/src/test/java/org/wso2/iot/integration/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java → integration-test/src/test/java/io/entgra/community/iots/integration/test/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java
Unescape View File

@ -16,7 +16,7 @@
* under the License. * 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

6
integration-test/src/test/resources/automation.xml
Unescape View File

@ -189,9 +189,9 @@
<platformExecutionManager> <platformExecutionManager>
<extentionClasses> <extentionClasses>
<class> <class>
<!-- <name>org.wso2.iot.integration.common.extensions.BrokerServerExtension</name>--> <!-- <name>io.entgra.community.iots.integration.test.common.extensions.BrokerServerExtension</name>-->
<name>org.wso2.iot.integration.common.extensions.IOTServerExtension</name> <name>io.entgra.community.iots.integration.test.common.extensions.IOTServerExtension</name>
<!-- <name>org.wso2.iot.integration.common.extensions.AnalyticsServerExtension</name>--> <!-- <name>io.entgra.community.iots.integration.test.common.extensions.AnalyticsServerExtension</name>-->
<!-- <name>org.wso2.carbon.integration.common.extensions.usermgt.UserPopulateExtension</name>--> <!-- <name>org.wso2.carbon.integration.common.extensions.usermgt.UserPopulateExtension</name>-->
</class> </class>
</extentionClasses> </extentionClasses>

334
integration-test/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPI.jmx
View File

File diff suppressed because it is too large Load Diff

2
integration-test/src/test/resources/testng.xml
Unescape View File

@ -29,7 +29,7 @@
<test name="iot-test-cases" preserve-order="true" parallel="false"> <test name="iot-test-cases" preserve-order="true" parallel="false">
<classes> <classes>
<class name="org.wso2.iot.integration.jmeter.AndroidDeviceManagementAPIJmeterTestCase"/> <class name="io.entgra.community.iots.integration.test.jmeter.AndroidDeviceManagementAPIJmeterTestCase"/>
</classes> </classes>
</test> </test>
</suite> </suite>

4
iot-core/pom.xml
Unescape View File

@ -185,7 +185,7 @@
<property name="db.dir" value="target/${wso2am}/repository/database" /> <property name="db.dir" value="target/${wso2am}/repository/database" />
<property name="userid" value="wso2carbon" /> <property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" /> <property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" /> <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue"> <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" /> <classpath refid="maven.dependency.classpath" />
@ -212,7 +212,7 @@
<property name="db.dir" value="target/${wso2am}/repository/database" /> <property name="db.dir" value="target/${wso2am}/repository/database" />
<property name="userid" value="wso2carbon" /> <property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" /> <property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" /> <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue"> <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" /> <classpath refid="maven.dependency.classpath" />

2
iot-core/src/assembly/bin.xml
Unescape View File

@ -51,7 +51,7 @@
<directory>${basedir}/target/${wso2am}</directory> <directory>${basedir}/target/${wso2am}</directory>
<outputDirectory>${entgra-iot-core}</outputDirectory> <outputDirectory>${entgra-iot-core}</outputDirectory>
<excludes> <excludes>
<exclude>**/repository/conf/tomcat/context.xml</exclude> <!-- <exclude>**/repository/conf/tomcat/context.xml</exclude>-->
<exclude>**/repository/conf/deployment.toml</exclude> <exclude>**/repository/conf/deployment.toml</exclude>
</excludes> </excludes>
</fileSet> </fileSet>

4
iot-core/src/core/conf/deployment.toml
Unescape View File

@ -105,7 +105,7 @@ config_endpoint = "https://localhost:8080/auth/v1"
auth_token = "" auth_token = ""
[web_app.listener] [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] [apim.key_manager]
#service_url = "https://localhost:${mgt.transport.https.port}/services/" #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 #pool.max_idle = 100
#key_validation_handler_type = "default" #key_validation_handler_type = "default"
#key_validation_handler_type = "custom" #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] #[apim.idp]
#server_url = "https://localhost:${mgt.transport.https.port}" #server_url = "https://localhost:${mgt.transport.https.port}"

2
iot-core/src/core/conf/tomcat/context.xml
Unescape View File

@ -47,7 +47,7 @@
'managed-api-isSecured' - Indicates if the 'Managed API' needs to be exposed over a secured channel. '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. 'managed-api-transports' - Transports through which the 'Managed API' is exposed.
--> -->
<Listener className="org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener"/> <Listener className="io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener"/>
<!-- WebAppDeploymentLifecycleListener listens to webapp deployment events and adds the custom permissions defined in webapps' <!-- WebAppDeploymentLifecycleListener listens to webapp deployment events and adds the custom permissions defined in webapps'
META-INF/permissions.xml to the permissions/admin section of registry. Given below is a sample of permissions.xml file. META-INF/permissions.xml to the permissions/admin section of registry. Given below is a sample of permissions.xml file.

Write Preview
Loading…
Cancel
Save