utc_evas_object_grid_xxxx: Merge TCs to reduce duplicate test operations

Change-Id: Ic87f7ff7886bddbbd3eec437650fae84dea40266

diff --git a/TC/evas/canvas/evas_object_grid/tslist b/TC/evas/canvas/evas_object_grid/tslist
index 4ee9c68967640649359c75640fb010e4c45811ab..23cc14a47bd1bee8ac06cd0f74290657590ce91f 100644 (file)
--- a/TC/evas/canvas/evas_object_grid/tslist
+++ b/TC/evas/canvas/evas_object_grid/tslist
@@ -4,10 +4,8 @@ utc_evas_object_grid_add_to.c
 utc_evas_object_grid_children_get.c
 utc_evas_object_grid_clear.c
 utc_evas_object_grid_iterator_new.c
-utc_evas_object_grid_mirrored_get.c
-utc_evas_object_grid_mirrored_set.c
+utc_evas_object_grid_mirrored_get_set.c
 utc_evas_object_grid_pack.c
 utc_evas_object_grid_pack_get.c
-utc_evas_object_grid_size_get.c
-utc_evas_object_grid_size_set.c
+utc_evas_object_grid_size_get_set.c
 utc_evas_object_grid_unpack.c

diff --git a/TC/evas/canvas/evas_object_grid/tslist_mobile b/TC/evas/canvas/evas_object_grid/tslist_mobile
index 4ee9c68967640649359c75640fb010e4c45811ab..23cc14a47bd1bee8ac06cd0f74290657590ce91f 100644 (file)
--- a/TC/evas/canvas/evas_object_grid/tslist_mobile
+++ b/TC/evas/canvas/evas_object_grid/tslist_mobile
@@ -4,10 +4,8 @@ utc_evas_object_grid_add_to.c
 utc_evas_object_grid_children_get.c
 utc_evas_object_grid_clear.c
 utc_evas_object_grid_iterator_new.c
-utc_evas_object_grid_mirrored_get.c
-utc_evas_object_grid_mirrored_set.c
+utc_evas_object_grid_mirrored_get_set.c
 utc_evas_object_grid_pack.c
 utc_evas_object_grid_pack_get.c
-utc_evas_object_grid_size_get.c
-utc_evas_object_grid_size_set.c
+utc_evas_object_grid_size_get_set.c
 utc_evas_object_grid_unpack.c

diff --git a/TC/evas/canvas/evas_object_grid/tslist_tv b/TC/evas/canvas/evas_object_grid/tslist_tv
index 4ee9c68967640649359c75640fb010e4c45811ab..23cc14a47bd1bee8ac06cd0f74290657590ce91f 100644 (file)
--- a/TC/evas/canvas/evas_object_grid/tslist_tv
+++ b/TC/evas/canvas/evas_object_grid/tslist_tv
@@ -4,10 +4,8 @@ utc_evas_object_grid_add_to.c
 utc_evas_object_grid_children_get.c
 utc_evas_object_grid_clear.c
 utc_evas_object_grid_iterator_new.c
-utc_evas_object_grid_mirrored_get.c
-utc_evas_object_grid_mirrored_set.c
+utc_evas_object_grid_mirrored_get_set.c
 utc_evas_object_grid_pack.c
 utc_evas_object_grid_pack_get.c
-utc_evas_object_grid_size_get.c
-utc_evas_object_grid_size_set.c
+utc_evas_object_grid_size_get_set.c
 utc_evas_object_grid_unpack.c

diff --git a/TC/evas/canvas/evas_object_grid/tslist_wear b/TC/evas/canvas/evas_object_grid/tslist_wear
index 4ee9c68967640649359c75640fb010e4c45811ab..23cc14a47bd1bee8ac06cd0f74290657590ce91f 100644 (file)
--- a/TC/evas/canvas/evas_object_grid/tslist_wear
+++ b/TC/evas/canvas/evas_object_grid/tslist_wear
@@ -4,10 +4,8 @@ utc_evas_object_grid_add_to.c
 utc_evas_object_grid_children_get.c
 utc_evas_object_grid_clear.c
 utc_evas_object_grid_iterator_new.c
