change resource type names of resource container samples

- modify container sample bundles, unittest and bundle configfiles
- change resource types of sample input sensors

Change-Id: I2738a8c2ad1f5e28ea5a3dd2d6c48739b7be9a5b
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2857
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit ba685fbcac922991fef921bcd8ba06cd8a247fb3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2891

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp b/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp
index 8142033..b9b3946 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp
@@ -65,7 +65,7 @@ void BMISensorBundleActivator::deactivateBundle()
 
 void BMISensorBundleActivator::createResource(resourceInfo resourceInfo)
 {
-    if (resourceInfo.resourceType == "oic.softsensor")
+    if (resourceInfo.resourceType == "oic.r.sensor")
     {
         static int BMISensorCount = 1;
 
@@ -103,7 +103,7 @@ void BMISensorBundleActivator::destroyResource(BundleResource *resource)
 }
 
 extern "C" void bmisensor_externalActivateBundle(ResourceContainerBundleAPI *resourceContainer,
-                                       std::string bundleId)
+        std::string bundleId)
 {
     bundle = new BMISensorBundleActivator();
     bundle->activateBundle(resourceContainer, bundleId);

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h b/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h
index d267c3b..75982b8 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h
+++ b/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h
@@ -35,7 +35,7 @@
 #define COAP_MODE               OC::ModeType::Server
 #define COAP_SRVTYPE            OC::ServiceType::InProc
 
-#define RESOURCE_TYPE_NAME          "oic.sensor.height"
+#define RESOURCE_TYPE_NAME          "oic.r.sensor.height"
 
 //  testing case
 #define INTERVAL_FOR_CHECK          4   // seconds

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h b/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h
index 8bdbfcb..ca3c4d8 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h
+++ b/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h
@@ -34,7 +34,7 @@
 #define COAP_MODE               OC::ModeType::Server
 #define COAP_SRVTYPE            OC::ServiceType::InProc
 
-#define RESOURCE_TYPE_NAME          "oic.sensor.weight"
+#define RESOURCE_TYPE_NAME          "oic.r.sensor.weight"
 
 //  testing case
 #define INTERVAL_FOR_CHECK          14   // seconds

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/ContainerSample.cpp b/service/resource-encapsulation/src/resourceContainer/examples/ContainerSample.cpp
index b60d5a6..3d9febc 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/ContainerSample.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/examples/ContainerSample.cpp
@@ -101,7 +101,7 @@ int main()
     std::map<string, string> resourceParams;
     cout << "Press enter to add SO bundle resource " << endl;
     getchar();
-    resourceParams["resourceType"] = "oic.light.control";
+    resourceParams["resourceType"] = "oic.r.light";
     resourceParams["address"] = "http://192.168.0.2/api/newdeveloper/lights/1";
     container->addResourceConfig("oic.bundle.hueSample", "", resourceParams);
     container->addResourceConfig("oic.bundle.hueSample", "", resourceParams);

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/ContainerSampleClient.cpp b/service/resource-encapsulation/src/resourceContainer/examples/ContainerSampleClient.cpp
index cbbeb91..cc97d1d 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/ContainerSampleClient.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/examples/ContainerSampleClient.cpp
@@ -428,7 +428,7 @@ void foundResource(std::shared_ptr<OCResource> resource)
             {
                 std::cout << "\t\t" << resourceTypes << std::endl;
 
-                if (resourceTypes == "oic.light.control")
+                if (resourceTypes == "oic.r.light")
                 {
                     curResource = resource;
                     // Call a local function which will internally invoke get API on the resource pointer

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp b/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp
index 79821d5..fd10d70 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp
@@ -64,7 +64,7 @@ void DISensorBundleActivator::deactivateBundle()
 
 void DISensorBundleActivator::createResource(resourceInfo resourceInfo)
 {
-    if (resourceInfo.resourceType == "oic.softsensor")
+    if (resourceInfo.resourceType == "oic.r.sensor")
     {
         static int discomfortIndexSensorCount = 1;
 
@@ -104,7 +104,7 @@ void DISensorBundleActivator::destroyResource(BundleResource *resource)
 }
 
 extern "C" void disensor_externalActivateBundle(ResourceContainerBundleAPI *resourceContainer,
-                                       std::string bundleId)
+        std::string bundleId)
 {
     bundle = new DISensorBundleActivator();
     bundle->activateBundle(resourceContainer, bundleId);

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h b/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h
index b1107b6..f47a1be 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h
+++ b/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h
@@ -34,8 +34,8 @@
 #define COAP_MODE               OC::ModeType::Server
 #define COAP_SRVTYPE            OC::ServiceType::InProc
 
-#define RESOURCE_TYPE_NAME_TEMP          "oic.sensor.temperature"
-#define RESOURCE_TYPE_NAME_HUMID          "oic.sensor.humidity"
+#define RESOURCE_TYPE_NAME_TEMP          "oic.r.temperature"
+#define RESOURCE_TYPE_NAME_HUMID          "oic.r.humidity"
 
 // Forward declaring the entityHandler
 

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h b/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h
index 9b4424b..611b0e0 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h
+++ b/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h
@@ -34,8 +34,8 @@
 #define COAP_MODE               OC::ModeType::Server
 #define COAP_SRVTYPE            OC::ServiceType::InProc
 
-#define RESOURCE_TYPE_NAME_TEMP          "oic.sensor.temperature"
-#define RESOURCE_TYPE_NAME_HUMID          "oic.sensor.humidity"
+#define RESOURCE_TYPE_NAME_TEMP          "oic.r.temperature"
+#define RESOURCE_TYPE_NAME_HUMID          "oic.r.humidity"
 
 
 class TemphumidResource

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp b/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp
index 67b364f..a7348f0 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp
@@ -75,7 +75,7 @@ void HueSampleBundleActivator::deactivateBundle()
 void HueSampleBundleActivator::createResource(resourceInfo resourceInfo)
 {
 
-    if (resourceInfo.resourceType == "oic.light.control")
+    if (resourceInfo.resourceType == "oic.r.light")
     {
         static int lightCount = 1;
         HueLight *hueLight = new HueLight(m_connector, resourceInfo.address);
@@ -107,7 +107,7 @@ void HueSampleBundleActivator::destroyResource(BundleResource *pBundleResource)
 }
 
 extern "C" void huesample_externalActivateBundle(ResourceContainerBundleAPI *resourceContainer,
-                                       std::string bundleId)
+        std::string bundleId)
 {
     bundle = new HueSampleBundleActivator();
     bundle->activateBundle(resourceContainer, bundleId);

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml b/service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml
index 96d9044..a8548a1 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml
+++ b/service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<container>      
+<container>    
     <bundle>
         <id>oic.bundle.discomfortIndexSensor</id>
         <path>libDISensorBundle.so</path>
@@ -8,7 +8,7 @@
         <resources>
             <resourceInfo>
                 <name>DiscomfortIndexSensor1</name>
-                <resourceType>oic.softsensor</resourceType>
+                <resourceType>oic.r.sensor</resourceType>
                 <outputs>
                     <output>
                         <name>discomfortIndex</name>
@@ -27,12 +27,12 @@
                     <input>
                         <name>humidity</name>
                         <type>double</type>
-                        <resourceType>oic.sensor.humidity</resourceType>
+                        <resourceType>oic.r.humidity</resourceType>
                     </input>
                     <input>
                         <name>temperature</name>
                         <type>double</type>
-                        <resourceType>oic.sensor.temperature</resourceType>
+                        <resourceType>oic.r.temperature</resourceType>
                     </input>
                 </inputs>
             </resourceInfo>       
@@ -47,7 +47,7 @@
         <resources>
             <resourceInfo>
                 <name>BMISensor1</name>
-                <resourceType>oic.softsensor</resourceType>
+                <resourceType>oic.r.sensor</resourceType>
                 <outputs>
                     <output>
                         <name>BMIresult</name>
@@ -58,13 +58,13 @@
                     <input>
                         <name>weight</name>
                         <type>double</type>
-                        <resourceType>oic.sensor.weight</resourceType>
+                        <resourceType>oic.r.sensor.weight</resourceType>
                         <resourceUri>/Thing_WeightSensor</resourceUri>
                     </input>
                     <input>
                         <name>height</name>
                         <type>double</type>
-                        <resourceType>oic.sensor.height</resourceType>
+                        <resourceType>oic.r.sensor.height</resourceType>
                         <resourceUri>/Thing_HeightSensor</resourceUri>
                     </input>
                 </inputs>
@@ -80,7 +80,7 @@
         <resources>
             <resourceInfo>
                 <name>light</name>
-                <resourceType>oic.light.control</resourceType>
+                <resourceType>oic.r.light</resourceType>
                 <address>http://192.168.0.2/api/newdeveloper/lights/1</address>
             </resourceInfo>       
         </resources>
@@ -97,10 +97,10 @@
             <resourceInfo>
                 <name>light</name>
                 <uri>light/1</uri>
-                <resourceType>oic.light.control</resourceType>
+                <resourceType>oic.r.light</resourceType>
                 <address>http://192.168.0.2/api/newdeveloper/lights/1</address>
             </resourceInfo>       
         </resources>
     </bundle>
     -->
-</container>
+</container>
\ No newline at end of file

diff --git a/service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp b/service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp
index a95f408..a4ec65c 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp
@@ -29,6 +29,7 @@ DiscoverResourceUnit::DiscoverResourceUnit(const std::string &bundleId)
 {
     pUpdatedCB = nullptr;
     isStartedDiscovery = false;
+    discoveryTask = nullptr;
 
     pUpdatedCBFromServer = std::bind(&DiscoverResourceUnit::onUpdate, this,
                                      std::placeholders::_1, std::placeholders::_2);
@@ -37,6 +38,7 @@ DiscoverResourceUnit::DiscoverResourceUnit(const std::string &bundleId)
 DiscoverResourceUnit::~DiscoverResourceUnit()
 {
     pUpdatedCB = nullptr;
+    discoveryTask = nullptr;
     pUpdatedCBFromServer = nullptr;
 
     m_vecRemoteResource.clear();
@@ -69,7 +71,7 @@ void DiscoverResourceUnit::startDiscover(DiscoverResourceInfo info, UpdatedCB up
         }
 
         discoveryTask = RCSDiscoveryManager::getInstance()->discoverResourceByType(
-                RCSAddress::multicast(), m_ResourceType, pDiscoveredCB);
+                            RCSAddress::multicast(), m_ResourceType, pDiscoveredCB);
     }
     catch (RCSInvalidParameterException &e)
     {
@@ -175,4 +177,4 @@ bool DiscoverResourceUnit::isAlreadyDiscoveredResource(
         }
     }
     return false;
-}
\ No newline at end of file
+}

diff --git a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp b/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
index d0321be..2fa3407 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
@@ -175,13 +175,13 @@ namespace OIC
                      std::string(m_bundles[id]->getID()).c_str());
             activationLock.lock();
             auto f = std::bind(&ResourceContainerImpl::activateBundleThread, this,
-                                                       id);
+                               id);
             boost::thread activator(f);
             activator.timed_join(boost::posix_time::seconds(BUNDLE_SET_GET_WAIT_SEC));
             activationLock.unlock();
             OC_LOG_V(INFO, CONTAINER_TAG, "Bundle activated: (%s)",
                      std::string(m_bundles[id]->getID()).c_str());
-}
+        }
 
         void ResourceContainerImpl::deactivateBundle(const std::string &id)
         {
@@ -276,8 +276,6 @@ namespace OIC
                     m_mapResources[strUri] = resource;
                     m_mapBundleResources[resource->m_bundleId].push_back(strUri);
 
-                    resource->registerObserver(this);
-
                     server->setGetRequestHandler(
                         std::bind(&ResourceContainerImpl::getRequestHandler, this,
                                   std::placeholders::_1, std::placeholders::_2));
@@ -426,7 +424,7 @@ namespace OIC
         RCSResourceObject::Ptr ResourceContainerImpl::buildResourceObject(const std::string &strUri,
                 const std::string &strResourceType)
         {
-            return RCSResourceObject::Builder(strUri, strResourceType, "DEFAULT_INTERFACE").setObservable(
+            return RCSResourceObject::Builder(strUri, strResourceType, "oic.if.baseline").setObservable(
                        true).setDiscoverable(true).build();
         }
 
@@ -794,7 +792,7 @@ namespace OIC
         void ResourceContainerImpl::activateBundleThread(const std::string &id)
         {
             OC_LOG_V(INFO, CONTAINER_TAG, "Activating bundle: (%s)",
-                    std::string(m_bundles[id]->getID()).c_str());
+                     std::string(m_bundles[id]->getID()).c_str());
 
             if (m_bundles[id]->getJavaBundle())
             {
@@ -808,7 +806,7 @@ namespace OIC
             }
 
             OC_LOG_V(INFO, CONTAINER_TAG, "Bundle activated: (%s)",
-                    std::string(m_bundles[id]->getID()).c_str());
+                     std::string(m_bundles[id]->getID()).c_str());
         }
 
 #if(JAVA_SUPPORT)

diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
index 737cc04..b37d384 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
@@ -237,7 +237,7 @@ TEST_F(ResourceContainerTest, AddAndRemoveSoBundleResource)
 {
     std::list<string> resources;
     std::map<string, string> resourceParams;
-    resourceParams["resourceType"] = "oic.test";
+    resourceParams["resourceType"] = "container.test";
 
     m_pResourceContainer->startContainer(m_strConfigPath);
     resources = m_pResourceContainer->listBundleResources("oic.bundle.test");
@@ -286,7 +286,7 @@ class ResourceContainerBundleAPITest: public TestWithMock
             m_pBundleResource = new TestBundleResource();
             m_pBundleResource->m_bundleId = "oic.bundle.test";
             m_pBundleResource->m_uri = "/test_resource";
-            m_pBundleResource->m_resourceType = "oic.test";
+            m_pBundleResource->m_resourceType = "container.test";
         }
 };
 
@@ -295,7 +295,7 @@ TEST_F(ResourceContainerBundleAPITest, ResourceServerCreatedWhenRegisterResource
     m_pBundleResource = new TestBundleResource();
     m_pBundleResource->m_bundleId = "oic.bundle.test";
     m_pBundleResource->m_uri = "/test_resource/test";
-    m_pBundleResource->m_resourceType = "oic.test";
+    m_pBundleResource->m_resourceType = "container.test";
 
     mocks.ExpectCallFunc(ResourceContainerImpl::buildResourceObject).With(m_pBundleResource->m_uri,
             m_pBundleResource->m_resourceType).Return(nullptr);
@@ -381,7 +381,7 @@ TEST_F(ResourceContainerBundleAPITest, BundleResourceConfigurationListParsed)
     result = *resourceConfig.begin();
 
     EXPECT_STREQ("test_resource", result.name.c_str());
-    EXPECT_STREQ("oic.test", result.resourceType.c_str());
+    EXPECT_STREQ("container.test", result.resourceType.c_str());
 
     ((ResourceContainerImpl *)m_pResourceContainer)->stopContainer();
 }
