X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_fs_uri.c;h=72744351b1b655abe17234e8faa6884448fd4ee1;hb=321e09ea6ded0d36202d90b7be7c2b34b6d8fd5c;hp=f24f4fe27b1a433391b35c278ca80c689c9f9a36;hpb=b80e650bad570e01b5600aab2a667d177fc17770;p=oweals%2Fgnunet.git

diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c
index f24f4fe27..72744351b 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2003, 2004, 2006, 2007 Christian Grothoff (and other contributing authors)
+     (C) 2003, 2004, 2006, 2007, 2009 Christian Grothoff (and other contributing authors)
 
      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 2, or (at your
+     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
@@ -19,15 +19,15 @@
 */
 
 /**
- * @file applications/fs/ecrs/uritest.c
- * @brief Test for uri.c
+ * @file fs/test_fs_uri.c
+ * @brief Test for fs_uri.c
  * @author Christian Grothoff
  */
 
 #include "platform.h"
-#include "gnunet_util.h"
-#include "gnunet_ecrs_lib.h"
-#include "ecrs.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_fs_service.h"
+#include "fs_api.h"
 
 #define ABORT() { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); return 1; }
 
@@ -35,104 +35,125 @@ static int
 testKeyword ()
 {
   char *uri;
-  struct GNUNET_ECRS_URI *ret;
+  struct GNUNET_FS_Uri *ret;
+  char *emsg;
 
-  if (NULL != GNUNET_ECRS_string_to_uri (NULL, "gnunet://ecrs/ksk/++"))
+  if (NULL != (ret = GNUNET_FS_uri_parse ("gnunet://fs/ksk/++", &emsg)))
+  {
+    GNUNET_FS_uri_destroy (ret);
     ABORT ();
-  ret = GNUNET_ECRS_string_to_uri (NULL, "gnunet://ecrs/ksk/foo+bar");
+  }
+  GNUNET_free (emsg);
+  ret = GNUNET_FS_uri_parse ("gnunet://fs/ksk/foo+bar", &emsg);
   if (ret == NULL)
+  {
+    GNUNET_free (emsg);
     ABORT ();
-  if (!GNUNET_ECRS_uri_test_ksk (ret))
-    {
-      GNUNET_ECRS_uri_destroy (ret);
-      ABORT ();
-    }
+  }
+  if (!GNUNET_FS_uri_test_ksk (ret))
+  {
+    GNUNET_FS_uri_destroy (ret);
+    ABORT ();
+  }
   if ((2 != ret->data.ksk.keywordCount) ||
       (0 != strcmp (" foo", ret->data.ksk.keywords[0])) ||
       (0 != strcmp (" bar", ret->data.ksk.keywords[1])))
-    {
-      GNUNET_ECRS_uri_destroy (ret);
-      ABORT ();
-    }
-
-  uri = GNUNET_ECRS_uri_to_string (ret);
-  if (0 != strcmp (uri, "gnunet://ecrs/ksk/foo+bar"))
-    {
-      GNUNET_free (uri);
-      GNUNET_ECRS_uri_destroy (ret);
-      ABORT ();
-    }
+  {
+    GNUNET_FS_uri_destroy (ret);
+    ABORT ();
+  }
+
+  uri = GNUNET_FS_uri_to_string (ret);
+  if (0 != strcmp (uri, "gnunet://fs/ksk/foo+bar"))
+  {
+    GNUNET_free (uri);
+    GNUNET_FS_uri_destroy (ret);
+    ABORT ();
+  }
   GNUNET_free (uri);
-  GNUNET_ECRS_uri_destroy (ret);
+  GNUNET_FS_uri_destroy (ret);
   return 0;
 }
 
 static int
 testLocation ()
 {
-  struct GNUNET_ECRS_URI *uri;
+  struct GNUNET_FS_Uri *uri;
   char *uric;
-  struct GNUNET_ECRS_URI *uri2;
-  GNUNET_RSA_PublicKey pk;
-  struct GNUNET_RSA_PrivateKey *hk;
-  struct GNUNET_ECRS_URI *baseURI;
+  struct GNUNET_FS_Uri *uri2;
+  struct GNUNET_FS_Uri *baseURI;
+  char *emsg;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
 
   baseURI =
-    GNUNET_ECRS_string_to_uri (NULL,
-                               "gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42");
-  hk = GNUNET_RSA_create_key ();
-  GNUNET_RSA_get_public_key (hk, &pk);
-  uri = GNUNET_ECRS_location_to_uri (baseURI,
-                                     &pk, 43,
-                                     (GNUNET_ECRS_SignFunction) &
-                                     GNUNET_RSA_sign, hk);
-  GNUNET_RSA_free_key (hk);
+      GNUNET_FS_uri_parse
+      ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42",
+       &emsg);
+  GNUNET_assert (baseURI != NULL);
+  GNUNET_assert (emsg == NULL);
+  cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, "test_fs_uri_data.conf"))
+  {
+    fprintf (stderr, "Failed to parse configuration file\n");
+    GNUNET_FS_uri_destroy (baseURI);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    return 1;
+  }
+  uri = GNUNET_FS_uri_loc_create (baseURI, cfg, GNUNET_TIME_absolute_get ());
   if (uri == NULL)
