Cleanup the test code

Change-Id: If98b88f8531192bfe34e3835ad713935c24ec8ba
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/include/TestAPI.h b/include/ContextStore.h
similarity index 91%
rename from include/TestAPI.h
rename to include/ContextStore.h
index 66b9257..e68578a 100644 (file)
--- a/include/TestAPI.h
+++ b/include/ContextStore.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __CONTEXT_STORE_TEST_API_H__
-#define __CONTEXT_STORE_TEST_API_H__
+#ifndef __CONTEXT_STORE_H__
+#define __CONTEXT_STORE_H__
 
 #include <ContextStoreTypes.h>
 
@@ -24,6 +24,7 @@ extern "C"
 {
 #endif
 
+/* TEST CODE */
 int context_store_test();
 
 #ifdef __cplusplus

diff --git a/src/client-dummy/TestAPI.cpp b/src/client-dummy/ContextStore.cpp
similarity index 96%
rename from src/client-dummy/TestAPI.cpp
rename to src/client-dummy/ContextStore.cpp
index cc3040d..c526a34 100644 (file)
--- a/src/client-dummy/TestAPI.cpp
+++ b/src/client-dummy/ContextStore.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <ContextStoreTypesPrivate.h>
-#include <TestAPI.h>
+#include <ContextStore.h>
 
 using namespace ctx;
 

diff --git a/src/client/TestAPI.cpp b/src/client/ContextStore.cpp
similarity index 93%
rename from src/client/TestAPI.cpp
rename to src/client/ContextStore.cpp
index cf90d18..97f42ab 100644 (file)
--- a/src/client/TestAPI.cpp
+++ b/src/client/ContextStore.cpp
@@ -16,7 +16,7 @@
 
 #include <ContextStoreTypesPrivate.h>
 #include <DBusClient.h>
-#include <TestAPI.h>
+#include <ContextStore.h>
 
 using namespace ctx;
 
@@ -32,5 +32,8 @@ EXPORT_API int context_store_test()
 
        _I(YELLOW("Return: %d (%s)"), err, CTX_ERROR_STR(err));
 
+       if (output)
+               g_variant_unref(output);
+
        return err;
 }

diff --git a/src/server/ContextStoreClientProxy.cpp b/src/server/ContextStoreClientProxy.cpp
index bf86158..d4ea4b1 100644 (file)
--- a/src/server/ContextStoreClientProxy.cpp
+++ b/src/server/ContextStoreClientProxy.cpp
@@ -31,12 +31,7 @@ ContextStoreClientProxy::~ContextStoreClientProxy()
 
 void ContextStoreClientProxy::onMethodCalled(MethodCall* methodCall)
 {
-       /* TODO: Remove this test code */
-       char* param = g_variant_print(methodCall->getParam(), FALSE);
-       _I("Caller: %s, Method: %s", methodCall->getSender()->getBusName().c_str(), methodCall->getMethodName().c_str());
-       _I("Parameters: %s", param);
-       g_free(param);
-       methodCall->reply(E_FAILED);
+       // 'methodCall' should be deleted.
        delete methodCall;
 }