Updating test file for gravity and orientation sensor

-Updating error check conditions for start and stop handle.
-Removing redundant bool error_state variable.
-Removing redundant else condition after parameter count check.
-Removing redundant if condition assosciated with error_state.
-Updating print logs in callback by printing timestamp before other values.

Change-Id: I6a6144b6fb2806a7186580971ba4ff9ab97c7ab9

diff --git a/test/src/gravity.c b/test/src/gravity.c
index 84b01e6..48081ce 100755 (executable)
--- a/test/src/gravity.c
+++ b/test/src/gravity.c
@@ -30,7 +30,7 @@ static GMainLoop *mainloop;
 void callback(unsigned int event_type, sensor_event_data_t *event, void *user_data)
 {
        sensor_data_t *data = (sensor_data_t *)event->event_data;
-       printf("Gravity [%6.6f] [%6.6f] [%6.6f] [%lld]\n\n", data->values[0], data->values[1], data->values[2], data->timestamp);
+       printf("Gravity [%lld] [%6.6f] [%6.6f] [%6.6f]\n\n", data->timestamp, data->values[0], data->values[1], data->values[2]);
 }
 
 void printformat()
@@ -47,8 +47,7 @@ void printformat()
 
 int main(int argc,char **argv)
 {
-       int result, handle;
-       bool error_state = FALSE;
+       int result, handle, start_handle, stop_handle;
        unsigned int event;
 
        mainloop = g_main_loop_new(NULL, FALSE);
@@ -59,48 +58,49 @@ int main(int argc,char **argv)
 
        if (argc != 2 && argc != 3) {
                printformat();
-               error_state = TRUE;
+               free(event_condition);
+               return 0;
        }
        else {
                if (strcmp(argv[1], "RAW_DATA_REPORT_ON_TIME") == 0)
                        event = GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME;
                else {
                        printformat();
-                       error_state = TRUE;
+                       free(event_condition);
+                       return 0;
                }
 
                if (argc == 3)
                        event_condition->cond_value1 = atof(argv[2]);
        }
 
-       if (!error_state) {
-               handle = sf_connect(type);
-               result = sf_register_event(handle, event, event_condition, callback, NULL);
+       handle = sf_connect(type);
+       result = sf_register_event(handle, event, event_condition, callback, NULL);
 
-               if (result < 0)
-                       printf("Can't register gravity virtual sensor\n");
+       if (result < 0)
+               printf("Can't register gravity virtual sensor\n");
 
-               if (!(sf_start(handle,0) < 0)) {
-                       printf("Success start \n");
-               }
-               else {
-                       printf("Error\n\n\n\n");
-                       sf_unregister_event(handle, event);
-                       sf_disconnect(handle);
-                       return -1;
-               }
-
-               g_main_loop_run(mainloop);
-               g_main_loop_unref(mainloop);
+       start_handle = sf_start(handle, 0);
 
+       if (start_handle < 0) {
+               printf("Error\n\n\n\n");
                sf_unregister_event(handle, event);
+               sf_disconnect(handle);
+               return -1;
+       }
 
-               if (!(sf_stop(handle) < 0))
-                       printf("Success stop \n");
+       g_main_loop_run(mainloop);
+       g_main_loop_unref(mainloop);
 
-               sf_disconnect(handle);
+       sf_unregister_event(handle, event);
+       stop_handle = sf_stop(handle);
+
+       if (stop_handle < 0) {
+               printf("Error\n\n");
+               return -1;
        }
 
+       sf_disconnect(handle);
        free(event_condition);
 
        return 0;

diff --git a/test/src/orientation.c b/test/src/orientation.c
index 83dd667..ca9b083 100755 (executable)
--- a/test/src/orientation.c
+++ b/test/src/orientation.c
@@ -30,7 +30,7 @@ static GMainLoop *mainloop;
 void callback(unsigned int event_type, sensor_event_data_t *event, void *user_data)
 {
        sensor_data_t *data = (sensor_data_t *)event->event_data;
-       printf("Orientation [%6.6f] [%6.6f] [%6.6f] [%lld]\n\n", data->values[0], data->values[1], data->values[2], data->timestamp);
+       printf("Orientation [%lld] [%6.6f] [%6.6f] [%6.6f]\n\n", data->timestamp, data->values[0], data->values[1], data->values[2]);
 }
 
 void printformat()
@@ -47,8 +47,7 @@ void printformat()
 
 int main(int argc,char **argv)
 {
-       int result, handle;
-       bool error_state = FALSE;
+       int result, handle, start_handle, stop_handle;
        unsigned int event;
 
        mainloop = g_main_loop_new(NULL, FALSE);
@@ -59,47 +58,48 @@ int main(int argc,char **argv)
 
        if (argc != 2 && argc != 3) {
                printformat();
-               error_state = TRUE;
+               free(event_condition);
+               return 0;
        }
        else {
                if (strcmp(argv[1], "RAW_DATA_REPORT_ON_TIME") == 0)
                        event = ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME;
                else {
                        printformat();
-                       error_state = TRUE;
+                       free(event_condition);
+                       return 0;
                }
 
                if (argc == 3)
                        event_condition->cond_value1 = atof(argv[2]);
        }
 
-       if (!error_state) {
-               handle = sf_connect(type);
-               result = sf_register_event(handle, event, event_condition, callback, NULL);
+       handle = sf_connect(type);
+       result = sf_register_event(handle, event, event_condition, callback, NULL);
 
-               if (result < 0)
-                       printf("Can't register orientation virtual sensor\n");
+       if (result < 0)
+               printf("Can't register orientation virtual sensor\n");
 
-               if (!(sf_start(handle,0) < 0)) {
-                       printf("Success start \n");
-               }
-               else {
-                       printf("Error\n\n\n\n");
-                       sf_unregister_event(handle, event);
-                       sf_disconnect(handle);
-                       return -1;
-               }
-
-               g_main_loop_run(mainloop);
-               g_main_loop_unref(mainloop);
+       start_handle = sf_start(handle, 0);
 
+       if (start_handle < 0) {
+               printf("Error\n\n\n\n");
                sf_unregister_event(handle, event);
+               sf_disconnect(handle);
+               return -1;
+       }
 
-               if (!(sf_stop(handle) < 0))
-                       printf("Success stop \n");
+       g_main_loop_run(mainloop);
+       g_main_loop_unref(mainloop);
 
-               sf_disconnect(handle);
+       sf_unregister_event(handle, event);
+       stop_handle = sf_stop(handle);
+
+       if (stop_handle < 0) {
+               printf("Error\n\n");
+               return -1;
        }
+       sf_disconnect(handle);
 
        free(event_condition);