-    {
-      GNUNET_GE_BREAK (NULL, 0);
-      GNUNET_ECRS_uri_destroy (baseURI);
-      return 1;
-    }
-  if (!GNUNET_ECRS_uri_test_loc (uri))
-    {
-      GNUNET_GE_BREAK (NULL, 0);
-      GNUNET_ECRS_uri_destroy (uri);
-      GNUNET_ECRS_uri_destroy (baseURI);
-      return 1;
-    }
-  uri2 = GNUNET_ECRS_uri_get_content_uri_from_loc (uri);
-  if (!GNUNET_ECRS_uri_test_equal (baseURI, uri2))
-    {
-      GNUNET_GE_BREAK (NULL, 0);
-      GNUNET_ECRS_uri_destroy (uri);
-      GNUNET_ECRS_uri_destroy (uri2);
-      GNUNET_ECRS_uri_destroy (baseURI);
-      return 1;
-    }
-  GNUNET_ECRS_uri_destroy (uri2);
-  GNUNET_ECRS_uri_destroy (baseURI);
-  uric = GNUNET_ECRS_uri_to_string (uri);
+  {
+    GNUNET_break (0);
+    GNUNET_FS_uri_destroy (baseURI);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    return 1;
+  }
+  if (!GNUNET_FS_uri_test_loc (uri))
+  {
+    GNUNET_break (0);
+    GNUNET_FS_uri_destroy (uri);
+    GNUNET_FS_uri_destroy (baseURI);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    return 1;
+  }
+  uri2 = GNUNET_FS_uri_loc_get_uri (uri);
+  if (!GNUNET_FS_uri_test_equal (baseURI, uri2))
+  {
+    GNUNET_break (0);
+    GNUNET_FS_uri_destroy (uri);
+    GNUNET_FS_uri_destroy (uri2);
+    GNUNET_FS_uri_destroy (baseURI);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    return 1;
+  }
+  GNUNET_FS_uri_destroy (uri2);
+  GNUNET_FS_uri_destroy (baseURI);
+  uric = GNUNET_FS_uri_to_string (uri);
 #if 0
   /* not for the faint of heart: */
   printf ("URI: `%s'\n", uric);
 #endif
-  uri2 = GNUNET_ECRS_string_to_uri (NULL, uric);
+  uri2 = GNUNET_FS_uri_parse (uric, &emsg);
   GNUNET_free (uric);
   if (uri2 == NULL)
