From a5ee9e6f51b0fa6256773abaae062526b8a6e5fa Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 9 Feb 2012 13:10:36 +0100 Subject: [PATCH] Remove tests for deprecated multi-level dictionaries. --- src/xbt/dict.c | 81 -------------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/src/xbt/dict.c b/src/xbt/dict.c index d97047947d..226c5d1cc7 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -1236,85 +1236,4 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") xbt_dict_free(&head); } -#ifdef XBT_USE_DEPRECATED -static void str_free(void *s) -{ - char *c = *(char **) s; - free(c); -} -#endif - -XBT_TEST_UNIT("multicrash", test_dict_multicrash, "Multi-dict crash test") -{ -#ifdef XBT_USE_DEPRECATED - -#undef NB_ELM -#define NB_ELM 100 /*00 */ -#define DEPTH 5 -#define KEY_SIZE 512 -#define NB_TEST 20 /*20 */ - int verbose = 0; - - xbt_dict_t mdict = NULL; - int i, j, k, l; - xbt_dynar_t keys = xbt_dynar_new(sizeof(char *), str_free); - void *data; - char *key; - - - xbt_test_add("Generic multicache CRASH test"); - xbt_test_log - (" Fill the struct and frees it %d times, using %d elements, " - "depth of multicache=%d, key size=%d", NB_TEST, NB_ELM, DEPTH, - KEY_SIZE); - - for (l = 0; l < DEPTH; l++) { - key = xbt_malloc(KEY_SIZE); - xbt_dynar_push(keys, &key); - } - - for (i = 0; i < NB_TEST; i++) { - mdict = xbt_dict_new(); - XBT_VERB("mdict=%p", mdict); - if (verbose > 0) - printf("Test %d\n", i); - /* else if (i%10) printf("."); else printf("%d",i/10); */ - - for (j = 0; j < NB_ELM; j++) { - if (verbose > 0) - printf(" Add {"); - - for (l = 0; l < DEPTH; l++) { - key = *(char **) xbt_dynar_get_ptr(keys, l); - - for (k = 0; k < KEY_SIZE - 1; k++) - key[k] = rand() % ('z' - 'a') + 'a'; - - key[k] = '\0'; - - if (verbose > 0) - printf("%p=%s %s ", key, key, (l < DEPTH - 1 ? ";" : "}")); - } - if (verbose > 0) - printf("in multitree %p.\n", mdict); - - xbt_multidict_set(mdict, keys, xbt_strdup(key), free); - - data = xbt_multidict_get(mdict, keys); - - xbt_test_assert(data && !strcmp((char *) data, key), - "Retrieved value (%s) does not match the given one (%s)\n", - (char *) data, key); - } - xbt_dict_free(&mdict); - } - - xbt_dynar_free(&keys); - - xbt_dict_free(&mdict); - xbt_dynar_free(&keys); - -#endif -} - #endif /* SIMGRID_TEST */ -- 2.20.1