-utc_evas_object_grid_mirrored_get.c
-utc_evas_object_grid_mirrored_set.c
+utc_evas_object_grid_mirrored_get_set.c
 utc_evas_object_grid_pack.c
 utc_evas_object_grid_pack_get.c
-utc_evas_object_grid_size_get.c
-utc_evas_object_grid_size_set.c
+utc_evas_object_grid_size_get_set.c
 utc_evas_object_grid_unpack.c

diff --git a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_mirrored_get.c b/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_mirrored_get.c
deleted file mode 100644 (file)
index 1599eac..0000000
--- a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_mirrored_get.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include <check.h>
-
-#include <Ecore.h>
-#include <Evas.h>
-#include <Ecore_Evas.h>
-
-/**
- * @addtogroup evas_object_grid
- * @{
- * @defgroup evas_object_grid_mirrored_get evas_object_grid_mirrored_get()
- *
- * @precondition
- * @step 1 Initialize Ecore_Evas library with ecore_evas_init()
- */
-static void
-setup(void)
-{
-   printf(" ============ Startup ============ \n");
-   ecore_evas_init();
-}
-
-static void
-teardown(void)
-{
-   printf(" ============ Cleanup ============ \n");
-   ecore_evas_shutdown();
-}
-
-/**
- * @addtogroup evas_object_grid_mirrored_get
- * @{
- * @objective Positive test case 01: checks if function get an mirrored
- * attribute of the grid.
- * @n Input Data: pointer to Evas object.
- *
- * @procedure
- * @step 1 Create new Ecore_Evas
- * @step 2 Get pointer to Evas from created Ecore_Evas
- * @step 3 Get pointer to Evas Object from getted Evas
- * @step 4 Set mirrored atribute to EINA_TRUE
- * @step 5 Call tested function
- *
- * @passcondition Function do not make segfault and returns set below value of mirrored mode.
- * @}
- */
-START_TEST(utc_evas_object_grid_mirrored_get_p_1)
-{
-   Ecore_Evas *ee = ecore_evas_buffer_new(1, 1);
-   Evas *evas = ecore_evas_get(ee);
-   Evas_Object *obj = evas_object_grid_add(evas);
-
-   evas_object_grid_mirrored_set(obj, EINA_TRUE);
-   Eina_Bool isMirrored = evas_object_grid_mirrored_get(obj);
-   if (isMirrored)
-     {
-        printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-        ecore_evas_free(ee);
-        return;
-     }
-   ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
-   ecore_evas_free(ee);
-}
-END_TEST
-
-/**
- * @addtogroup evas_object_grid_mirrored_get
- * @{
- * @objective Positive test case 02: checks if function get an mirrored
- * attribute of the grid.
- * @n Input Data: pointer to Evas object.
- *
- * @procedure
- * @step 1 Create new Ecore_Evas
- * @step 2 Get pointer to Evas from created Ecore_Evas
- * @step 3 Get pointer to Evas Object from getted Evas
- * @step 4 Set mirrored atribute to EINA_FALSE
- * @step 5 Call tested function
- *
- * @passcondition Function do not make segfault and returns set below value of mirrored mode.
- * @}
- */
-START_TEST(utc_evas_object_grid_mirrored_get_p_2)
-{
-   Ecore_Evas *ee = ecore_evas_buffer_new(1, 1);
-   Evas *evas = ecore_evas_get(ee);
-   Evas_Object *obj = evas_object_grid_add(evas);
-
-   evas_object_grid_mirrored_set(obj, EINA_FALSE);
-   Eina_Bool isMirrored = evas_object_grid_mirrored_get(obj);
-   if (!isMirrored)
-     {
-        printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-        ecore_evas_free(ee);
-        return;
-     }
-   ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
-   ecore_evas_free(ee);
-}
-END_TEST
-#ifdef NOT_APPROVED_FOR_BUILD
-
-/**
- * @addtogroup evas_object_grid_mirrored_get
- * @{
- * @objective Negative test case 01: checks if function doesn't cause segmentation fault
- * and returns EINA_FALSE if it is called with NULL instead of pointer to Evas Object.
- * @n Input Data: NULL as pointer to Evas.
- *
- * @procedure
- * @step 1 Call function and pass NULL instead of it's argument.
- *
- * @passcondition Function doesn't cause segmentation fault and returns EINA_FALSE.
- * @}
- */
-START_TEST(utc_evas_object_grid_mirrored_get_n_1)
-{
-   Eina_Bool isMirrored = evas_object_grid_mirrored_get(NULL);
-   if (isMirrored)
-     {
-        ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
-        return;
-     }
-   printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-}
-END_TEST
-#endif
-/**
- * @}
- */
-
-TCase * _utc_evas_object_grid_mirrored_get()
-{
-   TCase *tcase = tcase_create("utc_evas_object_grid_mirrored_get");
-   tcase_set_timeout(tcase, 30);
-   tcase_add_checked_fixture(tcase, setup, teardown);
-#ifdef NOT_APPROVED_FOR_BUILD
-#endif
-   tcase_add_test(tcase, utc_evas_object_grid_mirrored_get_p_1);
-   tcase_add_test(tcase, utc_evas_object_grid_mirrored_get_p_2);
-#ifdef NOT_APPROVED_FOR_BUILD
-   tcase_add_test(tcase, utc_evas_object_grid_mirrored_get_n_1);
-#endif
-   return tcase;
-}

