[GNUnet-SVN] r33536 - gnunet/src/peerstore

[gnunet]

Author: otarabai
Date: 2014-06-05 11:08:28 +0200 (Thu, 05 Jun 2014)
New Revision: 33536

Added:
   gnunet/src/peerstore/test_peerstore_api_iterate.c
   gnunet/src/peerstore/test_peerstore_api_watch.c
Modified:
   gnunet/src/peerstore/
   gnunet/src/peerstore/Makefile.am
   gnunet/src/peerstore/gnunet-service-peerstore.c
   gnunet/src/peerstore/test_peerstore_api_store.c
Log:
peerstore: additional test cases


Index: gnunet/src/peerstore
===================================================================
--- gnunet/src/peerstore        2014-06-05 07:49:44 UTC (rev 33535)
+++ gnunet/src/peerstore        2014-06-05 09:08:28 UTC (rev 33536)

Property changes on: gnunet/src/peerstore
___________________________________________________________________
Modified: svn:ignore
## -5,3 +5,6 ##
 .deps
 peerstore.conf
 test_peerstore_api
+test_peerstore_api_watch
+test_peerstore_api_store
+test_peerstore_api_iterate
Modified: gnunet/src/peerstore/Makefile.am
===================================================================
--- gnunet/src/peerstore/Makefile.am    2014-06-05 07:49:44 UTC (rev 33535)
+++ gnunet/src/peerstore/Makefile.am    2014-06-05 09:08:28 UTC (rev 33536)
@@ -65,7 +65,9 @@
   libgnunetpeerstore.la
 
 check_PROGRAMS = \
- test_peerstore_api_store
+ test_peerstore_api_store \
+ test_peerstore_api_iterate \
+ test_peerstore_api_watch
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export 
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export 
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
@@ -77,5 +79,18 @@
 test_peerstore_api_store_LDADD = \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
+test_peerstore_api_iterate_SOURCES = \
+ test_peerstore_api_iterate.c
+test_peerstore_api_iterate_LDADD = \
+  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+test_peerstore_api_watch_SOURCES = \
+ test_peerstore_api_watch.c
+test_peerstore_api_watch_LDADD = \
+  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la