-    {
-      GNUNET_GE_BREAK (NULL, 0);
-      GNUNET_ECRS_uri_destroy (uri);
-      return 1;
-    }
-  if (GNUNET_YES != GNUNET_ECRS_uri_test_equal (uri, uri2))
-    {
-      GNUNET_GE_BREAK (NULL, 0);
-      GNUNET_ECRS_uri_destroy (uri);
-      GNUNET_ECRS_uri_destroy (uri2);
-      return 1;
-    }
-  GNUNET_ECRS_uri_destroy (uri2);
-  GNUNET_ECRS_uri_destroy (uri);
+  {
+    GNUNET_break (0);
+    GNUNET_FS_uri_destroy (uri);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    GNUNET_free (emsg);
+    return 1;
+  }
+  GNUNET_assert (NULL == emsg);
+  if (GNUNET_YES != GNUNET_FS_uri_test_equal (uri, uri2))
+  {
+    GNUNET_break (0);
+    GNUNET_FS_uri_destroy (uri);
+    GNUNET_FS_uri_destroy (uri2);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    return 1;
+  }
+  GNUNET_FS_uri_destroy (uri2);
+  GNUNET_FS_uri_destroy (uri);
+  GNUNET_CONFIGURATION_destroy (cfg);
   return 0;
 }
 
@@ -140,44 +161,64 @@ static int
 testNamespace (int i)
 {
   char *uri;
-  struct GNUNET_ECRS_URI *ret;
+  struct GNUNET_FS_Uri *ret;
+  char *emsg;
 
   if (NULL !=
-      GNUNET_ECRS_string_to_uri (NULL,
-                                 "gnunet://ecrs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK"))
+      (ret =
+       GNUNET_FS_uri_parse ("gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK",
+                            &emsg)))
+  {
+    GNUNET_FS_uri_destroy (ret);
     ABORT ();
+  }
+  GNUNET_free (emsg);
   if (NULL !=
-      GNUNET_ECRS_string_to_uri (NULL,
-                                 "gnunet://ecrs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3V/test"))
+      (ret =
+       GNUNET_FS_uri_parse
+       ("gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3V/test", &emsg)))
+  {
+    GNUNET_FS_uri_destroy (ret);
     ABORT ();
-  if (NULL != GNUNET_ECRS_string_to_uri (NULL, "gnunet://ecrs/sks/test"))
+  }
+  GNUNET_free (emsg);
+  if (NULL != (ret = GNUNET_FS_uri_parse ("gnunet://fs/sks/test", &emsg)))
+  {
+    GNUNET_FS_uri_destroy (ret);
     ABORT ();
+  }
+  GNUNET_free (emsg);
   ret =
-    GNUNET_ECRS_string_to_uri (NULL,
-                               "gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test");
+      GNUNET_FS_uri_parse
+      ("gnunet://fs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test",
+       &emsg);
   if (ret == NULL)
+  {
+    GNUNET_free (emsg);
     ABORT ();
-  if (GNUNET_ECRS_uri_test_ksk (ret))
-    {
-      GNUNET_ECRS_uri_destroy (ret);
-      ABORT ();
-    }
-  if (!GNUNET_ECRS_uri_test_sks (ret))
-    {
-      GNUNET_ECRS_uri_destroy (ret);
-      ABORT ();
-    }
-
-  uri = GNUNET_ECRS_uri_to_string (ret);
-  if (0 != strcmp (uri,
-                   "gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test"))
-    {
-      GNUNET_ECRS_uri_destroy (ret);
-      GNUNET_free (uri);
-      ABORT ();
-    }
+  }
+  if (GNUNET_FS_uri_test_ksk (ret))
+  {
+    GNUNET_FS_uri_destroy (ret);
+    ABORT ();
+  }
+  if (!GNUNET_FS_uri_test_sks (ret))
+  {
+    GNUNET_FS_uri_destroy (ret);
+    ABORT ();
+  }
+
+  uri = GNUNET_FS_uri_to_string (ret);
+  if (0 !=
+      strcmp (uri,
+              "gnunet://fs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test"))
+  {
+    GNUNET_FS_uri_destroy (ret);
+    GNUNET_free (uri);
+    ABORT ();
+  }
   GNUNET_free (uri);
-  GNUNET_ECRS_uri_destroy (ret);
+  GNUNET_FS_uri_destroy (ret);
   return 0;
 }
 
