improve tests

diff --git a/src/tests/bin/utils b/src/tests/bin/utils
new file mode 100755 (executable)
index 0000000..0e2bec6
Binary files /dev/null and b/src/tests/bin/utils differ

diff --git a/src/tests/launcher.c b/src/tests/launcher.c
index 2fdd21c11e60b437b1a1b27997203f3f71b5513e..c1f74a5010dcd887528df44a5b55f9dbdc857376 100644 (file)
--- a/src/tests/launcher.c
+++ b/src/tests/launcher.c
@@ -45,9 +45,12 @@ static char ORANGE[] = { (char) 27, '[', '3', '3', 'm', '\0' };
 static char STOP[] = { (char) 27, '[', '0', 'm', '\0' };
 static char bs9[] = { 8, 8, 8, 8, 8, 8, 8, 8, 8, '\0' };
 
+// COLORTERM : if it exists and is not empty, the system will default to
+// colour mode (--color) as opposed to --no-color
+
 // CK_ENV : Gets the print mode from the environment variable CK_VERBOSITY,
 // which can have the values "silent", "minimal", "normal", "verbose". If the
-// variable is not found or the value is not recognized, the print mode is set
+// variable is not found or the value is not recognised, the print mode is set
 // to CK_NORMAL.
 
 // How to start the program:
