Testing complete. High level API works.

3 files changed, 39 insertions, 30 deletions

diff --git a/dispatcher/elapi_api.c b/dispatcher/elapi_api.c
index b89ac7d..919dee2 100644
--- a/dispatcher/elapi_api.c
+++ b/dispatcher/elapi_api.c
@@ -29,7 +29,7 @@
 #include "elapi_collection.h"
 #include "elapi_sink.h"
 
-const char event_name[] = "event";
+char event_name[] = "event";
 
 /* Pointer to default global dispatcher */
 struct dispatcher_handle *global_dispatcher = (struct dispatcher_handle *)(NULL);
@@ -110,6 +110,6 @@ int create_event(struct collection_item **event,char *name)
 void log_event(char *format_string,struct collection_item *event)
 {
     DEBUG_STRING("log_event","Entry");
-    log_audit_event(global_dispatcher, event, format_string);
+    log_audit_event(global_dispatcher, format_string, event);
     DEBUG_STRING("log_event","Entry");
 }
diff --git a/dispatcher/elapi_dispatcher.c b/dispatcher/elapi_dispatcher.c
index 27a3eca..ad943c4 100644
--- a/dispatcher/elapi_dispatcher.c
+++ b/dispatcher/elapi_dispatcher.c
@@ -428,7 +428,7 @@ static int default_router(char *sink,
                    char *previous_sink, 
                    int previous_status, 
                    struct collection_item *event,
-                   char *format_string
+                   char *format_string,
                    struct sink_descriptor *sink_data,
                    void *custom_data, 
                    int *error)
diff --git a/dispatcher/elapi_dispatcher_ut.c b/dispatcher/elapi_dispatcher_ut.c
index aa0a041..d0f846c 100644
--- a/dispatcher/elapi_dispatcher_ut.c
+++ b/dispatcher/elapi_dispatcher_ut.c
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <malloc.h>
+#include <errno.h>
 #include "elapi_dispatcher.h"
 #include "elapi_collection.h"
 #include "elapi_debug.h"
@@ -124,19 +125,17 @@ int construct_event()
     return EOK;
 } 
 