diff --git a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_mirrored_get_set.c b/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_mirrored_get_set.c
new file mode 100644 (file)
index 0000000..f794475
--- /dev/null
+++ b/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_mirrored_get_set.c
@@ -0,0 +1,172 @@
+#include <check.h>
+
+#include <Ecore.h>
+#include <Evas.h>
+#include <Ecore_Evas.h>
+
+/**
+ * @addtogroup evas_object_grid
+ * @{
+ * @defgroup evas_object_grid_mirrored_get evas_object_grid_mirrored_get()
+ *
+ * @precondition
+ * @step 1 Initialize Ecore_Evas library with ecore_evas_init()
+ */
+static void
+setup(void)
+{
+   printf(" ============ Startup ============ \n");
+   ecore_evas_init();
+}
+
+static void
+teardown(void)
+{
+   printf(" ============ Cleanup ============ \n");
+   ecore_evas_shutdown();
+}
+
+/**
+ * @addtogroup evas_object_grid_mirrored_get
+ * @{
+ * @objective Positive test case 01: checks if function get an mirrored
+ * attribute of the grid.
+ * @n Input Data: pointer to Evas object.
+ *
+ * @procedure
+ * @step 1 Create new Ecore_Evas
+ * @step 2 Get pointer to Evas from created Ecore_Evas
+ * @step 3 Get pointer to Evas Object from getted Evas
+ * @step 4 Set mirrored atribute to EINA_TRUE
+ * @step 5 Call tested function
+ *
+ * @passcondition Function do not make segfault and returns set below value of mirrored mode.
+ * @}
+ */
+START_TEST(utc_evas_object_grid_mirrored_get_p_1)
+{
+   Ecore_Evas *ee = ecore_evas_buffer_new(1, 1);
+   Evas *evas = ecore_evas_get(ee);
+   Evas_Object *obj = evas_object_grid_add(evas);
+
+   evas_object_grid_mirrored_set(obj, EINA_TRUE);
+   Eina_Bool isMirrored = evas_object_grid_mirrored_get(obj);
+   if (isMirrored)
+     {
+        printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
+        ecore_evas_free(ee);
+        return;
+     }
+   ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
+   ecore_evas_free(ee);
+}
+END_TEST
+
+/**
+ * @addtogroup evas_object_grid_mirrored_get
+ * @{
+ * @objective Positive test case 02: checks if function get an mirrored
+ * attribute of the grid.
+ * @n Input Data: pointer to Evas object.
+ *
+ * @procedure
+ * @step 1 Create new Ecore_Evas
+ * @step 2 Get pointer to Evas from created Ecore_Evas
+ * @step 3 Get pointer to Evas Object from getted Evas
+ * @step 4 Set mirrored atribute to EINA_FALSE
+ * @step 5 Call tested function
+ *
+ * @passcondition Function do not make segfault and returns set below value of mirrored mode.
+ * @}
+ */
+START_TEST(utc_evas_object_grid_mirrored_get_p_2)
+{
+   Ecore_Evas *ee = ecore_evas_buffer_new(1, 1);
+   Evas *evas = ecore_evas_get(ee);
+   Evas_Object *obj = evas_object_grid_add(evas);
+
+   evas_object_grid_mirrored_set(obj, EINA_FALSE);
+   Eina_Bool isMirrored = evas_object_grid_mirrored_get(obj);
+   if (!isMirrored)
+     {
+        printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
+        ecore_evas_free(ee);
+        return;
+     }
+   ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
+   ecore_evas_free(ee);
+}
+END_TEST
+#ifdef NOT_APPROVED_FOR_BUILD
+
+/**
+ * @addtogroup evas_object_grid_mirrored_get
+ * @{
+ * @objective Negative test case 01: checks if function doesn't cause segmentation fault
+ * and returns EINA_FALSE if it is called with NULL instead of pointer to Evas Object.
+ * @n Input Data: NULL as pointer to Evas.
+ *
+ * @procedure
+ * @step 1 Call function and pass NULL instead of it's argument.
+ *
+ * @passcondition Function doesn't cause segmentation fault and returns EINA_FALSE.
+ * @}
+ */
+START_TEST(utc_evas_object_grid_mirrored_get_n_1)
+{
+   Eina_Bool isMirrored = evas_object_grid_mirrored_get(NULL);
+   if (isMirrored)
+     {
+        ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
+     }
+   printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
+}
+END_TEST
+#endif
+
+#ifdef NOT_APPROVED_FOR_BUILD
+
+/**
+ * @addtogroup evas_object_grid_mirrored_set
+ * @{
+ * @objective Negative test case 01: checks if function doesn't cause segmentation fault
+ * if it is called with NULL instead of pointer to Evas Object.
+ * @n Input Data:
+ * @li NULL as pointer to Evas.
+ * @li EINA_FALSE as mirrored mode value.
+ *
+ * @procedure
+ * @step 1 Call function and pass NULL instead of it's argument.
+ *
+ * @passcondition Function doesn't cause segmentation fault.
+ * @}
+ */
+START_TEST(utc_evas_object_grid_mirrored_set_n_1)
+{
+   evas_object_grid_mirrored_set(NULL, EINA_FALSE);
+   printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
+}
+END_TEST
+#endif
+
+/**
+ * @}
+ */
+
+TCase * _utc_evas_object_grid_mirrored_get_set()
+{
+   TCase *tcase = tcase_create("utc_evas_object_grid_mirrored_get_set");
+   tcase_set_timeout(tcase, 30);
+   tcase_add_checked_fixture(tcase, setup, teardown);
+#ifdef NOT_APPROVED_FOR_BUILD
+#endif
+   tcase_add_test(tcase, utc_evas_object_grid_mirrored_get_p_1);
+   tcase_add_test(tcase, utc_evas_object_grid_mirrored_get_p_2);
+#ifdef NOT_APPROVED_FOR_BUILD
+   tcase_add_test(tcase, utc_evas_object_grid_mirrored_get_n_1);
+#endif
+   #ifdef NOT_APPROVED_FOR_BUILD
+   tcase_add_test(tcase, utc_evas_object_grid_mirrored_set_n_1);
+#endif
+   return tcase;
+}

