Modify server resource to make the class mockable

Change-Id: Ie55f6db28183f99aab19df9c3af8b7cbea7c9a81
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1452
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/modules/serverBuilder/include/PrimitiveServerResource.h b/service/resource-manipulation/modules/serverBuilder/include/PrimitiveServerResource.h
index d537b54..e2b49ce 100644 (file)
--- a/service/resource-manipulation/modules/serverBuilder/include/PrimitiveServerResource.h
+++ b/service/resource-manipulation/modules/serverBuilder/include/PrimitiveServerResource.h
@@ -96,10 +96,10 @@ namespace OIC
 
             class LockGuard;
 
-            typedef std::function< PrimitiveGetResponse(const PrimitiveRequest&,
-                    ResourceAttributes&) > GetRequestHandler;
-            typedef std::function< PrimitiveSetResponse(const PrimitiveRequest&,
-                    ResourceAttributes&) > SetRequestHandler;
+            using GetRequestHandler = std::function< PrimitiveGetResponse(const PrimitiveRequest&,
+                    ResourceAttributes&) >;
+            using SetRequestHandler = std::function< PrimitiveSetResponse(const PrimitiveRequest&,
+                    ResourceAttributes&) >;
 
         public:
             PrimitiveServerResource(PrimitiveServerResource&&) = delete;
@@ -108,7 +108,7 @@ namespace OIC
             PrimitiveServerResource& operator=(PrimitiveServerResource&&) = delete;
             PrimitiveServerResource& operator=(const PrimitiveServerResource&) = delete;
 
-            ~PrimitiveServerResource();
+            virtual ~PrimitiveServerResource();
 
             template< typename T >
             void setAttribute(const std::string& key, const T &value)
@@ -129,13 +129,13 @@ namespace OIC
             ResourceAttributes& getAttributes();
             const ResourceAttributes& getAttributes() const;
 
-            bool isObservable() const;
-            bool isDiscoverable() const;
+            virtual bool isObservable() const;
+            virtual bool isDiscoverable() const;
 
-            void setGetRequestHandler(GetRequestHandler);
-            void setSetRequestHandler(SetRequestHandler);
+            virtual void setGetRequestHandler(GetRequestHandler);
+            virtual void setSetRequestHandler(SetRequestHandler);
 
-            void notify() const;
+            virtual void notify() const;
 
         //    void setAutoNotifyPolicy(AutoNotifyPolicy);
 

diff --git a/service/resource-manipulation/modules/serverBuilder/src/PrimitiveServerResource.cpp b/service/resource-manipulation/modules/serverBuilder/src/PrimitiveServerResource.cpp
index 1201468..dfc89b3 100644 (file)
--- a/service/resource-manipulation/modules/serverBuilder/src/PrimitiveServerResource.cpp
+++ b/service/resource-manipulation/modules/serverBuilder/src/PrimitiveServerResource.cpp
@@ -257,6 +257,10 @@ namespace OIC
                     return handleObserve(request);
                 }
             }
+            catch (const std::exception& e)
+            {
+                OC_LOG_V(WARNING, LOG_TAG, "Failed to handle request : %s", e.what());
+            }
             catch (...)
             {
                 OC_LOG(WARNING, LOG_TAG, "Failed to handle request.");