-int high_level_test()
+int high_level_test(char *app)
 {
     int error = EOK;
-    struct dispatcher_handle *dispatcher;
-    struct dispatcher_handle *dispatcher2;
     char *sinks[]= { "foo", "stderr", "file", NULL };
-    char bin[] = { '\1','\2','\3','\4','\5','\6','\7','\8' };
+    char bin[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
 
     printf("High level test start\n");
 
     printf("%s","=================\nOpening audit\n");
-    error = open_audit("my_app1",sinks);
-    if(error!) {
+    error = open_audit(app,sinks);
+    if(error) {
         printf("open_audit returned %d\n", error);
         return error;
     }
@@ -144,7 +143,7 @@ int high_level_test()
 
     printf("%s","=================\nAdding syslog - first time - expect success\n");
     error = alter_audit_dispatcher(get_dispatcher(),"syslog",ELAPI_SINK_ACTION_ADD);
-    if(error != 0) {
+    if(error) {
         printf("Expected success got failure %d\n",error);
         return error;
     }
@@ -158,9 +157,17 @@ int high_level_test()
     }
     else printf("Expected error : %d\n",error);
 
-    printf("%s","=================\nAdding syslog - first time - expect success\n");
-    error = alter_audit_dispatcher(get_dispatcher(),"foo",ELAPI_SINK_ACTION_DELETE);
-    if(error != 0) {
+    printf("%s","=================\nDeleting stderr\n");
+    error = alter_audit_dispatcher(get_dispatcher(),"stderr",ELAPI_SINK_ACTION_DELETE);
+    if(error) {
+        printf("Expected success got failure %d\n",error);
+        return error;
+    }
+    else printf("Success : %d\n",error);
+
+    printf("%s","=================\nAdding stderr back\n");
+    error = alter_audit_dispatcher(get_dispatcher(),"stderr",ELAPI_SINK_ACTION_ADD);
+    if(error) {
         printf("Expected success got failure %d\n",error);
         return error;
     }
@@ -170,7 +177,7 @@ int high_level_test()
     if((error=create_event(&event,"test_event")) ||
        (error=add_str_property(event,NULL,"name","some name",0)) ||
        (error=add_int_property(event,NULL,"number",-100)) ||
-       (error=add_binary_property(event,NULL,"binary",bin,8)) ||
+       (error=add_binary_property(event,NULL,"bin",bin,8)) ||
        (error=add_double_property(event,NULL,"double",3.141592))) {
         printf("Failed to create collection. Error %d\n",error);
         return error;
@@ -201,7 +208,7 @@ int high_level_test()
 
 
     destroy_collection(event);
-    close_audit(void);
+    close_audit();
 
     printf("Low level test end\n");
     return error;
@@ -212,11 +219,13 @@ int low_level_test()
 {
     int error = EOK;
     char *sinks[]= { "foo", "stderr", "bar", NULL };
+    struct dispatcher_handle *dispatcher;
+    struct dispatcher_handle *dispatcher2;
 
     printf("Low level test start\n");
 
     error = create_audit_dispatcher(&dispatcher,"my_app",sinks,NULL,NULL);
-    if(error!) {
+    if(error) {
         printf("create_audit_dispatcher returned %d\n", error);
         return error;
     }
@@ -246,33 +255,33 @@ int low_level_test()
     printf("%s","=================\nSeries of negative test cases.\n");
     /* Deleting non exisintg sink */  
     error = alter_audit_dispatcher(dispatcher,"far2",ELAPI_SINK_ACTION_DELETE);
-    if(error == 0) printf("%s","Expected failure got success\n");
+    if(!error) printf("%s","Expected failure got success\n");
     else printf("Expected failure. Error : %d\n",error);
 
     /* Editing non exisintg sink */  
     error = alter_audit_dispatcher(dispatcher,"far2",ELAPI_SINK_ACTION_ENABLE);
-    if(error == 0) printf("%s","Expected failure got success\n");
+    if(!error) printf("%s","Expected failure got success\n");
     else printf("Expected failure. Error : %d\n",error);
 
     /* Adding duplicate */
     error = alter_audit_dispatcher(dispatcher,"bar",ELAPI_SINK_ACTION_ADD);
-    if(error == 0) printf("%s","Expected failure got success\n");
+    if(!error) printf("%s","Expected failure got success\n");
     else printf("Expected failure. Error : %d\n",error);
 
     /* Adding new */
     printf("%s","=================\nAdding syslog - first time - expect success\n");
     error = alter_audit_dispatcher(dispatcher,"syslog",ELAPI_SINK_ACTION_ADD);
-    if(error != 0) printf("Expected success got failure %d\n",error);
+    if(error) printf("Expected success got failure %d\n",error);
     else printf("Success : %d\n",error);
 
     /* Delete */
     error = alter_audit_dispatcher(dispatcher,"stderr",ELAPI_SINK_ACTION_DELETE);
-    if(error != 0) printf("Expected success got failure %d\n",error);
+    if(error) printf("Expected success got failure %d\n",error);
     else printf("Success : %d\n",error);
 
     /* Enable */
     error = alter_audit_dispatcher(dispatcher,"syslog",ELAPI_SINK_ACTION_ENABLE);
-    if(error != 0) printf("Expected success got failure %d\n",error);
+    if(error) printf("Expected success got failure %d\n",error);
     else printf("Success : %d\n",error);
 
     /* Log event into syslog */
@@ -291,35 +300,35 @@ int low_level_test()
 
     /* Pulse */
     error = alter_audit_dispatcher(dispatcher,"syslog",ELAPI_SINK_ACTION_PULSE);
-    if(error != 0) printf("Expected success got failure %d\n",error);
+    if(error) printf("Expected success got failure %d\n",error);
     else printf("Success : %d\n",error);
 
     
     printf("%s","=================\nCreating another dispatcher - expect success\n"); 
     error = create_audit_dispatcher(&dispatcher2,"my_app",sinks,NULL,NULL);
-    if(error != 0) printf("Expected success got failure %d\n",error);
+    if(error) printf("Expected success got failure %d\n",error);
     else printf("Success : %d\n",error);
 
     printf("%s","=================\nAdding syslog sink to it - expect failure\n"); 
     error = alter_audit_dispatcher(dispatcher2,"syslog",ELAPI_SINK_ACTION_ADD);
-    if(error == 0) printf("%s","Expected failure got success\n");
+    if(!error) printf("%s","Expected failure got success\n");
     else printf("Expected failure. Error : %d\n",error);
 
 
     /* Delete */
     error = alter_audit_dispatcher(dispatcher,"syslog",ELAPI_SINK_ACTION_DELETE);
-    if(error != 0) printf("Expected success got failure %d\n",error);
+    if(error) printf("Expected success got failure %d\n",error);
     else printf("Success : %d\n",error);
 
 
     printf("%s","=================\nAdding syslog sink to it - now expect success\n"); 
     error = alter_audit_dispatcher(dispatcher2,"syslog",ELAPI_SINK_ACTION_ADD);
-    if(error != 0) printf("Expected success got failure %d\n",error);
+    if(error) printf("Expected success got failure %d\n",error);
     else printf("Success : %d\n",error);
 
     /* Disable */
     error = alter_audit_dispatcher(dispatcher2,"syslog",ELAPI_SINK_ACTION_DISABLE);
-    if(error != 0) printf("Expected success got failure %d\n",error);
+    if(error) printf("Expected success got failure %d\n",error);
     else printf("Success : %d\n",error);
 
     destroy_audit_dispatcher(dispatcher);
@@ -341,11 +350,11 @@ int main()
     printf("Low level test returned: %d\n",error);
     if(error) return error;
 
-    error = high_level_test(); 
+    error = high_level_test("my_app1"); 
     printf("High level test first run returned: %d\n",error);
     if(error) return error;
 
-    error = high_level_test(); 
+    error = high_level_test("my_app2"); 
     printf("High level test second run returned: %d\n",error);
 
     return error;