diff --git a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_mirrored_set.c b/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_mirrored_set.c
deleted file mode 100644 (file)
index 80f35d5..0000000
--- a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_mirrored_set.c
+++ /dev/null
@@ -1,143 +0,0 @@
-#include <check.h>
-
-#include <Ecore.h>
-#include <Evas.h>
-#include <Ecore_Evas.h>
-
-/**
- * @addtogroup evas_object_grid
- * @{
- * @defgroup evas_object_grid_mirrored_set evas_object_grid_mirrored_set()
- *
- * @precondition
- * @step 1 Initialize Ecore_Evas library with ecore_evas_init()
- */
-static void
-setup(void)
-{
-   printf(" ============ Startup ============ \n");
-   ecore_evas_init();
-}
-
-static void
-teardown(void)
-{
-   printf(" ============ Cleanup ============ \n");
-   ecore_evas_shutdown();
-}
-
-/**
- * @addtogroup evas_object_grid_mirrored_set
- * @{
- * @objective Positive test case 01: checks if function set an mirrored
- * attribute of the grid.
- * @n Input Data:
- * @li pointer to Evas object.
- * @li EINA_TRUE as mirrored mode value.
- *
- * @procedure
- * @step 1 Create new Ecore_Evas
- * @step 2 Get pointer to Evas from created Ecore_Evas
- * @step 3 Get pointer to Evas Object from getted Evas
- * @step 4 Call tested function
- *
- * @passcondition Function do not make segfault and set the value of mirrored mode.
- * @}
- */
-START_TEST(utc_evas_object_grid_mirrored_set_p_1)
-{
-   Ecore_Evas *ee = ecore_evas_buffer_new(1, 1);
-   Evas *evas = ecore_evas_get(ee);
-   Evas_Object *obj = evas_object_grid_add(evas);
-
-   evas_object_grid_mirrored_set(obj, EINA_TRUE);
-   Eina_Bool isMirrored = evas_object_grid_mirrored_get(obj);
-   if (isMirrored)
-     {
-        printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-        ecore_evas_free(ee);
-        return;
-     }
-   ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
-   ecore_evas_free(ee);
-}
-END_TEST
-
-/**
- * @addtogroup evas_object_grid_mirrored_set
- * @{
- * @objective Positive test case 02: checks if function set an mirrored
- * attribute of the grid.
- * @n Input Data:
- * @li pointer to Evas object.
- * @li EINA_FALSE as mirrored mode value.
- *
- * @procedure
- * @step 1 Create new Ecore_Evas
- * @step 2 Get pointer to Evas from created Ecore_Evas
- * @step 3 Get pointer to Evas Object from getted Evas
- * @step 4 Call tested function
- *
- * @passcondition Function do not make segfault and set the value of mirrored mode.
- * @}
- */
-START_TEST(utc_evas_object_grid_mirrored_set_p_2)
-{
-   Ecore_Evas *ee = ecore_evas_buffer_new(1, 1);
-   Evas *evas = ecore_evas_get(ee);
-   Evas_Object *obj = evas_object_grid_add(evas);
-
-   evas_object_grid_mirrored_set(obj, EINA_FALSE);
-   Eina_Bool isMirrored = evas_object_grid_mirrored_get(obj);
-   if (!isMirrored)
-     {
-        printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-        ecore_evas_free(ee);
-        return;
-     }
-   ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
-   ecore_evas_free(ee);
-}
-END_TEST
-#ifdef NOT_APPROVED_FOR_BUILD
-
-/**
- * @addtogroup evas_object_grid_mirrored_set
- * @{
- * @objective Negative test case 01: checks if function doesn't cause segmentation fault
- * if it is called with NULL instead of pointer to Evas Object.
- * @n Input Data:
- * @li NULL as pointer to Evas.
- * @li EINA_FALSE as mirrored mode value.
- *
- * @procedure
- * @step 1 Call function and pass NULL instead of it's argument.
- *
- * @passcondition Function doesn't cause segmentation fault.
- * @}
- */
-START_TEST(utc_evas_object_grid_mirrored_set_n_1)
-{
-   evas_object_grid_mirrored_set(NULL, EINA_FALSE);
-   printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-}
-END_TEST
-#endif
-/**
- * @}
- */
-
-TCase * _utc_evas_object_grid_mirrored_set()
-{
-   TCase *tcase = tcase_create("utc_evas_object_grid_mirrored_set");
-   tcase_set_timeout(tcase, 30);
-   tcase_add_checked_fixture(tcase, setup, teardown);
-#ifdef NOT_APPROVED_FOR_BUILD
-#endif
-   tcase_add_test(tcase, utc_evas_object_grid_mirrored_set_p_1);
-   tcase_add_test(tcase, utc_evas_object_grid_mirrored_set_p_2);
-#ifdef NOT_APPROVED_FOR_BUILD
-   tcase_add_test(tcase, utc_evas_object_grid_mirrored_set_n_1);
-#endif
-   return tcase;
-}

