[Things-Manager]Fixed junit testcases issues and jira IOT-745

- Updated Java SDK
- Updated sample Application

Change-Id: Ife6e1d3a00ff76d4c68f96949787fab1724092dc
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3115
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit e896af014916446b5098094af994885a76526337)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3211

diff --git a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationApiActivity.java b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationApiActivity.java
index 67dd4df..718eb51 100755 (executable)
--- a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationApiActivity.java
+++ b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationApiActivity.java
@@ -75,10 +75,13 @@ public class ConfigurationApiActivity extends Activity {
 
     private final String                     CONFIGURATION_COLLECTION_RESOURCE_URI  = "/core/configuration/resourceset";
     private final String                     CONFIGURATION_COLLECTION_RESOURCE_TYPE = "core.configuration.resourceset";
+    private final String                     CONFIGURATION_RESOURCE_TYPE            = "oic.wk.con";
     private final String                     MAINTENANCE_COLLECTION_RESOURCE_URI    = "/core/maintenance/resourceset";
     private final String                     MAINTENANCE_COLLECTION_RESOURCE_TYPE   = "core.maintenance.resourceset";
+    private final String                     MAINTENANCE_RESOURCE_TYPE              = "oic.wk.mnt";
     private final String                     FACTORYSET_COLLECTION_RESOURCE_URI     = "/core/factoryset/resourceset";
     private final String                     FACTORYSET_COLLECTION_RESOURCE_TYPE    = "core.factoryset.resourceset";
+    private final String                     FACTORYSET_RESOURCE_TYPE               = "factoryset";
 
     private final String                     CONFIGURATION_RESOURCE_URI             = "/oic/con";
     private final String                     MAINTENANCE_RESOURCE_URI               = "/oic/mnt";
@@ -121,7 +124,7 @@ public class ConfigurationApiActivity extends Activity {
         // set the listeners
         setResourceListener();
         setConfigurationListener();
-        setDiagnosticsListener();
+        setMaintenanceListener();
 
         // Create API menu list
         configurationApisList = new ArrayList<String>();
@@ -150,7 +153,7 @@ public class ConfigurationApiActivity extends Activity {
                 // Find All Groups
                 if (position == 0) {
                     Vector<String> resourceTypes = new Vector<String>();
-                    resourceTypes.add("core.configuration.resourceset");
+                    resourceTypes.add(CONFIGURATION_COLLECTION_RESOURCE_TYPE);
                     findCandidateResources(resourceTypes);
 
                     logMessage = "";
@@ -158,13 +161,13 @@ public class ConfigurationApiActivity extends Activity {
                     messageCount++;
 
                     resourceTypes.clear();
-                    resourceTypes.add("core.diagnostics.resourceset");
+                    resourceTypes.add(MAINTENANCE_COLLECTION_RESOURCE_TYPE);
                     findCandidateResources(resourceTypes);
 
                     messageCount++;
 
                     resourceTypes.clear();
-                    resourceTypes.add("core.factoryset.resourceset");
+                    resourceTypes.add(FACTORYSET_COLLECTION_RESOURCE_TYPE);
                     findCandidateResources(resourceTypes);
 
                     messageCount++;
@@ -174,7 +177,7 @@ public class ConfigurationApiActivity extends Activity {
                         displayToastMessage("Configuration collection resource does not exist!");
                     } else {
                         Vector<String> resourceTypes = new Vector<String>();
-                        resourceTypes.add("oic.wk.con");
+                        resourceTypes.add(CONFIGURATION_RESOURCE_TYPE);
                         findCandidateResources(resourceTypes);
 
                         logMessage = "";
@@ -182,13 +185,13 @@ public class ConfigurationApiActivity extends Activity {
                         messageCount++;
 
                         resourceTypes.clear();
-                        resourceTypes.add("oic.wk.mnt");
+                        resourceTypes.add(MAINTENANCE_RESOURCE_TYPE);
                         findCandidateResources(resourceTypes);
 
                         messageCount++;
 
                         resourceTypes.clear();
-                        resourceTypes.add("factoryset");
+                        resourceTypes.add(FACTORYSET_RESOURCE_TYPE);
                         findCandidateResources(resourceTypes);
 
                         messageCount++;
@@ -431,7 +434,7 @@ public class ConfigurationApiActivity extends Activity {
                 });
     }
 
-    private void setDiagnosticsListener() {
+    private void setMaintenanceListener() {
         thingsMaintenance
                 .setThingsMaintenanceListener(new IThingsMaintenanceListener() {
 
@@ -554,16 +557,16 @@ public class ConfigurationApiActivity extends Activity {
      * to default.
      */
     private void factoryReset() {
-        ResourceInformation diagnosticsCollection = collectionList
+        ResourceInformation MaintenanceCollection = collectionList
                 .get(MAINTENANCE_COLLECTION_RESOURCE_URI);
-        if (null == diagnosticsCollection
-                || null == diagnosticsCollection.resource) {
-            displayToastMessage("Diagnostic collection does not exist!");
+        if (null == MaintenanceCollection
+                || null == MaintenanceCollection.resource) {
+            displayToastMessage("Maintenance collection does not exist!");
             return;
         }
 
         if (false == maintenanceResourceFlag) {
-            displayToastMessage("Diagnostic resource does not exist!");
+            displayToastMessage("Maintenance resource does not exist!");
             return;
         }
 
@@ -571,7 +574,7 @@ public class ConfigurationApiActivity extends Activity {
 
         try {
             result = thingsMaintenance
-                    .factoryReset(diagnosticsCollection.resource);
+                    .factoryReset(MaintenanceCollection.resource);
         } catch (OcException e) {
             e.printStackTrace();
         }
@@ -593,21 +596,21 @@ public class ConfigurationApiActivity extends Activity {
      * This method send request to reboot server.
      */
     private void reboot() {
-        ResourceInformation diagnosticsCollection = collectionList
+        ResourceInformation MaintenanceCollection = collectionList
                 .get(MAINTENANCE_COLLECTION_RESOURCE_URI);
-        if (null == diagnosticsCollection
-                || null == diagnosticsCollection.resource) {
-            displayToastMessage("Diagnostic collection does not exist!");
+        if (null == MaintenanceCollection
+                || null == MaintenanceCollection.resource) {
+            displayToastMessage("Maintenance collection does not exist!");
             return;
         }
         if (false == maintenanceResourceFlag) {
-            displayToastMessage("Diagnostic resource does not exist!");
+            displayToastMessage("Maintenance resource does not exist!");
             return;
         }
 
         OCStackResult result = OCStackResult.OC_STACK_ERROR;
         try {
-            result = thingsMaintenance.reboot(diagnosticsCollection.resource);
+            result = thingsMaintenance.reboot(MaintenanceCollection.resource);
         } catch (OcException e) {
             e.printStackTrace();
         }
@@ -695,10 +698,10 @@ public class ConfigurationApiActivity extends Activity {
             resourceList.put(uri + host, resourceInfo);
             configurationResourceFlag = true;
         } else if (uri.equalsIgnoreCase("/oic/mnt")) {
-            ResourceInformation diagnosticResource = collectionList
+            ResourceInformation maintenanceResource = collectionList
                     .get(MAINTENANCE_COLLECTION_RESOURCE_URI);
-            if (null == diagnosticResource
-                    || null == diagnosticResource.resourceHandle) {
+            if (null == maintenanceResource
+                    || null == maintenanceResource.resourceHandle) {
                 Log.e(LOG_TAG, "Invalid Configuration collection!");
                 return;
             }
@@ -755,23 +758,23 @@ public class ConfigurationApiActivity extends Activity {
         OcResourceHandle resourceHandle = null;
 
         try {
-            resourceHandle = OcPlatform.registerResource(
-                    uri,
-                    typename,
-                    OcPlatform.BATCH_INTERFACE, null, EnumSet.of(
-                            ResourceProperty.DISCOVERABLE));
+            resourceHandle = OcPlatform.registerResource(uri, typename,
+                    OcPlatform.BATCH_INTERFACE, null,
+                    EnumSet.of(ResourceProperty.DISCOVERABLE));
         } catch (OcException e) {
             Log.e(LOG_TAG, "go exception");
             Log.e(LOG_TAG, "RegisterResource error. " + e.getMessage());
         }
         try {
-            OcPlatform.bindInterfaceToResource(resourceHandle, OcPlatform.GROUP_INTERFACE);
+            OcPlatform.bindInterfaceToResource(resourceHandle,
+                    OcPlatform.GROUP_INTERFACE);
         } catch (OcException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
         try {
-            OcPlatform.bindInterfaceToResource(resourceHandle, OcPlatform.DEFAULT_INTERFACE);
+            OcPlatform.bindInterfaceToResource(resourceHandle,
+                    OcPlatform.DEFAULT_INTERFACE);
         } catch (OcException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -808,10 +811,10 @@ public class ConfigurationApiActivity extends Activity {
                         }
                     } else if (resource.resource.getUri().equalsIgnoreCase(
                             MAINTENANCE_RESOURCE_URI)) {
-                        ResourceInformation diagnosticResource = collectionList
+                        ResourceInformation maintenanceResource = collectionList
                                 .get(MAINTENANCE_COLLECTION_RESOURCE_URI);
-                        if (null != diagnosticResource
-                                && null != diagnosticResource.resourceHandle) {
+                        if (null != maintenanceResource
+                                && null != maintenanceResource.resourceHandle) {
                             OcPlatform
                                     .unregisterResource(resource.resourceHandle);
                             Log.i(LOG_TAG, "unregistered resource"

diff --git a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupClient.java b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupClient.java
index a624c72..cd9d493 100644 (file)
--- a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupClient.java
+++ b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupClient.java
@@ -25,15 +25,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
-import org.iotivity.base.EntityHandlerResult;
 import org.iotivity.base.ObserveType;
 import org.iotivity.base.OcException;
 import org.iotivity.base.OcHeaderOption;
 import org.iotivity.base.OcPlatform;
 import org.iotivity.base.OcRepresentation;
 import org.iotivity.base.OcResource;
-import org.iotivity.base.OcResourceRequest;
-import org.iotivity.base.OcStackConfig;
 import org.iotivity.base.ResourceProperty;
 import org.iotivity.base.OcResource.OnObserveListener;
 import org.iotivity.base.OcResourceHandle;

diff --git a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java
index ff9ed05..de881de 100644 (file)
--- a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java
+++ b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java
@@ -64,6 +64,7 @@ public class MainActivity extends Activity {
         mainActivityObj = this;
         Button doBootStrap = (Button) findViewById(R.id.button1);
         final Button createConfig = (Button) findViewById(R.id.button2);
+        createConfig.setEnabled(false);
         editText = (EditText) findViewById(R.id.EditText);
         conServerObj = new ConfigurationServer();
 

diff --git a/service/things-manager/sdk/java/src/org/iotivity/service/tm/GroupManager.java b/service/things-manager/sdk/java/src/org/iotivity/service/tm/GroupManager.java
index 9ca73d5..f7a312b 100644 (file)
--- a/service/things-manager/sdk/java/src/org/iotivity/service/tm/GroupManager.java
+++ b/service/things-manager/sdk/java/src/org/iotivity/service/tm/GroupManager.java
@@ -236,7 +236,7 @@ public class GroupManager {
             int waitTime) {
         OCStackResult result;
         if (null == s_resourceListener) {
-            result = OCStackResult.OC_STACK_ERROR;
+            result = OCStackResult.OC_STACK_LISTENER_NOT_SET;
         } else {
             int ordinal = nativeFindCandidateResource(resourceTypes, waitTime);
             result = OCStackResult.conversion(ordinal);
@@ -266,7 +266,7 @@ public class GroupManager {
 
         OCStackResult result;
         if (null == s_presenceListener) {
-            result = OCStackResult.OC_STACK_ERROR;
+            result = OCStackResult.OC_STACK_LISTENER_NOT_SET;
         } else {
 
             int ordinal = nativeSubscribeCollectionPresence(resource);

diff --git a/service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsConfiguration.java b/service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsConfiguration.java
index 7e91bd0..738e0ad 100644 (file)
--- a/service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsConfiguration.java
+++ b/service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsConfiguration.java
@@ -179,7 +179,7 @@ public class ThingsConfiguration {
             Map<String, String> configurations) throws OcException {
         OCStackResult result;
         if (null == configurationListener) {
-            result = OCStackResult.OC_STACK_ERROR;
+            result = OCStackResult.OC_STACK_LISTENER_NOT_SET;
         } else {
             int ordinal = nativeUpdateConfigurations(resource, configurations);
             result = OCStackResult.conversion(ordinal);
@@ -208,7 +208,7 @@ public class ThingsConfiguration {
             Vector<String> configurations) throws OcException {
         OCStackResult result;
         if (null == configurationListener) {
-            result = OCStackResult.OC_STACK_ERROR;
+            result = OCStackResult.OC_STACK_LISTENER_NOT_SET;
         } else {
             int ordinal = nativeGetConfigurations(resource, configurations);
             result = OCStackResult.conversion(ordinal);

diff --git a/service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsMaintenance.java b/service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsMaintenance.java
index e4b45f3..4ecc6ac 100644 (file)
--- a/service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsMaintenance.java
+++ b/service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsMaintenance.java
@@ -135,9 +135,12 @@ public class ThingsMaintenance {
     public OCStackResult reboot(OcResource resource) throws OcException {
 
         OCStackResult result;
-        int ordinal = nativeReboot(resource);
-        result = OCStackResult.conversion(ordinal);
-
+        if (null == thingsMaintenanceListener) {
+            result = OCStackResult.OC_STACK_LISTENER_NOT_SET;
+        } else {
+            int ordinal = nativeReboot(resource);
+            result = OCStackResult.conversion(ordinal);
+        }
         return result;
     }
 
@@ -166,9 +169,12 @@ public class ThingsMaintenance {
     public OCStackResult factoryReset(OcResource resource) throws OcException {
 
         OCStackResult result;
-        int ordinal = nativeFactoryReset(resource);
-        result = OCStackResult.conversion(ordinal);
-
+        if (null == thingsMaintenanceListener) {
+            result = OCStackResult.OC_STACK_LISTENER_NOT_SET;
+        } else {
+            int ordinal = nativeFactoryReset(resource);
+            result = OCStackResult.conversion(ordinal);
+        }
         return result;
     }