@@ -185,51 +226,75 @@ static int
 testFile (int i)
 {
   char *uri;
-  struct GNUNET_ECRS_URI *ret;
+  struct GNUNET_FS_Uri *ret;
+  char *emsg;
 
   if (NULL !=
-      GNUNET_ECRS_string_to_uri (NULL,
-                                 "gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42"))
+      (ret =
+       GNUNET_FS_uri_parse
+       ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42",
+        &emsg)))
+  {
+    GNUNET_FS_uri_destroy (ret);
     ABORT ();
+  }
+  GNUNET_free (emsg);
   if (NULL !=
-      GNUNET_ECRS_string_to_uri (NULL,
-                                 "gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000"))
+      (ret =
+       GNUNET_FS_uri_parse
+       ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000",
+        &emsg)))
+  {
+    GNUNET_FS_uri_destroy (ret);
     ABORT ();
+  }
+  GNUNET_free (emsg);
   if (NULL !=
-      GNUNET_ECRS_string_to_uri (NULL,
-                                 "gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH"))
+      (ret =
+       GNUNET_FS_uri_parse
+       ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH",
+        &emsg)))
+  {
+    GNUNET_FS_uri_destroy (ret);
     ABORT ();
+  }
+  GNUNET_free (emsg);
   ret =
-    GNUNET_ECRS_string_to_uri (NULL,
-                               "gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42");
+      GNUNET_FS_uri_parse
+      ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42",
+       &emsg);
   if (ret == NULL)
+  {
+    GNUNET_free (emsg);
+    ABORT ();
+  }
+  if (GNUNET_FS_uri_test_ksk (ret))
+  {
+    GNUNET_FS_uri_destroy (ret);
     ABORT ();
-  if (GNUNET_ECRS_uri_test_ksk (ret))
-    {
-      GNUNET_ECRS_uri_destroy (ret);
-      ABORT ();
-    }
-  if (GNUNET_ECRS_uri_test_sks (ret))
-    {
-      GNUNET_ECRS_uri_destroy (ret);
-      ABORT ();
-    }
-  if (GNUNET_ntohll (ret->data.fi.file_length) != 42)
-    {
-      GNUNET_ECRS_uri_destroy (ret);
-      ABORT ();
-    }
-
-  uri = GNUNET_ECRS_uri_to_string (ret);
-  if (0 != strcmp (uri,
-                   "gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42"))
-    {
-      GNUNET_free (uri);
-      GNUNET_ECRS_uri_destroy (ret);
-      ABORT ();
-    }
+  }
+  if (GNUNET_FS_uri_test_sks (ret))
+  {
+    GNUNET_FS_uri_destroy (ret);
+    ABORT ();
+  }
+  if (GNUNET_ntohll (ret->data.chk.file_length) != 42)
+  {
+    GNUNET_FS_uri_destroy (ret);
+    ABORT ();
+  }
+
+  uri = GNUNET_FS_uri_to_string (ret);
+  if (0 !=
+      strcmp (uri,
+              "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42"))
+  {
+    GNUNET_free (uri);
+    GNUNET_FS_uri_destroy (ret);
+    ABORT ();
+  }
   GNUNET_free (uri);
-  GNUNET_ECRS_uri_destroy (ret);
+  GNUNET_FS_uri_destroy (ret);
   return 0;
 }
 
@@ -239,17 +304,27 @@ main (int argc, char *argv[])
   int failureCount = 0;
   int i;
 
-  GNUNET_disable_entropy_gathering ();
+  GNUNET_log_setup ("test_fs_uri",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  GNUNET_CRYPTO_random_disable_entropy_gathering ();
   failureCount += testKeyword ();
   failureCount += testLocation ();
   for (i = 0; i < 255; i++)
-    {
-      failureCount += testNamespace (i);
-      failureCount += testFile (i);
-    }
+  {
+    /* fprintf (stderr, "."); */
+    failureCount += testNamespace (i);
+    failureCount += testFile (i);
+  }
+  /* fprintf (stderr, "\n"); */
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri");
   if (failureCount != 0)
     return 1;
   return 0;
 }
 
-/* end of uritest.c */
+/* end of test_fs_uri.c */