@@ -553,6 +553,7 @@ TEST_F(ResourceContainerImplTest, SoBundleDeactivatedWithBundleID)
     EXPECT_FALSE(((BundleInfoInternal *)m_pBundleInfo)->isActivated());
 }
 
+
 /* Test for Configuration */
 TEST(ConfigurationTest, ConfigFileLoadedWithValidPath)
 {
@@ -564,6 +565,8 @@ TEST(ConfigurationTest, ConfigFileLoadedWithValidPath)
     Configuration *config = new Configuration(strConfigPath);
 
     EXPECT_TRUE(config->isLoaded());
+
+    delete config;
 }
 
 TEST(ConfigurationTest, ConfigFileNotLoadedWithInvalidPath)
@@ -571,6 +574,8 @@ TEST(ConfigurationTest, ConfigFileNotLoadedWithInvalidPath)
     Configuration *config = new Configuration("InvalidPath");
 
     EXPECT_FALSE(config->isLoaded());
+
+    delete config;
 }
 
 TEST(ConfigurationTest, BundleConfigurationListParsed)
@@ -592,6 +597,8 @@ TEST(ConfigurationTest, BundleConfigurationListParsed)
     EXPECT_STREQ("oic.bundle.test", results["id"].c_str());
     EXPECT_STREQ("libTestBundle.so", results["path"].c_str());
     EXPECT_STREQ("1.0.0", results["version"].c_str());
