remove not use things : app_id, uid, ecore_init

Reference apps which use this library will launch by app manager, no more daemon.
So, this library does not use ecore init and quit for launching app.
Also, it does not register tidl by app_id and does not need uid.
This patch remove those things and tests.
The tests will be recreated following new functions creation.

Change-Id: If3779ca3d9d8f92b2a6736a0811293aa19390187

diff --git a/src/mmi-ipc.c b/src/mmi-ipc.c
index 1b20f80909b6ad1d550abe6f15b9e969fb166e48..7be787ab85ebec5911c7fe4acce760bd139087bb 100644 (file)
--- a/src/mmi-ipc.c
+++ b/src/mmi-ipc.c
@@ -31,9 +31,7 @@
 #include <rpc-port-internal.h>
 
 static rpc_port_proxy_mmi_h _rpc_h;
-static const char* _appid = "";
 static const char* _stub_appid = "mmi-manager";
-static uid_t _uid = -1;
 static int _connected = 0;
 static mmi_state _state = MMI_STATE_NONE;
 
@@ -49,24 +47,12 @@ mmi_ipc_get_state(void)
        return _state;
 }
 
-int
-mmi_ipc_get_uid(void)
-{
-       return _uid;
-}
-
 bool
 mmi_ipc_is_connected(void)
 {
        return _connected ? true : false;
 }
 
-const char *
-mmi_ipc_get_appid(void)
-{
-       return _appid;
-}
-
 const char *
 mmi_ipc_get_stub_appid(void)
 {
@@ -119,25 +105,11 @@ static void _on_rejected(rpc_port_proxy_mmi_h h, void *user_data)
 }
 
 int
-mmi_ipc_init(const char *appid)
+mmi_ipc_init(void)
 {
        /* initialize handles */
        _rpc_h = NULL;
-
-
-       _uid = tzplatform_getuid(TZ_SYS_DEFAULT_USER);
-       LOGI("uid=%d\n", _uid);
-
-       rpc_port_set_target_uid(_uid);
-
-       int r = rpc_port_register_proc_info(appid, NULL);
-       if (r != RPC_PORT_ERROR_NONE)
-       {
-               LOGE("Failed to register proc info ! (error:%d)\n", r);
-               goto err;
-       }
-
-       _appid = appid;
+       int r;
 
        rpc_port_proxy_mmi_callback_s callback = {
                .connected = _on_connected,
@@ -167,7 +139,6 @@ err:
        rpc_port_deregister_proc_info();
 
        _rpc_h = NULL;
-       _uid = -1;
        return -1;
 }
 
@@ -181,8 +152,6 @@ mmi_ipc_shutdown(void)
        rpc_port_deregister_proc_info();
        _rpc_h = NULL;
 
-       _appid = "";
-       _uid = -1;
        _state = MMI_STATE_NONE;
        _connected = 0;
 }

diff --git a/src/mmi-ipc.h b/src/mmi-ipc.h
index 95d253905c31d1e83bfb0633e20d4149233e6c37..6cbb68576fc877e4683fa0d82a0e5957e2ef4502 100644 (file)
--- a/src/mmi-ipc.h
+++ b/src/mmi-ipc.h
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-int mmi_ipc_init(const char *appid);
+int mmi_ipc_init(void);
 void mmi_ipc_shutdown(void);
 
 rpc_port_proxy_mmi_h mmi_ipc_get_rpc_h(void);

diff --git a/src/mmi.c b/src/mmi.c
index 200ab4d36d52e98b3a75d3879327cdcd5b21f948..8832ed54eedb2d101172d88a3005bf166c7fbd4d 100644 (file)
--- a/src/mmi.c
+++ b/src/mmi.c
@@ -32,31 +32,17 @@ static int _mmi_init_count = 0;
 MMI_API int
 mmi_init(void)
 {
-       if (++_mmi_init_count != 1)
-               return _mmi_init_count;
-
-       ecore_init();
-
-       return _mmi_init_count;
+       return 1;
 }
 
 MMI_API int
 mmi_shutdown(void)
 {
-       if (_mmi_init_count <= 0)
-       {
-               ERR("Init count must be greater than 0.");
-               return 0;
-       }
-
-       _mmi_init_count--;
-
-       ecore_main_loop_quit();
-       return _mmi_init_count;
+       return 0;
 }
 
 MMI_API mmi_handle