Modified: gnunet/src/peerstore/gnunet-service-peerstore.c
===================================================================
--- gnunet/src/peerstore/gnunet-service-peerstore.c     2014-06-05 07:49:44 UTC 
(rev 33535)
+++ gnunet/src/peerstore/gnunet-service-peerstore.c     2014-06-05 09:08:28 UTC 
(rev 33536)
@@ -202,7 +202,7 @@
 {
   struct GNUNET_HashCode keyhash;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Sending update to any watchers.\n");
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending update to any watchers.\n");
   PEERSTORE_hash_key(record->sub_system,
       record->peer,
       record->key,
@@ -279,6 +279,10 @@
     GNUNET_SERVER_receive_done(client, GNUNET_SYSERR);
     return;
   }
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Iterate request: ss `%s', peer `%s', 
key `%s'\n",
+      record->sub_system,
+      (NULL == record->peer) ? "NULL" : GNUNET_i2s(record->peer),
+      (NULL == record->key) ? "NULL" : record->key);
   GNUNET_SERVER_notification_context_add(nc, client);
   if(GNUNET_OK == db->iterate_records(db->cls,
       record->sub_system,

Added: gnunet/src/peerstore/test_peerstore_api_iterate.c
===================================================================
--- gnunet/src/peerstore/test_peerstore_api_iterate.c                           
(rev 0)
+++ gnunet/src/peerstore/test_peerstore_api_iterate.c   2014-06-05 09:08:28 UTC 
(rev 33536)
@@ -0,0 +1,168 @@
+/*
+     This file is part of GNUnet.
+     (C)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file peerstore/test_peerstore_api_iterate.c
+ * @brief testcase for peerstore iteration operation
+ */
+#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;
+
+char *ss = "test_peerstore_api_iterate";
+struct GNUNET_PeerIdentity p1;
+struct GNUNET_PeerIdentity p2;
+char *k1 = "test_peerstore_api_iterate_key1";
+char *k2 = "test_peerstore_api_iterate_key2";
+char *k3 = "test_peerstore_api_iterate_key3";
+char *val = "test_peerstore_api_iterate_val";
+int count = 0;
+
+static int
+iter3_cb(void *cls,
+    struct GNUNET_PEERSTORE_Record *record,
+    char *emsg)
+{
+  if(NULL != emsg)
+    return GNUNET_NO;
+  if(NULL != record)
+  {
+    count++;
+    return GNUNET_YES;
+  }
+  GNUNET_assert(count == 3);
+  ok = 0;
+  GNUNET_PEERSTORE_disconnect(h);
+  GNUNET_SCHEDULER_shutdown();
+  return GNUNET_YES;
+}
+
+static int
+iter2_cb(void *cls,
+    struct GNUNET_PEERSTORE_Record *record,
+    char *emsg)
+{
+  if(NULL != emsg)
+    return GNUNET_NO;
+  if(NULL != record)
+  {
+    count++;
+    return GNUNET_YES;
+  }
+  GNUNET_assert(count == 2);
+  count = 0;
+  GNUNET_PEERSTORE_iterate(h,
+      ss,
+      NULL,
+      NULL,
+      GNUNET_TIME_UNIT_FOREVER_REL,
+      iter3_cb,
+      NULL);
+  return GNUNET_YES;
+}
+
+static int
+iter1_cb(void *cls,
+    struct GNUNET_PEERSTORE_Record *record,
+    char *emsg)
+{
+  if(NULL != emsg)
+    return GNUNET_NO;
+  if(NULL != record)
+  {
+    count++;
+    return GNUNET_YES;
+  }
+  GNUNET_assert(count == 1);
+  count = 0;
+  GNUNET_PEERSTORE_iterate(h,
+      ss,
+      &p1,
+      NULL,
+      GNUNET_TIME_UNIT_FOREVER_REL,
+      iter2_cb,
+      NULL);
+  return GNUNET_YES;
+}
+
+static void
+run (void *cls,
+    const struct GNUNET_CONFIGURATION_Handle *cfg,
+    struct GNUNET_TESTING_Peer *peer)
+{
+  h = GNUNET_PEERSTORE_connect(cfg);
+  GNUNET_assert(NULL != h);
+  memset (&p1, 1, sizeof (p1));
+  memset (&p2, 2, sizeof (p2));
+  GNUNET_PEERSTORE_store(h,
+      ss,
+      &p1,
+      k1,
+      val,
+      strlen(val) + 1,
+      GNUNET_TIME_UNIT_FOREVER_ABS,
+      GNUNET_PEERSTORE_STOREOPTION_REPLACE,
+      NULL,
+      NULL);
+  GNUNET_PEERSTORE_store(h,
+      ss,
+      &p1,
+      k2,
+      val,
+      strlen(val) + 1,
+      GNUNET_TIME_UNIT_FOREVER_ABS,
+      GNUNET_PEERSTORE_STOREOPTION_REPLACE,
+      NULL,
+      NULL);
+  GNUNET_PEERSTORE_store(h,
+      ss,
+      &p2,
+      k3,
+      val,
+      strlen(val) + 1,
+      GNUNET_TIME_UNIT_FOREVER_ABS,
+      GNUNET_PEERSTORE_STOREOPTION_REPLACE,
+      NULL,
+      NULL);
+  GNUNET_PEERSTORE_iterate(h,
+      ss,
+      &p1,
+      k1,
+      GNUNET_TIME_UNIT_FOREVER_REL,
+      iter1_cb,
+      NULL);
+}
+
+int
+main (int argc, char *argv[])
+{
+  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_iterate.c */

Modified: gnunet/src/peerstore/test_peerstore_api_store.c
===================================================================
--- gnunet/src/peerstore/test_peerstore_api_store.c     2014-06-05 07:49:44 UTC 
(rev 33535)
+++ gnunet/src/peerstore/test_peerstore_api_store.c     2014-06-05 09:08:28 UTC 
(rev 33536)
@@ -18,8 +18,8 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file peerstore/test_peerstore_api.c
- * @brief testcase for peerstore_api.c
+ * @file peerstore/test_peerstore_api_store.c
+ * @brief testcase for peerstore store operation
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
@@ -219,4 +219,4 @@
   return ok;
 }
 
-/* end of test_peerstore_api.c */
+/* end of test_peerstore_api_store.c */

Added: gnunet/src/peerstore/test_peerstore_api_watch.c
===================================================================
--- gnunet/src/peerstore/test_peerstore_api_watch.c                             
(rev 0)
+++ gnunet/src/peerstore/test_peerstore_api_watch.c     2014-06-05 09:08:28 UTC 
(rev 33536)
@@ -0,0 +1,88 @@
+/*
+     This file is part of GNUnet.
+     (C)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file peerstore/test_peerstore_api_watch.c
+ * @brief testcase for peerstore watch functionality
+ */
+#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;
+
+char *ss = "test_peerstore_api_watch";
+struct GNUNET_PeerIdentity p;
+char *k = "test_peerstore_api_watch_key";
+char *val = "test_peerstore_api_watch_val";
+
+static int
+watch_cb(void *cls,
+    struct GNUNET_PEERSTORE_Record *record,
+    char *emsg)
+{
+  GNUNET_assert(NULL == emsg);
+  GNUNET_assert(0 == strcmp(val, (char *)record->value));
+  ok = 0;
+  GNUNET_PEERSTORE_disconnect(h);
+  GNUNET_SCHEDULER_shutdown();
+  return GNUNET_YES;
+}
+
+static void
+run (void *cls,
+    const struct GNUNET_CONFIGURATION_Handle *cfg,
+    struct GNUNET_TESTING_Peer *peer)
+{
+  h = GNUNET_PEERSTORE_connect(cfg);
+  GNUNET_assert(NULL != h);
+  memset (&p, 4, sizeof (p));
+  GNUNET_PEERSTORE_watch(h,
+      ss,
+      &p,
+      k,
+      &watch_cb,
+      NULL);
+  GNUNET_PEERSTORE_store(h,
+      ss,
+      &p,
+      k,
+      val,
+      strlen(val) + 1,
+      GNUNET_TIME_UNIT_FOREVER_ABS,
+      GNUNET_PEERSTORE_STOREOPTION_REPLACE,
+      NULL,
+      NULL);
+}
+
+int
+main (int argc, char *argv[])
+{
+  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_watch.c */