+
+    delete config;
 }
 
 TEST(ConfigurationTest, BundleConfigurationParsedWithValidBundleId)
@@ -613,6 +620,8 @@ TEST(ConfigurationTest, BundleConfigurationParsedWithValidBundleId)
     EXPECT_STREQ("oic.bundle.test", results["id"].c_str());
     EXPECT_STREQ("libTestBundle.so", results["path"].c_str());
     EXPECT_STREQ("1.0.0", results["version"].c_str());
+
+    delete config;
 }
 
 TEST(ConfigurationTest, BundleConfigurationNotParsedWithInvalidBundleId)
@@ -628,6 +637,8 @@ TEST(ConfigurationTest, BundleConfigurationNotParsedWithInvalidBundleId)
     config->getBundleConfiguration("test", &bundles);
 
     EXPECT_TRUE(bundles.empty());
+
+    delete config;
 }
 
 TEST(ConfigurationTest, BundleResourceConfigurationListParsed)
@@ -647,7 +658,9 @@ TEST(ConfigurationTest, BundleResourceConfigurationListParsed)
     result = *resourceConfig.begin();
 
     EXPECT_STREQ("test_resource", result.name.c_str());
-    EXPECT_STREQ("oic.test", result.resourceType.c_str());
+    EXPECT_STREQ("container.test", result.resourceType.c_str());
+
+    delete config;
 }
 
 TEST(ConfigurationTest, BundleResourceConfigurationNotParsedWithInvalidBundleId)
