47% coverage of logd_proto :o)

diff --git a/org.glite.lb.logger/test/ll_test.cpp b/org.glite.lb.logger/test/ll_test.cpp
index 80cff7f..1e8dce6 100644 (file)
--- a/org.glite.lb.logger/test/ll_test.cpp
+++ b/org.glite.lb.logger/test/ll_test.cpp
@@ -5,9 +5,19 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
 
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <errno.h>
+#include <assert.h>
+#include <string.h>
+
 extern "C" {
 #define DEFAULT_SOCKET "/tmp/interlogger.sock"
 char *socket_path = DEFAULT_SOCKET;
+int edg_wll_log_proto_server(int *,char *,char *,int,int);
+void edg_wll_ll_log_init(int);
 }
 
 class LLTest: public  CppUnit::TestFixture
@@ -19,17 +29,22 @@ class LLTest: public  CppUnit::TestFixture
 public:
 
   void setUp() {
+    char *msg = "DATE=20040831150159.702224 HOST=\"some.host\" PROG=edg-wms LVL=USAGE DG.PRIORITY=0 DG.SOURCE=\"UserInterface\" DG.SRC_INSTANCE=\"\" DG.EVNT=\"RegJob\" DG.JOBID=\"https://some.host:1234/x67qr549qc\" DG.SEQCODE=\"UI=2:NS=0:WM=0:BH=1:JSS=0:LM=0:LRMS=0:APP=0\" DG.REGJOB.JDL=\"\" DG.REGJOB.NS=\"ns address\" DG.REGJOB.PARENT=\"\" DG.REGJOB.JOBTYPE=\"SIMPLE\" DG.REGJOB.NSUBJOBS=\"0\" DG.REGJOB.SEED=\"\"";
     pipe(pd);
     log_proto_client(pd[1], msg);
+    input_queue_attach();
   }
 
   void tearDown() {
     close(pd[0]);
     close(pd[1]);
+    input_queue_detach();
   }
 
   void testProtoServer() {
-    int ret = edg_wll_log_proto_server(con, 
+    int ret;
+    edg_wll_ll_log_init(255);
+    ret = edg_wll_log_proto_server(&pd[0], 
                                       "michal",
                                       "/tmp/dglogd.log",
                                       0,
@@ -39,7 +54,6 @@ public:
 
 private:
   int  pd[2];
-  const char *msg = "";
 
   int log_proto_client(int con, char *logline) {
     char       header[32];
@@ -63,6 +77,32 @@ private:
     CPPUNIT_ASSERT( err == size );
 }
 
+ int sock;
+ int accepted;
+
+int 
+input_queue_attach()
+{ 
+  struct sockaddr_un saddr;
+
+  CPPUNIT_ASSERT((sock=socket(PF_UNIX, SOCK_STREAM, 0)) >= 0);
+
+  memset(&saddr, 0, sizeof(saddr));
+  saddr.sun_family = AF_UNIX;
+  strcpy(saddr.sun_path, socket_path);
+
+  CPPUNIT_ASSERT(bind(sock, (struct sockaddr *)&saddr, sizeof(saddr)) >= 0); 
+  CPPUNIT_ASSERT(listen(sock, 5) >= 0 );
+  return(0);
+}
+
+void input_queue_detach()
+{
+  if (sock >= 0)
+    close(sock);
+  unlink(socket_path);
+}
+
 };