diff --git a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_size_get.c b/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_size_get.c
deleted file mode 100644 (file)
index 2982615..0000000
--- a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_size_get.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#include <check.h>
-
-#include <Ecore.h>
-#include <Evas.h>
-#include <Ecore_Evas.h>
-
-/**
- * @addtogroup evas_object_grid
- * @{
- * @defgroup evas_object_grid_size_get evas_object_grid_size_get()
- *
- * @precondition
- * @step 1 Initialize Ecore_Evas library with ecore_evas_init()
- */
-static void
-setup(void)
-{
-   printf(" ============ Startup ============ \n");
-   ecore_evas_init();
-}
-
-static void
-teardown(void)
-{
-   printf(" ============ Cleanup ============ \n");
-   ecore_evas_shutdown();
-}
-
-/**
- * @addtogroup evas_object_grid_size_get
- * @{
- * @objective Positive test case 01: checks if function get size of the grid.
- * @n Input Data:
- * @li pointer to Evas object.
- * @li NULL value as pointer to width.
- * @li NULL value as pointer to height.
- *
- * @procedure
- * @step 1 Create new Ecore_Evas
- * @step 2 Get pointer to Evas from created Ecore_Evas
- * @step 3 Get pointer to Evas Object from getted Evas
- * @step 4 Set the grid size
- * @step 5 Call tested function
- *
- * @passcondition Function do not make segfault and get correct grid size.
- * @}
- */
-START_TEST(utc_evas_object_grid_size_get_p_1)
-{
-   Ecore_Evas *ee = ecore_evas_buffer_new(1, 1);
-   Evas *evas = ecore_evas_get(ee);
-   Evas_Object *obj = evas_object_grid_add(evas);
-
-   int width = -1;
-   int height = -2;
-
-   evas_object_grid_size_set(obj, 1, 2);
-   evas_object_grid_size_get(obj, &width, &height);
-   if ((width == 1) && (height == 2))
-     {
-        printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-        ecore_evas_free(ee);
-        return;
-     }
-   ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
-   ecore_evas_free(ee);
-}
-END_TEST
-#ifdef NOT_APPROVED_FOR_BUILD
-/**
- * @addtogroup evas_object_grid_size_get
- * @{
- * @objective Negative test case 01: checks if function doesn't cause segmentation fault
- * and returns NULL if it is called with NULL instead of pointer to Evas Object.
- * @n Input Data:
- * @li NULL value as target grid.
- * @li NULL value as pointer to width.
- * @li NULL value as pointer to height.
- *
- * @procedure
- * @step 1 Call function and pass NULL instead of it's argument.
- *
- * @passcondition Function doesn't cause segmentation fault and returns NULL.
- * @}
- */
-START_TEST(utc_evas_object_grid_size_get_n_1)
-{
-   evas_object_grid_size_get(NULL, NULL, NULL);
-   printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-}
-END_TEST
-#endif
-
-/**
- * @}
- */
-
-TCase * _utc_evas_object_grid_size_get()
-{
-   TCase *tcase = tcase_create("utc_evas_object_grid_size_get");
-   tcase_set_timeout(tcase, 30);
-   tcase_add_checked_fixture(tcase, setup, teardown);
-#ifdef NOT_APPROVED_FOR_BUILD
-#endif
-   tcase_add_test(tcase, utc_evas_object_grid_size_get_p_1);
-#ifdef NOT_APPROVED_FOR_BUILD
-   tcase_add_test(tcase, utc_evas_object_grid_size_get_n_1);
-#endif
-   return tcase;
-}