@@ -664,6 +677,8 @@ TEST(ConfigurationTest, BundleResourceConfigurationNotParsedWithInvalidBundleId)
     config->getResourceConfiguration("test", &resourceConfig);
 
     EXPECT_TRUE(bundles.empty());
+
+    delete config;
 }
 
 namespace

diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml
index acac564..3a31861 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml
+++ b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml
@@ -9,8 +9,8 @@
                <resources>
                        <resourceInfo>
                                <name>test_resource</name>
-                               <resourceType>oic.test</resourceType>
+                               <resourceType>container.test</resourceType>
                        </resourceInfo>   
                </resources>
     </bundle>
-</container>
+</container>
\ No newline at end of file

diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h
index 364f5b1..4d2cf9f 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h
+++ b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h
@@ -58,7 +58,7 @@ class ResourceContainerTestSimulator
               mutexForDiscovery(),
               MULTICASTURI("/oic/res"),
               RESOURCEURI("/a/TempHumSensor/Container"),
-              RESOURCETYPE("Resource.Container"),
+              RESOURCETYPE("resource.container"),
               RESOURCEINTERFACE("oic.if.baseline"),
               ATTR_KEY("Temperature"),
               ATTR_VALUE(0)
@@ -145,9 +145,9 @@ class ResourceContainerTestSimulator
             try
             {
                 discoveryTask = RCSDiscoveryManager::getInstance()->discoverResourceByType(
-                        RCSAddress::multicast(), MULTICASTURI, resourceType,
-                        std::bind(onDiscoveryResource, std::placeholders::_1,
-                           std::weak_ptr<ResourceContainerTestSimulator>(shared_from_this())));
+                                    RCSAddress::multicast(), MULTICASTURI, resourceType,
+                                    std::bind(onDiscoveryResource, std::placeholders::_1,
+                                              std::weak_ptr<ResourceContainerTestSimulator>(shared_from_this())));
                 mutexForDiscovery.lock();
             }
             catch (std::exception &e)