change rename str

diff --git a/tests/rename_tests.c b/tests/rename_tests.c
index a1556a6c5bf6913ace3bf1323fc0d98b87d11130..5392765ba99230a8eb01154b5e2002d622e69899 100644 (file)
--- a/tests/rename_tests.c
+++ b/tests/rename_tests.c
@@ -39,74 +39,88 @@ void rename_spaces()
        output = NULL;
 }
 
-void rename_ae(void **state)
+void rename_ae()
 {
-       char* output = (char*) *state;
        char* input = "wäre";
 
-       rename_str(input, output);
+       char* output = rename_string(input);
 
        assert_string_equal(output, "waere");
+
+       free(output);
+       output = NULL;
 }
 
-void rename_Ae(void **state)
+void rename_Ae()
 {
-       char* output = (char*) *state;
        char* input = "Ächtzen";
 
-       rename_str(input, output);
+       char* output = rename_string(input);
 
        assert_string_equal(output, "Aechtzen");
+
+       free(output);
+       output = NULL;
 }
 
-void rename_oe(void **state)
+void rename_oe()
 {
-       char* output = (char*) *state;
        char* input = "König";
 
-       rename_str(input, output);
+       char* output = rename_string(input);
 
        assert_string_equal(output, "Koenig");
+
+       free(output);
+       output = NULL;
 }
 
-void rename_Oe(void **state)
+void rename_Oe()
 {
-       char* output = (char*) *state;
        char* input = "Ökosystem";
 
-       rename_str(input, output);
+       char* output = rename_string(input);
 
        assert_string_equal(output, "Oekosystem");
+
+       free(output);
+       output = NULL;
 }
 
-void rename_ue(void **state)
+void rename_ue()
 {
-       char* output = (char*) *state;
        char* input = "brüllt";
 
-       rename_str(input, output);
+       char* output = rename_string(input);
 
        assert_string_equal(output, "bruellt");
+
+       free(output);
+       output = NULL;
 }
 
-void rename_Ue(void **state)
+void rename_Ue()
 {
-       char* output = (char*) *state;
        char* input = "Überlastung";
 
-       rename_str(input, output);
+       char* output = rename_string(input);
 
        assert_string_equal(output, "Ueberlastung");
+
+       free(output);
+       output = NULL;
 }
 
-void rename_scharfes_s(void **state)
+void rename_scharfes_s()
 {
-       char* output = (char*) *state;
        char* input = "Gruß";
 
-       rename_str(input, output);
+       char* output = rename_string(input);
 
        assert_string_equal(output, "Gruss");
+
+       free(output);
+       output = NULL;
 }
 
 void rename_lower_case(void **state)
@@ -225,13 +239,13 @@ int main()
 {
        const struct CMUnitTest tests[] = {
                cmocka_unit_test_setup_teardown(rename_spaces, setup, teardown),
-               cmocka_unit_test_setup_teardown(rename_ae, setup, teardown),
-               cmocka_unit_test_setup_teardown(rename_Ae, setup, teardown),
-               cmocka_unit_test_setup_teardown(rename_oe, setup, teardown),
-               cmocka_unit_test_setup_teardown(rename_Oe, setup, teardown),
-               cmocka_unit_test_setup_teardown(rename_ue, setup, teardown),
-               cmocka_unit_test_setup_teardown(rename_Ue, setup, teardown),
-               cmocka_unit_test_setup_teardown(rename_scharfes_s, setup, teardown),
+               cmocka_unit_test(rename_ae),
+               cmocka_unit_test(rename_Ae),
+               cmocka_unit_test(rename_oe),
+               cmocka_unit_test(rename_Oe),
+               cmocka_unit_test(rename_ue),
+               cmocka_unit_test(rename_Ue),
+               cmocka_unit_test(rename_scharfes_s),
                cmocka_unit_test_setup_teardown(rename_lower_case, setup, teardown),
                cmocka_unit_test_setup_teardown(rename_point_case, setup, teardown),
                cmocka_unit_test(escape_test),