X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b024b9e443552c94609fc56a240cdb199a329853..3f4f5e63dadc0023c0a02a08af8e9e9801b38e8e:/src/xbt/dynar_test.cpp diff --git a/src/xbt/dynar_test.cpp b/src/xbt/dynar_test.cpp index dbd32ca0d1..cf36c745ab 100644 --- a/src/xbt/dynar_test.cpp +++ b/src/xbt/dynar_test.cpp @@ -1,6 +1,6 @@ /* a generic DYNamic ARray implementation. */ -/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -8,16 +8,16 @@ #include "xbt/dynar.h" #include "xbt/sysdep.h" -#include "catch.hpp" +#include "src/3rd-party/catch.hpp" + +#include constexpr int NB_ELEM = 5000; TEST_CASE("xbt::dynar: generic C vector", "dynar") { - SECTION("Dynars of integers") { - /* Vars_decl [doxygen cruft] */ int cpt; unsigned int cursor; @@ -31,7 +31,6 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") /* in your code is naturally the way to go outside a regression test */ INFO("==== Push " << NB_ELEM << " int, set them again 3 times, traverse them, shift them"); - /* Populate_ints [doxygen cruft] */ /* 1. Populate the dynar */ d = xbt_dynar_new(sizeof(int), nullptr); for (int i = 0; i < NB_ELEM; i++) { @@ -41,7 +40,7 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") /* 2. Traverse manually the dynar */ for (int i = 0; i < NB_ELEM; i++) { - int* iptr = (int*)xbt_dynar_get_ptr(d, i); + const int* iptr = (int*)xbt_dynar_get_ptr(d, i); REQUIRE(i == *iptr); // The retrieved value is not the same than the injected one } @@ -76,19 +75,6 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") } REQUIRE(xbt_dynar_is_empty(d)); - for (int i = 0; i < NB_ELEM; i++) { - xbt_dynar_push_as(d, int, -1); - } - int* pi; - xbt_dynar_foreach_ptr(d, cursor, pi) { *pi = 0; } - xbt_dynar_foreach (d, cursor, cpt) { - REQUIRE(cpt == 0); // The value is not the same as the expected one. - } - xbt_dynar_foreach_ptr(d, cursor, pi) { *pi = 1; } - xbt_dynar_foreach (d, cursor, cpt) { - REQUIRE(cpt == 1); // The value is not the same as the expected one - } - /* 5. Free the resources */ xbt_dynar_free(&d); /* This code is used both as example and as regression test, so we try to */ xbt_dynar_free(&d); /* free the struct twice here to check that it's ok, but freeing it only once */ @@ -112,24 +98,11 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") for (int i = 0; i < NB_ELEM; i++) { xbt_dynar_push_as(d, int, i); } - for (int i = 0; i < NB_ELEM / 5; i++) { - xbt_dynar_insert_at_as(d, NB_ELEM / 2, int, i); - } - for (int i = 0; i < NB_ELEM / 2; i++) { - int val; - xbt_dynar_shift(d, &val); - REQUIRE(val == i); // The retrieved value is not the same than the injected one at the begining - } - for (int i = 999; i >= 0; i--) { - int val; - xbt_dynar_shift(d, &val); - REQUIRE(val == i); // The retrieved value is not the same than the injected one in the middle - } - for (int i = 2500; i < NB_ELEM; i++) { + for (int i = 0; i < NB_ELEM; i++) { int val; xbt_dynar_shift(d, &val); - REQUIRE(val == i); // The retrieved value is not the same than the injected one at the end + REQUIRE(val == i); // The retrieved value is not the same than the injected one at the beginning } xbt_dynar_free(&d); /* This code is used both as example and as regression test, so we try to */ xbt_dynar_free(&d); /* free the struct twice here to check that it's ok, but freeing it only once */ @@ -183,27 +156,6 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") } REQUIRE(xbt_dynar_is_empty(d)); xbt_dynar_free(&d); - - /* ********************* */ - INFO("==== Insert " << NB_ELEM << " int in reverse order, traverse them, remove them"); - d = xbt_dynar_new(sizeof(int), nullptr); - for (int i = NB_ELEM - 1; i >= 0; i--) { - xbt_dynar_replace(d, i, &i); - } - - /* 3. Traverse the dynar */ - xbt_dynar_foreach (d, cursor, cpt) { - REQUIRE(cursor == (unsigned)cpt); // The retrieved value is not the same than the injected one - } - /* end_of_traversal */ - - for (int i = NB_ELEM - 1; i >= 0; i--) { - int val; - xbt_dynar_remove_at(d, xbt_dynar_length(d) - 1, &val); - REQUIRE(val == i); // The retrieved value is not the same than the injected one - } - REQUIRE(xbt_dynar_is_empty(d)); - xbt_dynar_free(&d); } /*******************************************************************************/ @@ -272,7 +224,7 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") for (int i = 0; i < 2500; i++) { d1 = (double)i; xbt_dynar_shift(d, &d2); - REQUIRE(d1 == d2); // The retrieved value is not the same than the injected one at the begining + REQUIRE(d1 == d2); // The retrieved value is not the same than the injected one at the beginning } for (int i = 999; i >= 0; i--) { d1 = (double)i; @@ -308,7 +260,6 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") SECTION("Dynars of strings") { unsigned int iter; - char buf[1024]; char* s1; char* s2; @@ -326,21 +277,14 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") d = xbt_dynar_new(sizeof(char*), &xbt_free_ref); /* 1. Populate the dynar */ for (int i = 0; i < NB_ELEM; i++) { - snprintf(buf, 1023, "%d", i); - s1 = xbt_strdup(buf); + std::string val = std::to_string(i); + s1 = xbt_strdup(val.c_str()); xbt_dynar_push(d, &s1); } - for (int k = 0; k < 3; k++) { - for (int i = 0; i < NB_ELEM; i++) { - snprintf(buf, 1023, "%d", i); - s1 = xbt_strdup(buf); - xbt_dynar_replace(d, i, &s1); - } - } for (int i = 0; i < NB_ELEM; i++) { - snprintf(buf, 1023, "%d", i); + std::string val = std::to_string(i); xbt_dynar_shift(d, &s2); - REQUIRE(not strcmp(buf, s2)); // The retrieved value is not the same than the injected one + REQUIRE(s2 == val); // The retrieved value is not the same than the injected one xbt_free(s2); } xbt_dynar_free(&d); /* This code is used both as example and as regression test, so we try to */ @@ -350,20 +294,20 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") INFO("==== Unshift, traverse and pop " << NB_ELEM << " strings"); d = xbt_dynar_new(sizeof(char**), &xbt_free_ref); for (int i = 0; i < NB_ELEM; i++) { - snprintf(buf, 1023, "%d", i); - s1 = xbt_strdup(buf); + std::string val = std::to_string(i); + s1 = xbt_strdup(val.c_str()); xbt_dynar_unshift(d, &s1); } /* 2. Traverse the dynar with the macro */ xbt_dynar_foreach (d, iter, s1) { - snprintf(buf, 1023, "%u", NB_ELEM - iter - 1); - REQUIRE(not strcmp(buf, s1)); // The retrieved value is not the same than the injected one + std::string val = std::to_string(NB_ELEM - iter - 1); + REQUIRE(s1 == val); // The retrieved value is not the same than the injected one } /* 3. Traverse the dynar with the macro */ for (int i = 0; i < NB_ELEM; i++) { - snprintf(buf, 1023, "%d", i); + std::string val = std::to_string(i); xbt_dynar_pop(d, &s2); - REQUIRE(not strcmp(buf, s2)); // The retrieved value is not the same than the injected one + REQUIRE(s2 == val); // The retrieved value is not the same than the injected one xbt_free(s2); } /* 4. Free the resources */ @@ -374,32 +318,32 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") INFO("==== Push " << NB_ELEM << " strings, insert " << (NB_ELEM / 5) << " strings in the middle, shift everything"); d = xbt_dynar_new(sizeof(char*), &xbt_free_ref); for (int i = 0; i < NB_ELEM; i++) { - snprintf(buf, 1023, "%d", i); - s1 = xbt_strdup(buf); + std::string val = std::to_string(i); + s1 = xbt_strdup(val.c_str()); xbt_dynar_push(d, &s1); } for (int i = 0; i < NB_ELEM / 5; i++) { - snprintf(buf, 1023, "%d", i); - s1 = xbt_strdup(buf); + std::string val = std::to_string(i); + s1 = xbt_strdup(val.c_str()); xbt_dynar_insert_at(d, NB_ELEM / 2, &s1); } for (int i = 0; i < NB_ELEM / 2; i++) { - snprintf(buf, 1023, "%d", i); + std::string val = std::to_string(i); xbt_dynar_shift(d, &s2); - REQUIRE(not strcmp(buf, s2)); // The retrieved value is not the same than the injected one at the beginning + REQUIRE(s2 == val); // The retrieved value is not the same than the injected one at the beginning xbt_free(s2); } for (int i = (NB_ELEM / 5) - 1; i >= 0; i--) { - snprintf(buf, 1023, "%d", i); + std::string val = std::to_string(i); xbt_dynar_shift(d, &s2); - REQUIRE(not strcmp(buf, s2)); // The retrieved value is not the same than the injected one in the middle + REQUIRE(s2 == val); // The retrieved value is not the same than the injected one in the middle xbt_free(s2); } for (int i = NB_ELEM / 2; i < NB_ELEM; i++) { - snprintf(buf, 1023, "%d", i); + std::string val = std::to_string(i); xbt_dynar_shift(d, &s2); - REQUIRE(not strcmp(buf, s2)); // The retrieved value is not the same than the injected one at the end + REQUIRE(s2 == val); // The retrieved value is not the same than the injected one at the end xbt_free(s2); } xbt_dynar_free(&d); /* This code is used both as example and as regression test, so we try to */ @@ -410,14 +354,14 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar") << ". free the rest"); d = xbt_dynar_new(sizeof(char*), &xbt_free_ref); for (int i = 0; i < NB_ELEM; i++) { - snprintf(buf, 1023, "%d", i); - s1 = xbt_strdup(buf); + std::string val = std::to_string(i); + s1 = xbt_strdup(val.c_str()); xbt_dynar_push(d, &s1); } for (int i = 2 * (NB_ELEM / 5); i < 4 * (NB_ELEM / 5); i++) { - snprintf(buf, 1023, "%d", i); + std::string val = std::to_string(i); xbt_dynar_remove_at(d, 2 * (NB_ELEM / 5), &s2); - REQUIRE(not strcmp(buf, s2)); // Remove a bad value + REQUIRE(s2 == val); // Remove a bad value xbt_free(s2); } xbt_dynar_free(&d); /* end_of_doxygen */