-mmi_instance_create(const char *app_id)
+mmi_instance_create(void)
 {
        mmi_handle h = NULL;
 
@@ -68,16 +54,14 @@ mmi_instance_create(const char *app_id)
                return NULL;
        }
 
-       if (mmi_ipc_init(app_id))
+       if (mmi_ipc_init())
        {
                ERR("Failed to init mmi ipc !\n");
                goto err;
        }
 
        h->rpc_h = mmi_ipc_get_rpc_h();
-       h->app_id = mmi_ipc_get_appid();
        h->stub_appid = mmi_ipc_get_stub_appid();
-       h->uid = mmi_ipc_get_uid();
        h->state = mmi_ipc_get_state();
 
        return h;

diff --git a/src/mmi.h b/src/mmi.h
index a8d845b61373e42b40e11105bd4a31a6a23706ca..b100f20b846169b300d330f2c81d9081054db4a4 100644 (file)
--- a/src/mmi.h
+++ b/src/mmi.h
@@ -24,13 +24,11 @@
 #ifndef __MMI_H__
 #define __MMI_H__
 
-#include <Ecore.h>
 #include <mmi-event-types.h>
 
 #define MMI_API __attribute__ ((visibility("default")))
 
 typedef void* mmi_rpc_h;
-typedef Eina_Bool mmi_bool;
 
 typedef enum
 {
@@ -47,9 +45,7 @@ typedef enum
 typedef struct
 {
        mmi_rpc_h rpc_h;
-       const char *app_id;
        const char *stub_appid;
-       int uid;
        int state;
 } mmi_struct;
 
@@ -61,7 +57,7 @@ extern "C" {
 
 MMI_API int mmi_init(void);
 MMI_API int mmi_shutdown(void);
-MMI_API mmi_handle mmi_instance_create(const char *app_id);
+MMI_API mmi_handle mmi_instance_create(void);
 MMI_API void mmi_instance_destroy(mmi_handle *h);
 
 #ifdef __cplusplus

diff --git a/tests/mmi-ipc-test.cpp b/tests/mmi-ipc-test.cpp
index 5a023ce7221a1b4577a69a4824454c93c870aede..eedff15ae8596b0ecae7ceec0db390ba1350475c 100644 (file)
--- a/tests/mmi-ipc-test.cpp
+++ b/tests/mmi-ipc-test.cpp
@@ -33,25 +33,20 @@ class MMIIpcTest : public ::testing::Test
 public:
        void SetUp(void) override
        {
+               ecore_init();
        }
 
        void TearDown(void) override
        {
+               ecore_shutdown();
        }
 };
 
 TEST_F(MMIIpcTest, MMIFWIpcInitSuccess)
 {
        int res = mmi_init();
-       const char *app_id = "org.tizen.mmi-system-ux-test";
-       int ipc_init_res = mmi_ipc_init(app_id);
 
-       EXPECT_EQ(ipc_init_res, 0);
-
-       if(ipc_init_res == 0)
-       {
-               mmi_ipc_shutdown();
-       }
+       EXPECT_EQ(res, 1);
 
        if(res)
                mmi_shutdown();
@@ -60,79 +55,9 @@ TEST_F(MMIIpcTest, MMIFWIpcInitSuccess)
 TEST_F(MMIIpcTest, MMIIpcInitFail)
 {
        int res = mmi_init();
-       const char *app_id = NULL;
-       int ipc_init_res = mmi_ipc_init(app_id);
-
-       EXPECT_NE(ipc_init_res, 0);
-
-       if(ipc_init_res == 0)
-       {
-               mmi_ipc_shutdown();
-       }
-
-       if(res)
-               mmi_shutdown();
-}
-
-TEST_F(MMIIpcTest, MMIIpcGetVariableBeforeInit)
-{
-       int res = mmi_init();
-       const char *app_id = "org.tizen.mmi-system-ux-test";
-
-       EXPECT_FALSE(mmi_ipc_is_connected());
-
-       rpc_port_proxy_mmi_h rpc_res = mmi_ipc_get_rpc_h();
-       EXPECT_EQ(rpc_res, nullptr);
-
-       mmi_state state_res = mmi_ipc_get_state();
-       EXPECT_EQ(state_res, MMI_STATE_NONE);
-
-       int uid_res = mmi_ipc_get_uid();
-       EXPECT_EQ(uid_res, -1);
-
-       EXPECT_NE(mmi_ipc_get_appid(), app_id);
-
-       if(res)
-               mmi_shutdown();
-}
-
-TEST_F(MMIIpcTest, MMIFWIpcGetVariableAfterInit)
-{
-       int res = mmi_init();
-       const char *app_id = "org.tizen.mmi-system-ux-test";
-       mmi_handle h = mmi_instance_create(app_id);
-
-       EXPECT_NE(h, nullptr);
 
-       wait_for_connect();
-
-       EXPECT_TRUE(mmi_ipc_is_connected());
-
-       if(h)
-       {
-               rpc_port_proxy_mmi_h rpc_res = mmi_ipc_get_rpc_h();
-               EXPECT_NE(rpc_res, nullptr);
-               EXPECT_EQ(rpc_res, h->rpc_h);
-
-               mmi_state state_res = mmi_ipc_get_state();
-               EXPECT_EQ(state_res, h->state);
-
-               int uid_res = mmi_ipc_get_uid();
-               EXPECT_NE(uid_res, -1);
-               EXPECT_EQ(uid_res, h->uid);
-
-               EXPECT_EQ(mmi_ipc_get_appid(), app_id);
-               EXPECT_EQ(mmi_ipc_get_appid(), h->app_id);
-               EXPECT_EQ(mmi_ipc_get_stub_appid(), h->stub_appid);
-       }
-
-       if(h)
-       {
-               mmi_instance_destroy(&h);
-               EXPECT_EQ(h, nullptr);
-       }
+       EXPECT_EQ(res, 1);
 
        if(res)
                mmi_shutdown();
 }
-

diff --git a/tests/mmi-main-test.cpp b/tests/mmi-main-test.cpp
index d6b5f09e85a1506ede99e943a46d3e050f7e367d..e581fb0588bb487bb375da1bc697fdfdaecac00a 100644 (file)
--- a/tests/mmi-main-test.cpp
+++ b/tests/mmi-main-test.cpp
@@ -33,10 +33,12 @@ class MMIMainTest : public ::testing::Test
 public:
        void SetUp(void) override
        {
+               ecore_init();
        }
 
        void TearDown(void) override
        {
+               ecore_shutdown();
        }
 };
 
@@ -49,58 +51,3 @@ TEST_F(MMIMainTest, MMIMainInit)
        if(res)
                mmi_shutdown();
 }
