Test rework #13: ElDbus

diff --git a/src/tests/eldbus/eldbus_fake_server.c b/src/tests/eldbus/eldbus_fake_server.c
index da1f402..ea6e4ea 100644 (file)
--- a/src/tests/eldbus/eldbus_fake_server.c
+++ b/src/tests/eldbus/eldbus_fake_server.c
@@ -2,11 +2,10 @@
 #include "config.h"
 #endif
 
-#include "eldbus_fake_server.h"
-
 #include <Ecore.h>
 
-#include <check.h>
+#include "eldbus_suite.h"
+#include "eldbus_fake_server.h"
 
 #define FAKE_SERVER_DATA_KEY "data"
 

diff --git a/src/tests/eldbus/eldbus_suite.c b/src/tests/eldbus/eldbus_suite.c
index 8b6a181..dd79e33 100644 (file)
--- a/src/tests/eldbus/eldbus_suite.c
+++ b/src/tests/eldbus/eldbus_suite.c
@@ -2,22 +2,10 @@
 # include <config.h>
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <Eldbus.h>
-
 #include "eldbus_suite.h"
+#include "../efl_check.h"
 
-typedef struct _Eldbus_Test_Case Eldbus_Test_Case;
-
-struct _Eldbus_Test_Case
-{
-   const char *test_case;
-   void      (*build)(TCase *tc);
-};
-
-static const Eldbus_Test_Case etc[] = {
+static const Efl_Test_Case etc[] = {
   { "eldbus_init", eldbus_test_eldbus_init },
   { "eldbus_model", eldbus_test_eldbus_model },
   { "eldbus_model_connection", eldbus_test_eldbus_model_connection },
@@ -29,89 +17,18 @@ static const Eldbus_Test_Case etc[] = {
   { NULL, NULL }
 };
 
-static void
-_list_tests(void)
-{
-  const Eldbus_Test_Case *itr;
-
-   itr = etc;
-   fputs("Available Test Cases:\n", stderr);
-   for (; itr->test_case; itr++)
-     printf("\t%s\n", itr->test_case);
-}
-
-static Eina_Bool
-_use_test(int argc, const char **argv, const char *test_case)
-{
-   if (argc < 1)
-     return 1;
-
-   for (; argc > 0; argc--, argv++)
-     {
-        if (strcmp(test_case, *argv) == 0)
-          return 1;
-     }
-   return 0;
-}
-
-static Suite *
-eldbus_suite_build(int argc, const char **argv)
-{
-   TCase *tc;
-   Suite *s;
-   int i;
-
-   s = suite_create("Eldbus");
-
-   for (i = 0; etc[i].test_case; ++i)
-     {
-       if (!_use_test(argc, argv, etc[i].test_case)) continue;
-       tc = tcase_create(etc[i].test_case);
-
-       etc[i].build(tc);
-
-       suite_add_tcase(s, tc);
-#ifndef _WIN32
-       tcase_set_timeout(tc, 0);
-#endif
-     }
-
-   return s;
-}
-
 int
 main(int argc, char **argv)
 {
-   Suite *s;
-   SRunner *sr;
-   int i, failed_count;
+   int failed_count;
 
-   for (i = 1; i < argc; i++)
-     if ((strcmp(argv[i], "-h") == 0) ||
-        (strcmp(argv[i], "--help") == 0))
-       {
-         fprintf(stderr, "Usage:\n\t%s [test_case1 .. [test_caseN]]\n",
-                 argv[0]);
-         _list_tests();
-         return 0;
-       }
-     else if ((strcmp(argv[i], "-l") == 0) ||
-             (strcmp(argv[i], "--list") == 0))
-       {
-         _list_tests();
-         return 0;
-       }
+   if (!_efl_test_option_disp(argc, argv, etc))
+     return 0;
 
    putenv("EFL_RUN_IN_TREE=1");
 
-   s = eldbus_suite_build(argc - 1, (const char **)argv + 1);
-   sr = srunner_create(s);
-
-   srunner_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml");
-
-   srunner_run_all(sr, CK_ENV);
-   failed_count = srunner_ntests_failed(sr);
-   srunner_free(sr);
+   failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
+                                           "Eldbus", etc);
 
    return (failed_count == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index ebf91d7..771d942 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -2,17 +2,17 @@
 # include <config.h>
 #endif
 
-#include "eldbus_suite.h"
-#include "eldbus_test_eldbus_model.h"
+#include <stdbool.h>
+#include <stdio.h>
+#include <unistd.h>
 
-#include <Ecore.h>
 #include <Eina.h>
+#include <Ecore.h>
 #include <Eldbus.h>
 #include <Eldbus_Model.h>
 
-#include <stdbool.h>
-#include <stdio.h>
-#include <unistd.h>
+#include "eldbus_test_eldbus_model.h"
+#include "eldbus_suite.h"
 
 static Eina_Bool
 _eo_event_quit_cb(void *data EINA_UNUSED,

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.h b/src/tests/eldbus/eldbus_test_eldbus_model.h
index 2d8603a..b190917 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model.h
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.h
@@ -1,9 +1,9 @@
 #ifndef _ELDBUS_TEST_ELDBUS_MODEL_H
 #define _ELDBUS_TEST_ELDBUS_MODEL_H
 
+#include <Eo.h>
 #include <Eldbus_Model.h>
 #include <Efl.h>
-#include <Eo.h>
 
 void check_init(void);
 void check_shutdown(void);

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
index 4dc9f3d..ffcc795 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
@@ -2,14 +2,14 @@
 # include <config.h>
 #endif
 
-#include "eldbus_suite.h"
-#include "eldbus_test_eldbus_model.h"
+#include <stdbool.h>
 
-#include <Ecore.h>
 #include <Eina.h>
+#include <Ecore.h>
 #include <Eldbus_Model.h>
 
-#include <stdbool.h>
+#include "eldbus_test_eldbus_model.h"
+#include "eldbus_suite.h"
 
 static Eo *connection = NULL;
 static Eo *unloaded_connection = NULL;

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index 6c9dc5b..e4f7a81 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
@@ -2,15 +2,15 @@
 # include <config.h>
 #endif
 
-#include "eldbus_fake_server.h"
-#include "eldbus_suite.h"
-#include "eldbus_test_eldbus_model.h"
+#include <stdbool.h>
 
-#include <Ecore.h>
 #include <Eina.h>
+#include <Ecore.h>
 #include <Eldbus_Model.h>
 
-#include <stdbool.h>
+#include "eldbus_fake_server.h"
+#include "eldbus_test_eldbus_model.h"
+#include "eldbus_suite.h"
 
 #define ARGUMENT_A "arg0"
 #define ARGUMENT_B "arg1"

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_object.c b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
index a03edcc..c1f1248 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model_object.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
@@ -2,14 +2,14 @@
 # include <config.h>
 #endif
 
-#include "eldbus_suite.h"
-#include "eldbus_test_eldbus_model.h"
+#include <stdbool.h>
 
-#include <Ecore.h>
 #include <Eina.h>
+#include <Ecore.h>
 #include <Eldbus_Model.h>
 
-#include <stdbool.h>
+#include "eldbus_test_eldbus_model.h"
+#include "eldbus_suite.h"
 
 static Eo *object = NULL;
 static Eo *unloaded_object = NULL;

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
index e0fca2a..98ce124 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
@@ -2,14 +2,14 @@
 # include <config.h>
 #endif
 
-#include "eldbus_suite.h"
-#include "eldbus_test_eldbus_model.h"
+#include <stdbool.h>
 
-#include <Ecore.h>
 #include <Eina.h>
+#include <Ecore.h>
 #include <Eldbus_Model.h>
 
-#include <stdbool.h>
+#include "eldbus_test_eldbus_model.h"
+#include "eldbus_suite.h"
 
 static Eo *dbus_object1 = NULL;
 static Eo *dbus_object2 = NULL;

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index 1a7e907..3185f2e 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -2,15 +2,15 @@
 # include <config.h>
 #endif
 
-#include "eldbus_fake_server.h"
-#include "eldbus_suite.h"
-#include "eldbus_test_eldbus_model.h"
+#include <stdbool.h>
 
-#include <Ecore.h>
 #include <Eina.h>
+#include <Ecore.h>
 #include <Eldbus_Model.h>
 
-#include <stdbool.h>
+#include "eldbus_fake_server.h"
+#include "eldbus_test_eldbus_model.h"
+#include "eldbus_suite.h"
 
 #define ARGUMENT_A "arg0"
 

diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
index d4161b6..7a12d32 100644 (file)
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -2,15 +2,15 @@
 # include <config.h>
 #endif
 
-#include "eldbus_fake_server.h"
-#include "eldbus_suite.h"
-#include "eldbus_test_eldbus_model.h"
+#include <stdbool.h>
 
-#include <Ecore.h>
 #include <Eina.h>
+#include <Ecore.h>
 #include <Eldbus_Model.h>
 
-#include <stdbool.h>
+#include "eldbus_fake_server.h"
+#include "eldbus_test_eldbus_model.h"
+#include "eldbus_suite.h"
 
 static Eo *fake_server_object = NULL;
 static Eo *fake_server_proxy = NULL;
@@ -92,7 +92,7 @@ START_TEST(property_get)
    Efl_Model_Load_Status status;
    eo_do(fake_server_proxy, status = efl_model_property_get(FAKE_SERVER_WRITEONLY_PROPERTY, &dummy));
    ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status);
-   
+
    _teardown();
 }
 END_TEST