diff --git a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_size_get_set.c b/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_size_get_set.c
new file mode 100644 (file)
index 0000000..b2efd0b
--- /dev/null
+++ b/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_size_get_set.c
@@ -0,0 +1,138 @@
+#include <check.h>
+
+#include <Ecore.h>
+#include <Evas.h>
+#include <Ecore_Evas.h>
+
+/**
+ * @addtogroup evas_object_grid
+ * @{
+ * @defgroup evas_object_grid_size_get evas_object_grid_size_get()
+ *
+ * @precondition
+ * @step 1 Initialize Ecore_Evas library with ecore_evas_init()
+ */
+static void
+setup(void)
+{
+   printf(" ============ Startup ============ \n");
+   ecore_evas_init();
+}
+
+static void
+teardown(void)
+{
+   printf(" ============ Cleanup ============ \n");
+   ecore_evas_shutdown();
+}
+
+/**
+ * @addtogroup evas_object_grid_size_get
+ * @{
+ * @objective Positive test case 01: checks if function get size of the grid.
+ * @n Input Data:
+ * @li pointer to Evas object.
+ * @li NULL value as pointer to width.
+ * @li NULL value as pointer to height.
+ *
+ * @procedure
+ * @step 1 Create new Ecore_Evas
+ * @step 2 Get pointer to Evas from created Ecore_Evas
+ * @step 3 Get pointer to Evas Object from getted Evas
+ * @step 4 Set the grid size
+ * @step 5 Call tested function
+ *
+ * @passcondition Function do not make segfault and get correct grid size.
+ * @}
+ */
+START_TEST(utc_evas_object_grid_size_get_p_1)
+{
+   Ecore_Evas *ee = ecore_evas_buffer_new(1, 1);
+   Evas *evas = ecore_evas_get(ee);
+   Evas_Object *obj = evas_object_grid_add(evas);
+
+   int width = -1;
+   int height = -2;
+
+   evas_object_grid_size_set(obj, 1, 2);
+   evas_object_grid_size_get(obj, &width, &height);
+   if ((width == 1) && (height == 2))
+     {
+        printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
+        ecore_evas_free(ee);
+        return;
+     }
+   ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
+   ecore_evas_free(ee);
+}
+END_TEST
+#ifdef NOT_APPROVED_FOR_BUILD
+/**
+ * @addtogroup evas_object_grid_size_get
+ * @{
+ * @objective Negative test case 01: checks if function doesn't cause segmentation fault
+ * and returns NULL if it is called with NULL instead of pointer to Evas Object.
+ * @n Input Data:
+ * @li NULL value as target grid.
+ * @li NULL value as pointer to width.
+ * @li NULL value as pointer to height.
+ *
+ * @procedure
+ * @step 1 Call function and pass NULL instead of it's argument.
+ *
+ * @passcondition Function doesn't cause segmentation fault and returns NULL.
+ * @}
+ */
+START_TEST(utc_evas_object_grid_size_get_n_1)
+{
+   evas_object_grid_size_get(NULL, NULL, NULL);
+   printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
+}
+END_TEST
+#endif
+
+#ifdef NOT_APPROVED_FOR_BUILD
+/**
+ * @addtogroup evas_object_grid_size_set
+ * @{
+ * @objective Negative test case 01: checks if function doesn't cause segmentation fault
+ * and returns NULL if it is called with NULL instead of pointer to Evas Object.
+ * @n Input Data:
+ * @li NULL value as target grid.
+ * @li 0 as width.
+ * @li 0 as height.
+ *
+ * @procedure
+ * @step 1 Call function and pass NULL instead of it's argument.
+ *
+ * @passcondition Function doesn't cause segmentation fault and returns NULL.
+ * @}
+ */
+START_TEST(utc_evas_object_grid_size_set_n_1)
+{
+   evas_object_grid_size_set(NULL, 0, 0);
+   printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
+}
+END_TEST
+#endif
+
+/**
+ * @}
+ */
+
+TCase * _utc_evas_object_grid_size_get_set()
+{
+   TCase *tcase = tcase_create("utc_evas_object_grid_size_get_set");
+   tcase_set_timeout(tcase, 30);
+   tcase_add_checked_fixture(tcase, setup, teardown);
+#ifdef NOT_APPROVED_FOR_BUILD
+#endif
+   tcase_add_test(tcase, utc_evas_object_grid_size_get_p_1);
+#ifdef NOT_APPROVED_FOR_BUILD
+   tcase_add_test(tcase, utc_evas_object_grid_size_get_n_1);
+#endif
+   #ifdef NOT_APPROVED_FOR_BUILD
+   tcase_add_test(tcase, utc_evas_object_grid_size_set_n_1);
+#endif
+   return tcase;
+}