@@ -163,9 +166,12 @@ int main(int argc, char **argv) {
 
 static int has_colour() {
        if (launcher_color == -1) {
-               // TODO: detect if terminal supports colour mode
-               // for instance, check if $COLORTERM is not empty?
-               launcher_color = 1;
+               // TODO: could we do better?
+               const char *cterm = getenv("COLORTERM");
+               if (cterm && cterm[0])
+                       launcher_color = 1;
+               else
+                       launcher_color = 0;
        }
 
        return launcher_color;

diff --git a/src/tests/launcher.o b/src/tests/launcher.o
new file mode 100644 (file)
index 0000000..ea0fcf6
Binary files /dev/null and b/src/tests/launcher.o differ

diff --git a/src/tests/utils/array.o b/src/tests/utils/array.o
new file mode 100644 (file)
index 0000000..56480d7
Binary files /dev/null and b/src/tests/utils/array.o differ

diff --git a/src/tests/utils/cstring.c b/src/tests/utils/cstring.c
index 8fd1e1052a58ff9d742abf4791f6badf4c5b598c..daa612cbccdc56e106d5c237c8c30f511445b1d6 100644 (file)
--- a/src/tests/utils/cstring.c
+++ b/src/tests/utils/cstring.c
@@ -407,6 +407,186 @@ START(clear)
                if (s->length)
                        FAIL("empty cstring has a size of %zu", s->length);
 
+               cstring_add(s, "testy");
+               cstring_clear(s);
+               if (s->length)
+                       FAIL("cleared cstring has a size of %zu", s->length);
+
+               END
+
+START(convert)
+               char *str;
+
+               str = cstring_convert(s);
+               s = NULL;
+
+               ASSERT_EQUALS_STR("Convert failed with an empty string", "", str);
+
+               reset();
+
+               cstring_add(s, "testy");
+               str = cstring_convert(s);
+               s = NULL;
+               ASSERT_EQUALS_STR("Convert did not return the same string", "testy",
+                               str);
+
+               END
+
+START(clone)
+               cstring *clone;
+
+               clone = cstring_clone(NULL);
+               if (clone)
+                       FAIL("Cloning NULL must return NULL");
+
+               clone = cstring_clone(s);
+               ASSERT_EQUALS_STR("Cannot clone the empty string", "", clone->string);
+               free_cstring(clone);
+
+               cstring_add(s, "Testy viva la vida");
+               clone = cstring_clone(s);
+               ASSERT_EQUALS_STR("Failed to clone the string", s->string,
+                               clone->string);
+               free_cstring(clone);
+
+               END
+
+START(rtrim)
+               char *expected;
+
+               expected = "testy";
+               cstring_add(s, expected);
+               cstring_add(s, "  ");
+
+               cstring_rtrim(s, ' ');
+               ASSERT_EQUALS_STR("(a) Failed to rtrim", expected, s->string);
+
+               reset();
+
+               expected = "   testy";
+               cstring_add(s, expected);
+               cstring_add(s, "  ");
+
+               cstring_rtrim(s, ' ');
+               ASSERT_EQUALS_STR("(b) Failed to rtrim", expected, s->string);
+
+               reset();
+
+               expected = "   testy   ";
+               cstring_add(s, expected);
+               cstring_add(s, "...");
+
+               cstring_rtrim(s, '.');
+               ASSERT_EQUALS_STR("(c) Failed to rtrim", expected, s->string);
+
+               reset();
+
+               expected = "...testy   ";
+               cstring_add(s, expected);
+               cstring_add(s, "...");
+
+               cstring_rtrim(s, '.');
+               ASSERT_EQUALS_STR("(d) Failed to rtrim", expected, s->string);
+
+               END
+
+START(trim)
+               char *expected;
+
+               expected = "testy";
+               cstring_add(s, expected);
+               cstring_add(s, "  ");
+
+               cstring_trim(s, ' ');
+               ASSERT_EQUALS_STR("(a) Failed to trim", expected, s->string);
+
+               reset();
+
+               expected = "testy";
+               cstring_add(s, "  ");
+               cstring_add(s, expected);
+               cstring_add(s, "  ");
+
+               cstring_trim(s, ' ');
+               ASSERT_EQUALS_STR("(b) Failed to trim", expected, s->string);
+
+               reset();
+
+               expected = "   testy   ";
+               cstring_add(s, expected);
+               cstring_add(s, "...");
+
+               cstring_trim(s, '.');
+               ASSERT_EQUALS_STR("(c) Failed to trim", expected, s->string);
+
+               reset();
+
+               expected = "   testy   ";
+               cstring_add(s, "...");
+               cstring_add(s, expected);
+               cstring_add(s, "...");
+
+               cstring_trim(s, '.');
+               ASSERT_EQUALS_STR("(d) Failed to trim", expected, s->string);
+
+               END
+
+START(toupper)
+               cstring_add(s, "");
+               cstring_toupper(s);
+               ASSERT_EQUALS_STR("Failed to uppercase empty", "", s->string);
+
+               reset();
+
+               cstring_add(s, "Simple Testy");
+               cstring_toupper(s);
+               ASSERT_EQUALS_STR("Failed to uppercase", "SIMPLE TESTY", s->string);
+
+               reset();
+
+               cstring_add(s, "C'est l'été");
+               cstring_toupper(s);
+               ASSERT_EQUALS_STR("Failed to uppercase", "C'EST L'ÉTÉ", s->string);
+
+               reset();
+
+               cstring_add(s, "Test en français");
+               cstring_toupper(s);
+               ASSERT_EQUALS_STR("Failed to uppercase", "TEST EN FRANÇAIS", s->string);
+
+               END
+
+START(tolower)
+               cstring_add(s, "");
+               cstring_tolower(s);
+               ASSERT_EQUALS_STR("Failed to lowercase empty", "", s->string);
+
+               reset();
+
+               cstring_add(s, "Simple Testy");
+               cstring_tolower(s);
+               ASSERT_EQUALS_STR("Failed to lowercase", "simple testy", s->string);
+
+               reset();
+
+               cstring_add(s, "Été ! C'est l'été !");
+               cstring_tolower(s);
+               ASSERT_EQUALS_STR("Failed to lowercase", "été ! c'est l'été !",
+                               s->string);
+
+               reset();
+
+               cstring_add(s, "Test en français");
+               cstring_tolower(s);
+               ASSERT_EQUALS_STR("Failed to lowercase", "test en français", s->string);
+
+               reset();
+
+               cstring_add(s, "À la claire fontaine");
+               cstring_tolower(s);
+               ASSERT_EQUALS_STR("Failed to lowercase", "à la claire fontaine",
+                               s->string);
+
                END
 
 START(readln)
@@ -467,8 +647,14 @@ Suite *test_cstring(const char title[]) {
        tcase_add_test(core, ends_with);
        tcase_add_test(core, find);
        tcase_add_test(core, rfind);
-
        tcase_add_test(core, clear);
+       tcase_add_test(core, convert);
+       tcase_add_test(core, clone);
+       tcase_add_test(core, rtrim);
+       tcase_add_test(core, trim);
+       tcase_add_test(core, toupper);
+       tcase_add_test(core, tolower);
+
        tcase_add_test(core, readln);
 
        suite_add_tcase(suite, core);

diff --git a/src/tests/utils/cstring.o b/src/tests/utils/cstring.o
new file mode 100644 (file)
index 0000000..6da56ba
Binary files /dev/null and b/src/tests/utils/cstring.o differ

diff --git a/src/tests/utils/main.o b/src/tests/utils/main.o
new file mode 100644 (file)
index 0000000..b632e13
Binary files /dev/null and b/src/tests/utils/main.o differ