From 7c45b53fd841a92345967e44d95e3189d84bf32e Mon Sep 17 00:00:00 2001 From: Minji Park Date: Tue, 8 Mar 2016 13:38:54 +0900 Subject: [PATCH] remove build warnings for resource container Change-Id: Ic2216bb76bcd16ac410e78a321b1d92cb3241596 Signed-off-by: Minji Park Reviewed-on: https://gerrit.iotivity.org/gerrit/5533 Reviewed-by: Markus Jung Tested-by: jenkins-iotivity Reviewed-by: JungHo Kim --- .../examples/BMISensorBundle/src/BMISensorResource.cpp | 2 +- service/resource-container/src/BundleResource.cpp | 3 ++- service/resource-container/src/Configuration.cpp | 3 +++ .../unittests/ResourceContainerTest.cpp | 16 ++++++++-------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/service/resource-container/examples/BMISensorBundle/src/BMISensorResource.cpp b/service/resource-container/examples/BMISensorBundle/src/BMISensorResource.cpp index 13cdc57..899def0 100644 --- a/service/resource-container/examples/BMISensorBundle/src/BMISensorResource.cpp +++ b/service/resource-container/examples/BMISensorBundle/src/BMISensorResource.cpp @@ -47,7 +47,7 @@ void BMISensorResource::executeLogic() std::string strBMIResult; if (m_pBMISensor->executeBMISensorLogic(&m_mapInputData, &strBMIResult) != -1) - setAttribute("BMIresult", RCSResourceAttributes::Value(strBMIResult.c_str())), true; + setAttribute("BMIresult", RCSResourceAttributes::Value(strBMIResult.c_str())); } void BMISensorResource::onUpdatedInputResource(const std::string attributeName, diff --git a/service/resource-container/src/BundleResource.cpp b/service/resource-container/src/BundleResource.cpp index 2a779ba..5b38edc 100644 --- a/service/resource-container/src/BundleResource.cpp +++ b/service/resource-container/src/BundleResource.cpp @@ -73,7 +73,8 @@ namespace OIC { std::lock_guard lock(m_resourceAttributes_mutex); - for (auto &it : m_resourceAttributes){ + for (auto &it : attrs) + { OIC_LOG_V(INFO, CONTAINER_TAG, "set attribute \(%s)'", std::string(it.key() + "\', with " + it.value().toString()).c_str()); diff --git a/service/resource-container/src/Configuration.cpp b/service/resource-container/src/Configuration.cpp index 13bb113..82a58a2 100644 --- a/service/resource-container/src/Configuration.cpp +++ b/service/resource-container/src/Configuration.cpp @@ -235,7 +235,10 @@ namespace OIC strValue = item->value(); if (!strKey.compare(OUTPUT_RESOURCE_NAME)) + { + if (trim_both(strValue).compare(resourceName) != 0) break; resourceInfoOut->name = trim_both(strValue); + } else if (!strKey.compare(OUTPUT_RESOURCE_URI)) resourceInfoOut->uri = trim_both(strValue); diff --git a/service/resource-container/unittests/ResourceContainerTest.cpp b/service/resource-container/unittests/ResourceContainerTest.cpp index 928508d..fe5ca74 100644 --- a/service/resource-container/unittests/ResourceContainerTest.cpp +++ b/service/resource-container/unittests/ResourceContainerTest.cpp @@ -210,27 +210,27 @@ TEST_F(ResourceContainerTest, TestBundleResource) testResource.handleSetAttributesRequest(fullAttributes); - EXPECT_EQ(3, testResource.getAttributeNames().size()); + EXPECT_EQ((unsigned int) 3, testResource.getAttributeNames().size()); - EXPECT_EQ(3, testResource.handleGetAttributesRequest().size()); + EXPECT_EQ((unsigned int) 3, testResource.handleGetAttributesRequest().size()); std::string testString = "test"; - testResource.setAttribute("attrib1", testString, false); + testResource.setAttribute("attrib1", RCSResourceAttributes::Value(testString), false); testResource.setAttributes(fullAttributes, false); - EXPECT_STREQ("\"test\"", testResource.getAttribute("attrib1").toString().c_str()); - EXPECT_EQ(1, testResource.getAttribute("attrib2")); + EXPECT_STREQ("\"test2\"", testResource.getAttribute("attrib1").toString().c_str()); + EXPECT_EQ(2, testResource.getAttribute("attrib2")); - testResource.setAttribute("attrib1", "test"); + testResource.setAttribute("attrib1", RCSResourceAttributes::Value("test")); EXPECT_STREQ("\"test\"", testResource.getAttribute("attrib1").toString().c_str()); - EXPECT_EQ(1, testResource.getAttribute("attrib2")); + EXPECT_EQ(2, testResource.getAttribute("attrib2")); } TEST_F(ResourceContainerTest, TestSoftSensorResource) { TestSoftSensorResource softSensorResource; softSensorResource.initAttributes(); - EXPECT_EQ(0, softSensorResource.getAttributeNames().size()); + EXPECT_EQ((unsigned int) 0, softSensorResource.getAttributeNames().size()); } -- 2.7.4