diff --git a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_size_set.c b/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_size_set.c
deleted file mode 100644 (file)
index 997ac3d..0000000
--- a/TC/evas/canvas/evas_object_grid/utc_evas_object_grid_size_set.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <check.h>
-
-#include <Ecore.h>
-#include <Evas.h>
-#include <Ecore_Evas.h>
-
-/**
- * @addtogroup evas_object_grid
- * @{
- * @defgroup evas_object_grid_size_set evas_object_grid_size_set()
- *
- * @precondition
- * @step 1 Initialize Ecore_Evas library with ecore_evas_init()
- */
-static void
-setup(void)
-{
-   printf(" ============ Startup ============ \n");
-   ecore_evas_init();
-}
-
-static void
-teardown(void)
-{
-   printf(" ============ Cleanup ============ \n");
-   ecore_evas_shutdown();
-}
-
-/**
- * @addtogroup evas_object_grid_size_set
- * @{
- * @objective Positive test case 01: checks if function set size of the grid.
- * @n Input Data:
- * @li pointer to Evas object.
- * @li 1 as width.
- * @li 2 as height.
- *
- * @procedure
- * @step 1 Create new Ecore_Evas
- * @step 2 Get pointer to Evas from created Ecore_Evas
- * @step 3 Get pointer to Evas Object from getted Evas
- * @step 4 Call tested function
- *
- * @passcondition Function do not make segfault and set grid size.
- * @}
- */
-START_TEST(utc_evas_object_grid_size_set_p_1)
-{
-   Ecore_Evas *ee = ecore_evas_buffer_new(1, 1);
-   Evas *evas = ecore_evas_get(ee);
-   Evas_Object *obj = evas_object_grid_add(evas);
-
-   int width = -1;
-   int height = -2;
-
-   evas_object_grid_size_set(obj, 1, 2);
-   evas_object_grid_size_get(obj, &width, &height);
-   if ((width == 1) && (height == 2))
-     {
-        printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-        ecore_evas_free(ee);
-        return;
-     }
-   ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
-   ecore_evas_free(ee);
-}
-END_TEST
-#ifdef NOT_APPROVED_FOR_BUILD
-/**
- * @addtogroup evas_object_grid_size_set
- * @{
- * @objective Negative test case 01: checks if function doesn't cause segmentation fault
- * and returns NULL if it is called with NULL instead of pointer to Evas Object.
- * @n Input Data:
- * @li NULL value as target grid.
- * @li 0 as width.
- * @li 0 as height.
- *
- * @procedure
- * @step 1 Call function and pass NULL instead of it's argument.
- *
- * @passcondition Function doesn't cause segmentation fault and returns NULL.
- * @}
- */
-START_TEST(utc_evas_object_grid_size_set_n_1)
-{
-   evas_object_grid_size_set(NULL, 0, 0);
-   printf("[TEST_PASS]:: %s[%d] : Test has passed..\n", __FILE__, __LINE__);
-}
-END_TEST
-#endif
-
-/**
- * @}
- */
-
-TCase * _utc_evas_object_grid_size_set()
-{
-   TCase *tcase = tcase_create("utc_evas_object_grid_size_set");
-   tcase_set_timeout(tcase, 30);
-   tcase_add_checked_fixture(tcase, setup, teardown);
-#ifdef NOT_APPROVED_FOR_BUILD
-#endif
-   tcase_add_test(tcase, utc_evas_object_grid_size_set_p_1);
-#ifdef NOT_APPROVED_FOR_BUILD
-   tcase_add_test(tcase, utc_evas_object_grid_size_set_n_1);
-#endif
-   return tcase;
-}