Merge pull request #1185 from inoshperera/master

changing app to con app

modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java

@@ -86,8 +86,8 @@ public class MobileQSGTestCase extends TestBase {
                 Constants.APPLICATION_JSON, accessTokenString);
         HttpResponse response = appManagerRestClient.get(Constants.QSGManagement.GET_MOBILE_APPS_ENDPONT);
         Assert.assertEquals(response.getResponseCode(), HttpStatus.SC_OK);
-        Assert.assertTrue(response.getData().contains("NFC"),
+        Assert.assertTrue(response.getData().contains("Con-App-Android"),
-                "NFC app addition through script is not successful");
+                "Con-App-Android addition through script is not successful");
     }
 
     @Test(description = "This test case tests the policy creation through qsg script", dependsOnMethods = {"executeQSGScript"})

modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java

@@ -116,7 +116,7 @@ public class QSGExecutor {
 
         System.out.println("Upload the android application ");
         //Upload the android application
-        MobileApplication application = AppOperations.uploadApplication(Constants.DeviceType.ANDROID, "nfc-app.apk",
+        MobileApplication application = AppOperations.uploadApplication(Constants.DeviceType.ANDROID, "con-app.apk",
                                                                         "application/vnd.android.package-archive");
         if (application == null) {
             System.out.println("Unable to upload the sample android application. Terminating the IoTS QSG now.");
@@ -132,7 +132,7 @@ public class QSGExecutor {
 
         System.out.println("Create the android application ");
         //Create application entry in publisher
-        status = AppOperations.addApplication("NFC", application, true);
+        status = AppOperations.addApplication("Con-App-Android", application, true);
         if (!status) {
             System.out.println("Unable to create the android mobile application. Terminating the IoTS QSG now.");
             System.exit(0);