-
-TEST_F(MMIMainTest, MMIMainInstanceCreateDestroySuccess)
-{
-       int res = mmi_init();
-       const char *app_id = "org.tizen.mmi-system-ux-test";
-       mmi_handle h = mmi_instance_create(app_id);
-
-       EXPECT_NE(h, nullptr);
-
-       if(h){
-               mmi_instance_destroy(&h);
-               EXPECT_EQ(h, nullptr);
-       }
-
-       if(res)
-               mmi_shutdown();
-}
-
-TEST_F(MMIMainTest, MMIMainInstanceCreateAndConnectSuccess)
-{
-       int res = mmi_init();
-       const char *app_id = "org.tizen.mmi-system-ux-test";
-       mmi_handle h = mmi_instance_create(app_id);
-
-       EXPECT_NE(h, nullptr);
-
-       wait_for_connect();
-
-       EXPECT_TRUE(mmi_ipc_is_connected());
-
-       if(h){
-               mmi_instance_destroy(&h);
-               EXPECT_EQ(h, nullptr);
-       }
-
-       if(res)
-               mmi_shutdown();
-}
-
-TEST_F(MMIMainTest, MMIMainInstanceCreateFail)
-{
-       int res = mmi_init();
-       const char *app_id = NULL;
-       mmi_handle h = mmi_instance_create(app_id);
-
-       EXPECT_EQ(h, nullptr);
-
-       if(h){
-               mmi_instance_destroy(&h);
-               EXPECT_EQ(h, nullptr);
-       }
-
-       if(res)
-               mmi_shutdown();
-}