Modify NotificationManager code to change resource type

- change the capital of resource type into the small letter

Change-Id: I85d34e25c903a826f2b4a16781991ee61b75b16b
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/notification-manager/NotificationManager/src/ResourceHosting.cpp b/service/notification-manager/NotificationManager/src/ResourceHosting.cpp
index c9af552..a940417 100644 (file)
--- a/service/notification-manager/NotificationManager/src/ResourceHosting.cpp
+++ b/service/notification-manager/NotificationManager/src/ResourceHosting.cpp
@@ -34,7 +34,7 @@ namespace
     std::string HOSTING_TAG = "/hosting";
     size_t HOSTING_TAG_SIZE = (size_t)HOSTING_TAG.size();
     std::string MULTICAST_PRESENCE_ADDRESS = std::string("coap://") + OC_MULTICAST_PREFIX;
-    std::string HOSTING_RESOURSE_TYPE = "Resource.Hosting";
+    std::string HOSTING_RESOURSE_TYPE = "resource.hosting";
 }
 
 ResourceHosting * ResourceHosting::s_instance(nullptr);

diff --git a/service/notification-manager/NotificationManager/src/unittest/RequestObjectUnitTest.cpp b/service/notification-manager/NotificationManager/src/unittest/RequestObjectUnitTest.cpp
index acbcf69..03fe833 100644 (file)
--- a/service/notification-manager/NotificationManager/src/unittest/RequestObjectUnitTest.cpp
+++ b/service/notification-manager/NotificationManager/src/unittest/RequestObjectUnitTest.cpp
@@ -58,13 +58,15 @@ protected:
     void TearDown()
     {
         TestWithMock::TearDown();
-        if(remoteObject->isCaching())
-        {
-            remoteObject->stopCaching();
-        }
-        if(remoteObject->isMonitoring())
-        {
-            remoteObject->stopMonitoring();
+        if(remoteObject){
+          if(remoteObject->isCaching())
+          {
+              remoteObject->stopCaching();
+          }
+          if(remoteObject->isMonitoring())
+          {
+              remoteObject->stopMonitoring();
+          }
         }
          testObject->destroy();
     }

diff --git a/service/notification-manager/NotificationManager/src/unittest/ResourceEncapsulationTestSimulator.h b/service/notification-manager/NotificationManager/src/unittest/ResourceEncapsulationTestSimulator.h
index b3f03e4..69fbf09 100644 (file)
--- a/service/notification-manager/NotificationManager/src/unittest/ResourceEncapsulationTestSimulator.h
+++ b/service/notification-manager/NotificationManager/src/unittest/ResourceEncapsulationTestSimulator.h
@@ -63,7 +63,7 @@ public:
      MULTICASTURI("/oic/res"),
      HOSTED_RESOURCEURI("/a/TempHumSensor"),
      RESOURCEURI("/a/TempHumSensor/hosting"),
-     RESOURCETYPE("Resource.Hosting"),
+     RESOURCETYPE("resource.hosting"),
      RESOURCEINTERFACE("oic.if.baseline"),
      ATTR_KEY("Temperature"),
      ATTR_VALUE(0)
@@ -71,17 +71,6 @@ public:
     ~ResourceEncapsulationTestSimulator()
     {
         std::cout << "~ResourceEncapsulationTestSimulator()" << std::endl;
-       // if(remoteResource->isCaching())
-       // {
-       //     std::cout << "stop cache" << std::endl;
-       //     remoteResource->stopCaching();
-       // }
-       // if(remoteResource->isMonitoring())
-       // {
-       //     std::cout << "stop monitoring" << std::endl;
-       //     remoteResource->stopMonitoring();
-       // }
-       //std::cout << "11111: " << remoteResource.use_count() << std::endl;
     }
 
 private:

diff --git a/service/notification-manager/NotificationManager/src/unittest/ResourceHostingTest.cpp b/service/notification-manager/NotificationManager/src/unittest/ResourceHostingTest.cpp
index 6673cf3..d0f630c 100644 (file)
--- a/service/notification-manager/NotificationManager/src/unittest/ResourceHostingTest.cpp
+++ b/service/notification-manager/NotificationManager/src/unittest/ResourceHostingTest.cpp
@@ -103,7 +103,7 @@ TEST_F(ResourceHostingTest, HostingFoundBeforeMakeOriginServer)
             });
 
     discoveryTask = RCSDiscoveryManager::getInstance()->discoverResourceByType(
-            RCSAddress::multicast(), "Resource.Hosting", onDiscoveryResource);
+            RCSAddress::multicast(), "resource.hosting", onDiscoveryResource);
     waitForCondition(2000);
 
     std::string mirroredUri = { testObject->getServerUri() };

