#include "xbt/set.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(set,xbt,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_set,xbt,
"set: data container consisting in dict+dynar");
/*####[ Type definition ]####################################################*/
xbt_set_elm_t found_in_dict = NULL;
xbt_ex_t e;
+ VERB1("add %s to the set",elm->name);
+
if (elm->name_len <= 0) {
elm->name_len = strlen(elm->name);
}
return res;
}
+/** @brief Constructor */
+unsigned long xbt_set_length (const xbt_set_t set) {
+ return xbt_dynar_length(set->dynar);
+}
+
/***
*** Cursors
***/
elm->data=xbt_strdup(data);
- xbt_test_log2(" - Add %s (->%s)",name,data);
+ xbt_test_log2("Add %s (->%s)",name,data);
xbt_set_add(set, (xbt_set_elm_t)elm, &my_elem_free);
}
if (strcmp(elm->name,elm->data))
THROW2(mismatch_error,0,"The name (%s) != data (%s)",
elm->name,elm->data);
- fflush(stdout);
}
xbt_set_get_by_name(set,data);
THROW1(unknown_error,0,"Found something which shouldn't be there (%s)",data);
} CATCH(e) {
- if (e.category != not_found_error) {
+ if (e.category != not_found_error)
xbt_test_exception(e);
- }
xbt_ex_free(e);
}
}
traverse(set);
}
-XBT_TEST_UNIT("retrieve",test_set_retrieve,"Retrieve some values") {
+XBT_TEST_UNIT("retrieve",test_set_retrieve,"Retrieving some values") {
my_elem_t elm;
xbt_test_add0("Search 123");
elm = (my_elem_t) xbt_set_get_by_name(set,"123");
xbt_test_assert0(elm,"elm must be there");
- strcmp("123",elm->data);
+ xbt_assert(!strcmp("123",elm->data));
search_not_found(set,"Can't be found");
search_not_found(set,"123 Can't be found");