community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wso2-master' into test-merge

Browse Source 
# Conflicts:
#	modules/distribution/src/core/plugins/plugins-deployer.xml
#	pom.xml
This commit is contained in:
sinthuja 2017-05-08 11:57:07 +05:30
commit c84dd34eaa
8 changed files with 2313 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -6,8 +6,8 @@
# Welcome to WSO2 IoT Server
<a href='https://wso2.org/jenkins/job/products/job/product-iots/'><img src='https://wso2.org/jenkins/job/products/job/product-iots/badge/icon'></a>
<a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a>
<a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
<a href='https://wso2.org/jenkins/job/products/job/product-iots__java8/'><img src='https://wso2.org/jenkins/job/products/job/product-iots__java8/badge/icon'></a> - Java8
WSO2 IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner.

5
modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java
View File

@ -33,7 +33,8 @@ import java.net.URL;
*/
public class AndroidDeviceManagementAPIJmeterTestCase {
private static Log log = LogFactory.getLog(AndroidDeviceManagementAPIJmeterTestCase.class);
@Test()
@Test(description = "Testing the response when sending different input parameters with different values")
public void permutationTest() throws AutomationFrameworkException {
URL url = Thread.currentThread().getContextClassLoader().getResource(
"jmeter-scripts" + File.separator + "AndroidDeviceManagementAPIAdditionalPermutations.jmx");
@ -43,7 +44,7 @@ public class AndroidDeviceManagementAPIJmeterTestCase {
manager.runTest(script);
}
@Test(dependsOnMethods = {"permutationTest"})
@Test(description = "Testing the basic android device management API calls", dependsOnMethods = {"permutationTest"})
public void listServices() throws AutomationFrameworkException {
URL url = Thread.currentThread().getContextClassLoader()
.getResource("jmeter-scripts" + File.separator + "NewAndroidDeviceManagementAPI.jmx");

46
modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/AppManagerJmeterTestCase.java Normal file
View File

@ -0,0 +1,46 @@
/*
* 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.iot.integration.jmeter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.testng.annotations.Test;
import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException;
import org.wso2.carbon.automation.extensions.jmeter.JMeterTest;
import org.wso2.carbon.automation.extensions.jmeter.JMeterTestManager;
import java.io.File;
import java.net.URL;
/**
* This test case tests the functionality of the app publisher-store functionality.
*/
public class AppManagerJmeterTestCase {
private static Log log = LogFactory.getLog(AppManagerJmeterTestCase.class);
@Test(description = "This test case tests the flow of App Manager mobile-app creation and lifecycle")
public void GroupManagementTest() throws AutomationFrameworkException {
URL url = Thread.currentThread().getContextClassLoader()
.getResource("jmeter-scripts" + File.separator + "AppManagerTest.jmx");
JMeterTest script = new JMeterTest(new File(url.getPath()));
JMeterTestManager manager = new JMeterTestManager();
log.info("Running app manager mobile creation related test cases using jmeter scripts");
manager.runTest(script);
}
}

2255
modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
modules/integration/tests-integration/src/test/resources/jmeter-scripts/image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

BIN
modules/integration/tests-integration/src/test/resources/jmeter-scripts/test.apk Normal file
View File

Binary file not shown.

46
modules/integration/tests-integration/src/test/resources/testng.xml
View File

@ -58,51 +58,12 @@
<class name="org.wso2.iot.integration.device.configuration.AndroidConfigurationManagement"/>
</classes>
</test>
<!--<test name="windows-enrollment" preserve-order="true" parallel="false">-->
<!--<classes>-->
<!--<class name="org.wso2.iot.integration.device.enrollment.WindowsEnrollment"/>-->
<!--</classes>-->
<!--</test>-->
<!--<test name="android-policy" preserve-order="true" parallel="false">-->
<!--<classes>-->
<!--<class name="org.wso2.iot.integration.device.policy.AndroidPolicy"/>-->
<!--</classes>-->
<!--</test>-->
<!--<test name="operation-mgt" preserve-order="true" parallel="false">-->
<!--<classes>-->
<!--<class name="org.wso2.iot.integration.operation.OperationManagement"/>-->
<!--</classes>-->
<!--</test>-->
<test name="role-mgt" preserve-order="true" parallel="false">
<classes>
<class name="org.wso2.iot.integration.role.RoleManagement"/>
</classes>
</test>
<!--<test name="policy-mgt" preserve-order="true" parallel="false">-->
<!--<classes>-->
<!--<class name="org.wso2.iot.integration.policy.PolicyManagement"/>-->
<!--</classes>-->
<!--</test>-->
<!--<test name="feature-mgt" preserve-order="true" parallel="false">-->
<!--<classes>-->
<!--<class name="org.wso2.iot.integration.feature.FeatureManagement"/>-->
<!--</classes>-->
<!--</test>-->
<!--<test name="license-mgt" preserve-order="true" parallel="false">-->
<!--<classes>-->
<!--<class name="org.wso2.iot.integration.license.LicenseManagement"/>-->
<!--</classes>-->
<!--</test>-->
<!--<test name="configuration-mgt" preserve-order="true" parallel="false">-->
<!--<classes>-->
<!--<class name="org.wso2.iot.integration.configuration.ConfigurationManagement"/>-->
<!--</classes>-->
<!--</test>-->
<!--<test name="notification-mgt" preserve-order="true" parallel="false">-->
<!--<classes>-->
<!--<class name="org.wso2.iot.integration.notification.NotificationManagement"/>-->
<!--</classes>-->
<!--</test>-->
<test name="group-mgt" preserve-order="true" parallel="false">
<classes>
<class name="org.wso2.iot.integration.jmeter.GroupManagementJMeterTestCase"/>
@ -123,6 +84,11 @@
<class name="org.wso2.iot.integration.jmeter.PolicyManagementJMeterTestCase"/>
</classes>
</test>
<test name="app-mgt" preserve-order="true" parallel="false">
<classes>
<class name="org.wso2.iot.integration.jmeter.AppManagerJmeterTestCase"/>
</classes>
</test>
<test name="user-mgt" preserve-order="true" parallel="false">
<classes>
<class name="org.wso2.iot.integration.user.UserManagement"/>

2
pom.xml
View File

@ -1513,7 +1513,7 @@
<!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.58</carbon.device.mgt.version>
<carbon.device.mgt.version>2.0.59</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management -->