5 files changed, 40 insertions, 96 deletions

diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am
index 40072836c..4c4c84ed1 100644
--- a/src/peerstore/Makefile.am
+++ b/src/peerstore/Makefile.am
@@ -72,5 +72,7 @@ endif
 test_peerstore_api_SOURCES = \
  test_peerstore_api.c
 test_peerstore_api_LDADD = \
+  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
diff --git a/src/peerstore/gnunet-peerstore.c b/src/peerstore/gnunet-peerstore.c
index 9b26cf36c..ec2af0a4f 100644
--- a/src/peerstore/gnunet-peerstore.c
+++ b/src/peerstore/gnunet-peerstore.c
@@ -29,11 +29,6 @@
 
 static int ret;
 
-/**
- * option '-t'
- */
-static int test;
-
 /*
  * Handle to PEERSTORE service
  */
@@ -56,17 +51,6 @@ shutdown_task (void *cls,
   }
 }
 
-void test_cont(void *cls, const char *emsg)
-{
-  char *req = cls;
-
-  printf("Received a response to request: %s\n", req);
-  if(NULL != emsg)
-  {
-    printf("Response: %s\n", emsg);
-  }
-}
-
 /**
  * Main function that will be run by the scheduler.
  *
@@ -88,27 +72,6 @@ run (void *cls,
                                   NULL);
   peerstore_handle = GNUNET_PEERSTORE_connect(cfg);
   GNUNET_assert(NULL != peerstore_handle);
-  if(GNUNET_YES == test)
-  {
-    struct GNUNET_PeerIdentity pid;
-    memset (&pid, 32, sizeof (pid));
-    GNUNET_PEERSTORE_store(peerstore_handle,
-        &pid,
-        "subsub",
-        "value",
-        5,
-        GNUNET_TIME_UNIT_FOREVER_REL,
-        &test_cont,
-        "Req1");
-    GNUNET_PEERSTORE_store(peerstore_handle,
-            &pid,
-            "subsub",
-            "value",
-            5,
-            GNUNET_TIME_UNIT_FOREVER_REL,
-            &test_cont,
-            "Req2");
-  }
 
   ret = 0;
 }
@@ -124,9 +87,6 @@ int
 main (int argc, char *const *argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    {'t', "test", NULL,
-        gettext_noop("TESTING"),
-    0, &GNUNET_GETOPT_set_one, &test},
     GNUNET_GETOPT_OPTION_END
   };
   return (GNUNET_OK ==
diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c
index 35eee01b1..d3f87c4bc 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -100,21 +100,6 @@ void handle_store (void *cls,
       sub_system,
       GNUNET_i2s (&sreqm->peer));
   //TODO: do the actual storage
-  //create a fake response for testing
-  char *response = "This is a response";
-  uint16_t resp_size = strlen(response);
-  tc = GNUNET_SERVER_transmit_context_create (client);
-  msg_size = sizeof(struct StoreResponseMessage) + resp_size;
-  sresm = malloc(msg_size);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending a response to client of size: %u, response size: %u\n", msg_size, resp_size);
-  sresm->header.type = htons(GNUNET_MESSAGE_TYPE_PEERSTORE_STORE_RESULT);
-  sresm->header.size = htons(msg_size);
-  sresm->success = htons(GNUNET_NO);
-  sresm->emsg_size = htons(resp_size);
-  char *msg_ptr = (char *)&sresm[1];
-  memcpy(msg_ptr, response, resp_size);
-  GNUNET_SERVER_transmit_context_append_message(tc, (struct GNUNET_MessageHeader *)sresm);
-  GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 /**
diff --git a/src/peerstore/test_peerstore_api.c b/src/peerstore/test_peerstore_api.c
index 8bb973f74..51251d72a 100644
--- a/src/peerstore/test_peerstore_api.c
+++ b/src/peerstore/test_peerstore_api.c
@@ -23,62 +23,47 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_peerstore_service.h"
 
-
 static int ok = 1;
 
+struct GNUNET_PEERSTORE_Handle *h;
 
 static void
 run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  ok = 0;
-}
-
-
-static int
-check ()
+    const struct GNUNET_CONFIGURATION_Handle *cfg,
+    struct GNUNET_TESTING_Peer *peer)
 {
-  char *const argv[] = { "test-peerstore-api", NULL };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  struct GNUNET_OS_Process *proc;
-  char *path = GNUNET_OS_get_libexec_binary_path ( "gnunet-service-peerstore");
-  if (NULL == path)
-  {
-                fprintf (stderr, "Service executable not found `%s'\n", "gnunet-service-peerstore");
-                return -1;
-  }
+  struct GNUNET_PeerIdentity pid;
+  char *val = "peerstore-test-value";
+  size_t val_size = strlen(val);
 
-  proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL,
-      NULL, NULL, path, "gnunet-service-peerstore", NULL);
+  ok = 0;
+  memset (&pid, 32, sizeof (pid));
+  h = GNUNET_PEERSTORE_connect(cfg);
+  GNUNET_assert(NULL != h);
+  GNUNET_PEERSTORE_store(h,
+      &pid,
+      "peerstore-test",
+      val,
+      val_size,
+      GNUNET_TIME_UNIT_FOREVER_REL,
+      NULL,
+      NULL);
+  GNUNET_PEERSTORE_disconnect(h);
 
-  GNUNET_free (path);
-  GNUNET_assert (NULL != proc);
-  GNUNET_PROGRAM_run (1, argv, "test-peerstore-api", "nohelp",
-                      options, &run, &ok);
-  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-      ok = 1;
-    }
-  GNUNET_OS_process_wait (proc);
-  GNUNET_OS_process_destroy (proc);
-  return ok;
 }
 
-
 int
 main (int argc, char *argv[])
 {
-  GNUNET_log_setup ("test_statistics_api", 
-                    "WARNING",
-                    NULL);
-  return check ();
+  if (0 != GNUNET_TESTING_service_run ("test-gnunet-peerstore",
+                 "peerstore",
+                 "test_peerstore_api_data.conf",
+                 &run, NULL))
+    return 1;
+  return ok;
 }
 
 /* end of test_peerstore_api.c */
diff --git a/src/peerstore/test_peerstore_api_data.conf b/src/peerstore/test_peerstore_api_data.conf
new file mode 100644
index 000000000..376e9861c
--- /dev/null
+++ b/src/peerstore/test_peerstore_api_data.conf
@@ -0,0 +1,12 @@
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-gnunet-peerstore
+
+[peerstore]
+AUTOSTART = YES
+BINARY = gnunet-service-peerstore
+UNIXPATH = /tmp/gnunet-service-peerstore.sock
+HOME = $SERVICEHOME
+DATABASE = sqlite
+
+[peerstore-sqlite]
+FILENAME = $GNUNET_TEST_HOME/gnunet-peerstore-sqlite.db