X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_fs_file_information.c;h=cc79c8020a71aeeee1ba69f390c6a644ac01e0e4;hb=5f48d602887285cff6c14358a1d1c6f004a68510;hp=97a63062e9664e447e6ce03f7208ecf5e1208b98;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c index 97a63062e..cc79c8020 100644 --- a/src/fs/test_fs_file_information.c +++ b/src/fs/test_fs_file_information.c @@ -31,12 +31,10 @@ * - other API functions may not yet be tested (such as * filedata-from-callback) */ - #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO /** * File-size we use for testing. @@ -50,11 +48,8 @@ static int -mycleaner (void *cls, - struct GNUNET_FS_FileInformation *fi, - uint64_t length, - struct GNUNET_CONTAINER_MetaData *meta, - struct GNUNET_FS_Uri **uri, +mycleaner (void *cls, struct GNUNET_FS_FileInformation *fi, uint64_t length, + struct GNUNET_CONTAINER_MetaData *meta, struct GNUNET_FS_Uri **uri, struct GNUNET_FS_BlockOptions *bo, int *do_index, void **client_info) { return GNUNET_OK; @@ -62,9 +57,8 @@ mycleaner (void *cls, static void -run (void *cls, - char *const *args, - const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) +run (void *cls, char *const *args, const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) { const char *keywords[] = { "down_foo", @@ -89,9 +83,7 @@ run (void *cls, for (i = 0; i < FILESIZE; i++) buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); GNUNET_assert (FILESIZE == - GNUNET_DISK_fn_write (fn1, - buf, - FILESIZE, + GNUNET_DISK_fn_write (fn1, buf, FILESIZE, GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE)); GNUNET_free (buf); @@ -101,9 +93,7 @@ run (void *cls, for (i = 0; i < FILESIZE; i++) buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); GNUNET_assert (FILESIZE == - GNUNET_DISK_fn_write (fn2, - buf, - FILESIZE, + GNUNET_DISK_fn_write (fn2, buf, FILESIZE, GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE)); GNUNET_free (buf); @@ -114,21 +104,22 @@ run (void *cls, bo.anonymity_level = 1; bo.replication_level = 0; bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); - fi1 = GNUNET_FS_file_information_create_from_file (fs, - "file_information-context1", - fn1, - kuri, - meta, GNUNET_YES, &bo); + fi1 = + GNUNET_FS_file_information_create_from_file (fs, + "file_information-context1", + fn1, kuri, meta, GNUNET_YES, + &bo); GNUNET_assert (fi1 != NULL); - fi2 = GNUNET_FS_file_information_create_from_file (fs, - "file_information-context2", - fn2, - kuri, - meta, GNUNET_YES, &bo); + fi2 = + GNUNET_FS_file_information_create_from_file (fs, + "file_information-context2", + fn2, kuri, meta, GNUNET_YES, + &bo); GNUNET_assert (fi2 != NULL); - fidir = GNUNET_FS_file_information_create_empty_directory (fs, - "file_information-context-dir", - kuri, meta, &bo); + fidir = + GNUNET_FS_file_information_create_empty_directory (fs, + "file_information-context-dir", + kuri, meta, &bo, NULL); GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1)); GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2)); GNUNET_FS_uri_destroy (kuri); @@ -144,64 +135,6 @@ run (void *cls, } -static int -testThumbnail () -{ - struct GNUNET_CONTAINER_MetaData *m; - struct GNUNET_CONTAINER_MetaData *d; - struct EXTRACTOR_PluginList *ex; - unsigned char *thumb; - size_t size; - char *date; - - ex = EXTRACTOR_plugin_add_config (NULL, "thumbnailgtk", - EXTRACTOR_OPTION_DEFAULT_POLICY); - if (ex == NULL) - { - fprintf (stderr, - "Test incomplete, have no GTK thumbnail extractor available.\n"); - return 0; /* can not test, no thumbnailer */ - } - ex = EXTRACTOR_plugin_add_config (ex, "mime", - EXTRACTOR_OPTION_DEFAULT_POLICY); - m = GNUNET_CONTAINER_meta_data_create (); - if (3 != GNUNET_FS_meta_data_extract_from_file (m, - "test_fs_file_information_meta_data_image.jpg", - ex)) - { - GNUNET_break (0); - EXTRACTOR_plugin_remove_all (ex); - GNUNET_CONTAINER_meta_data_destroy (m); - return 1; - } - EXTRACTOR_plugin_remove_all (ex); - d = GNUNET_CONTAINER_meta_data_duplicate (m); - GNUNET_CONTAINER_meta_data_destroy (m); - thumb = NULL; - size = GNUNET_CONTAINER_meta_data_get_thumbnail (d, &thumb); - if (size == 0) - { - GNUNET_break (0); - GNUNET_CONTAINER_meta_data_destroy (d); - return 1; - } - GNUNET_free (thumb); - GNUNET_CONTAINER_meta_data_add_publication_date (d); - date = GNUNET_CONTAINER_meta_data_get_by_type (d, - EXTRACTOR_METATYPE_PUBLICATION_DATE); - if (date == NULL) - { - GNUNET_break (0); - GNUNET_CONTAINER_meta_data_destroy (d); - return 1; - } - GNUNET_free (date); - GNUNET_CONTAINER_meta_data_destroy (d); - return 0; -} - - - int main (int argc, char *argv[]) { @@ -209,9 +142,6 @@ main (int argc, char *argv[]) "test-fs-file_information", "-c", "test_fs_file_information_data.conf", -#if VERBOSE - "-L", "DEBUG", -#endif NULL }; struct GNUNET_GETOPT_CommandLineOption options[] = { @@ -219,17 +149,11 @@ main (int argc, char *argv[]) }; GNUNET_log_setup ("test_fs_file_information", -#if VERBOSE - "DEBUG", -#else "WARNING", -#endif NULL); - if (0 != testThumbnail ()) - return 1; - GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, - argvx, "test-fs-file_information", - "nohelp", options, &run, NULL); + GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, + "test-fs-file_information", "nohelp", options, &run, + NULL); return 0; }