diff --git a/service/notification-manager/SampleApp/android/SampleConsumer/src/com/example/sample/consumer/SampleConsumer.java b/service/notification-manager/SampleApp/android/SampleConsumer/src/com/example/sample/consumer/SampleConsumer.java
index 814b8fa..4cc974f 100644 (file)
--- a/service/notification-manager/SampleApp/android/SampleConsumer/src/com/example/sample/consumer/SampleConsumer.java
+++ b/service/notification-manager/SampleApp/android/SampleConsumer/src/com/example/sample/consumer/SampleConsumer.java
@@ -173,7 +173,7 @@ public class SampleConsumer extends Activity implements View.OnClickListener,
     }
 
     public void findResourceCandidate() {
-        nmfindResource("", "/oic/res?rt=Resource.Hosting");
+        nmfindResource("", "/oic/res?rt=resource.hosting");
         current_log_result += "Finding Resource... \n";
         tv_current_log_result.setText(current_log_result);
         Log.i(TAG, current_log_result);

diff --git a/service/notification-manager/SampleApp/android/SampleProviderApp/src/com/example/sample/provider/StringConstants.java b/service/notification-manager/SampleApp/android/SampleProviderApp/src/com/example/sample/provider/StringConstants.java
index f9a4455..bd37808 100644 (file)
--- a/service/notification-manager/SampleApp/android/SampleProviderApp/src/com/example/sample/provider/StringConstants.java
+++ b/service/notification-manager/SampleApp/android/SampleProviderApp/src/com/example/sample/provider/StringConstants.java
@@ -4,7 +4,7 @@ import org.iotivity.base.OcPlatform;
 
 public class StringConstants {
     public static final String RESOURCE_URI       = "/a/TempHumSensor/hosting";
-    public static final String RESOURCE_TYPENAME  = "Resource.Hosting";
+    public static final String RESOURCE_TYPENAME  = "resource.hosting";
     public static final String RESOURCE_INTERFACE = OcPlatform.DEFAULT_INTERFACE; // resource interface
     public static final String HUMIDITY           = "humidity";
     public static final String TEMPERATURE        = "temperature";

diff --git a/service/notification-manager/SampleApp/linux/sampleConsumer/SampleConsumer.cpp b/service/notification-manager/SampleApp/linux/sampleConsumer/SampleConsumer.cpp
index 28a6a20..35f6272 100644 (file)
--- a/service/notification-manager/SampleApp/linux/sampleConsumer/SampleConsumer.cpp
+++ b/service/notification-manager/SampleApp/linux/sampleConsumer/SampleConsumer.cpp
@@ -34,7 +34,7 @@ using namespace OC;
 
 const int SUCCESS_RESPONSE = OC_STACK_OK;
 
-#define OC_WELL_KNOWN_COORDINATING_QUERY "/oic/res?rt=Resource.Hosting"
+#define OC_WELL_KNOWN_COORDINATING_QUERY "/oic/res?rt=resource.hosting"
 
 #define OBSERVE 1
 #define GET     2

diff --git a/service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp b/service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp
index e8540c3..d44bcb5 100644 (file)
--- a/service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp
+++ b/service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp
@@ -63,7 +63,7 @@ class TempHumidResource
         void createResource()
         {
             std::string resourceURI = "/a/TempHumSensor/hosting";
-            std::string resourceTypeName = "Resource.Hosting";
+            std::string resourceTypeName = "resource.hosting";
             std::string resourceInterface = DEFAULT_INTERFACE;
 
             m_uri = resourceURI;
@@ -83,7 +83,7 @@ class TempHumidResource
         {
             std::string resourceURI = "/a/NM/TempHumSensor1"; // URI of the resource
             std::string resourceTypeName =
-                "NotificationManager.Hosting"; // resource type name. In this case, it is light
+                "notificationmanager.hosting"; // resource type name. In this case, it is light
             std::string resourceInterface = DEFAULT_INTERFACE; // resource interface.
 
             // OCResourceProperty is defined ocstack.h

diff --git a/service/notification-manager/SampleApp/tizen/sampleConsumer/src/oicapp-client.cpp b/service/notification-manager/SampleApp/tizen/sampleConsumer/src/oicapp-client.cpp
index 25c344e..0943793 100644 (file)
--- a/service/notification-manager/SampleApp/tizen/sampleConsumer/src/oicapp-client.cpp
+++ b/service/notification-manager/SampleApp/tizen/sampleConsumer/src/oicapp-client.cpp
@@ -58,7 +58,7 @@ void findResourceCandidate(oicappData *ad)
 {
     try
     {
-        nmfindResource("" , "coap://224.0.1.187/oc/core?rt=NotificationManager.Hosting");
+        nmfindResource("" , "coap://224.0.1.187/oc/core?rt=notificationmanager.hosting");
         std::cout << "Finding Resource... " << std::endl;
 
     }