From: Agnieszka Baumann <a.baumann@samsung.com>
Date: Mon, 3 Feb 2020 15:09:33 +0000 (+0100)
Subject: make filenames consistent
X-Git-Tag: accepted/tizen/unified/20200214.120106~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=448a0bfc4379b7a17f3690be46e2b0011946ce50;p=platform%2Fcore%2Fsystem%2Fresourced.git

make filenames consistent

Change-Id: I4e1bea4a32939d00a312d1efaa8ec28f8f1ba472
---

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a302b0a..29f347d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -26,12 +26,12 @@ ADD_CUSTOM_TARGET(do-test ALL make test
 # build unit test
 ADD_EXECUTABLE(cmocka-core cmocka-core.c)
 ADD_EXECUTABLE(cmocka-proc-dbus-typecheck cmocka-proc-dbus-typecheck.c)
-ADD_EXECUTABLE(cmocka_proc_dbus_aul_group cmocka_proc_dbus_aul_group.c)
-ADD_EXECUTABLE(cmocka_proc_add_app_info cmocka_proc_add_app_info.c)
-ADD_EXECUTABLE(cmocka_dbus_get_memory_lists cmocka_dbus_get_memory_lists.c)
-ADD_EXECUTABLE(cmocka_dbus_get_cpu_lists cmocka_dbus_get_cpu_lists.c)
+ADD_EXECUTABLE(cmocka-proc-dbus-aul-group cmocka-proc-dbus-aul-group.c)
+ADD_EXECUTABLE(cmocka-proc-add-app-info cmocka-proc-add-app-info.c)
+ADD_EXECUTABLE(cmocka-dbus-get-memory-lists cmocka-dbus-get-memory-lists.c)
+ADD_EXECUTABLE(cmocka-dbus-get-cpu-lists cmocka-dbus-get-cpu-lists.c)
 ADD_EXECUTABLE(cmocka-file-helper cmocka-file-helper.c)
-ADD_EXECUTABLE(cmocka_test_child_pid cmocka_test_child_pid.c)
+ADD_EXECUTABLE(cmocka-test-child-pid cmocka-test-child-pid.c)
 
 PKG_CHECK_MODULES(CMOCKA REQUIRED cmocka)
 
@@ -64,24 +64,24 @@ SET_TARGET_PROPERTIES(cmocka-proc-dbus-typecheck PROPERTIES COMPILE_FLAGS
 TARGET_LINK_LIBRARIES(cmocka-proc-dbus-typecheck resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
 	"-Wl,--wrap=fread_int,--wrap=fread_uint,--wrap=fread_ulong,--wrap=proc_set_group,--wrap=g_dbus_method_invocation_get_message,--wrap=g_dbus_message_new_method_reply,--wrap=d_bus_reply_message,--wrap=g_object_unref,--wrap=g_dbus_method_invocation_return_value,--wrap=find_app_info_by_appid,--wrap=proc_get_mem_usage,--wrap=proc_get_cpu_time,--wrap=resourced_proc_status_change,--wrap=resourced_notify,--wrap=proc_set_runtime_exclude_list,--wrap=find_app_info,--wrap=proc_add_app_info,--wrap=proc_create_app_info,--wrap=proc_app_list_add_app_info,--wrap=proc_check_suspend_state,--wrap=g_dbus_method_invocation_return_error,--wrap=proc_dbus_exclude_signal_handler -O0")
 
-SET_TARGET_PROPERTIES(cmocka_proc_dbus_aul_group PROPERTIES COMPILE_FLAGS
+SET_TARGET_PROPERTIES(cmocka-proc-dbus-aul-group PROPERTIES COMPILE_FLAGS
 	"-I${INCLUDE_COMMON_DIR} -I${INCLUDE_PUBLIC_DIR} -I${COMMON_SOURCE_DIR} -I${PROC-STAT_SOURCE_DIR}/include -I${PROC-STAT_SOURCE_DIR} -I${RESOURCED_SOURCE_DIR} -I${MEMORY_SOURCE_DIR} -I${SWAP_SOURCE_DIR} -I${MODULES_SOURCE_DIR} -I${FREEZER_SOURCE_DIR} -I${FREEZER_SOURCE_DIR}/include -I${HEART_SOURCE_DIR} -I${CPU_SOURCE_DIR} -I${VIP_SOURCE_DIR} -I${BLOCK_SOURCE_DIR} -I/usr/include/dlog ${GLIB2_CFLAGS} ${UNIT_TESTS_CFLAGS}")
-TARGET_LINK_LIBRARIES(cmocka_proc_dbus_aul_group resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
+TARGET_LINK_LIBRARIES(cmocka-proc-dbus-aul-group resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
 	"-Wl,--wrap=fread_int,--wrap=fread_uint,--wrap=fread_ulong,--wrap=proc_set_group,--wrap=proc_get_oom_score_adj,--wrap=resourced_notify -O0")
 
-SET_TARGET_PROPERTIES(cmocka_proc_add_app_info PROPERTIES COMPILE_FLAGS
+SET_TARGET_PROPERTIES(cmocka-proc-add-app-info PROPERTIES COMPILE_FLAGS
 	"-I${INCLUDE_COMMON_DIR} -I${INCLUDE_PUBLIC_DIR} -I${COMMON_SOURCE_DIR} -I${PROC-STAT_SOURCE_DIR}/include -I${PROC-STAT_SOURCE_DIR} -I${RESOURCED_SOURCE_DIR} -I${MEMORY_SOURCE_DIR} -I${SWAP_SOURCE_DIR} -I${MODULES_SOURCE_DIR} -I${FREEZER_SOURCE_DIR} -I${FREEZER_SOURCE_DIR}/include -I${HEART_SOURCE_DIR} -I${CPU_SOURCE_DIR} -I${VIP_SOURCE_DIR} -I${BLOCK_SOURCE_DIR} -I/usr/include/dlog ${GLIB2_CFLAGS} ${UNIT_TESTS_CFLAGS}")
-TARGET_LINK_LIBRARIES(cmocka_proc_add_app_info resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
+TARGET_LINK_LIBRARIES(cmocka-proc-add-app-info resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
 	"-Wl,--wrap=fread_int,--wrap=fread_uint,--wrap=fread_ulong,--wrap=g_slist_prepend,--wrap=g_slist_remove -O0 -g -ggdb")
 
-SET_TARGET_PROPERTIES(cmocka_dbus_get_memory_lists PROPERTIES COMPILE_FLAGS
+SET_TARGET_PROPERTIES(cmocka-dbus-get-memory-lists PROPERTIES COMPILE_FLAGS
 	"-I${INCLUDE_COMMON_DIR} -I${INCLUDE_PUBLIC_DIR} -I${COMMON_SOURCE_DIR} -I${PROC-STAT_SOURCE_DIR}/include -I${PROC-STAT_SOURCE_DIR} -I${RESOURCED_SOURCE_DIR} -I${MEMORY_SOURCE_DIR} -I${SWAP_SOURCE_DIR} -I${MODULES_SOURCE_DIR} -I${FREEZER_SOURCE_DIR} -I${FREEZER_SOURCE_DIR}/include -I${HEART_SOURCE_DIR} -I${CPU_SOURCE_DIR} -I${VIP_SOURCE_DIR} -I${BLOCK_SOURCE_DIR} -I/usr/include/dlog ${GLIB2_CFLAGS} ${UNIT_TESTS_CFLAGS}")
-TARGET_LINK_LIBRARIES(cmocka_dbus_get_memory_lists resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
+TARGET_LINK_LIBRARIES(cmocka-dbus-get-memory-lists resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
 	"-Wl,--wrap=fread_int,--wrap=fread_uint,--wrap=fread_ulong,--wrap=g_dbus_method_invocation_return_value,--wrap=proc_get_mem_usage,--wrap=g_dbus_method_invocation_get_message,--wrap=g_dbus_message_new_method_reply,--wrap=d_bus_reply_message -O0")
 
-SET_TARGET_PROPERTIES(cmocka_dbus_get_cpu_lists PROPERTIES COMPILE_FLAGS
+SET_TARGET_PROPERTIES(cmocka-dbus-get-cpu-lists PROPERTIES COMPILE_FLAGS
 	"-I${INCLUDE_COMMON_DIR} -I${INCLUDE_PUBLIC_DIR} -I${COMMON_SOURCE_DIR} -I${PROC-STAT_SOURCE_DIR}/include -I${PROC-STAT_SOURCE_DIR} -I${RESOURCED_SOURCE_DIR} -I${MEMORY_SOURCE_DIR} -I${SWAP_SOURCE_DIR} -I${MODULES_SOURCE_DIR} -I${FREEZER_SOURCE_DIR} -I${FREEZER_SOURCE_DIR}/include -I${HEART_SOURCE_DIR} -I${CPU_SOURCE_DIR} -I${VIP_SOURCE_DIR} -I${BLOCK_SOURCE_DIR} -I/usr/include/dlog ${GLIB2_CFLAGS} ${UNIT_TESTS_CFLAGS}")
-TARGET_LINK_LIBRARIES(cmocka_dbus_get_cpu_lists resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
+TARGET_LINK_LIBRARIES(cmocka-dbus-get-cpu-lists resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
 	"-Wl,--wrap=fread_int,--wrap=fread_uint,--wrap=fread_ulong,--wrap=proc_get_uptime,--wrap=proc_get_cpu_time,--wrap=g_dbus_method_invocation_return_value,--wrap=g_dbus_method_invocation_get_message,--wrap=g_dbus_message_new_method_reply,--wrap=d_bus_reply_message -O0")
 
 SET_TARGET_PROPERTIES(cmocka-file-helper PROPERTIES COMPILE_FLAGS
@@ -89,9 +89,9 @@ SET_TARGET_PROPERTIES(cmocka-file-helper PROPERTIES COMPILE_FLAGS
 TARGET_LINK_LIBRARIES(cmocka-file-helper resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
 	"-Wl,--wrap=fopen,--wrap=fputs,--wrap=fscanf,--wrap=fgets,--wrap=fopen64,--wrap=vfscanf,--wrap=fscanf64,--wrap=__isoc99_fscanf,--wrap=asprintf -O0")
 
-SET_TARGET_PROPERTIES(cmocka_test_child_pid PROPERTIES COMPILE_FLAGS
+SET_TARGET_PROPERTIES(cmocka-test-child-pid PROPERTIES COMPILE_FLAGS
 	"-I${INCLUDE_COMMON_DIR} -I${INCLUDE_PUBLIC_DIR} -I${COMMON_SOURCE_DIR} -I${PROC-STAT_SOURCE_DIR}/include -I${PROC-STAT_SOURCE_DIR} -I${RESOURCED_SOURCE_DIR} -I${MEMORY_SOURCE_DIR} -I${SWAP_SOURCE_DIR} -I${MODULES_SOURCE_DIR} -I${FREEZER_SOURCE_DIR} -I${FREEZER_SOURCE_DIR}/include -I${HEART_SOURCE_DIR} -I${CPU_SOURCE_DIR} -I${VIP_SOURCE_DIR} -I${BLOCK_SOURCE_DIR} -I/usr/include/dlog ${GLIB2_CFLAGS} ${UNIT_TESTS_CFLAGS}")
-TARGET_LINK_LIBRARIES(cmocka_test_child_pid resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
+TARGET_LINK_LIBRARIES(cmocka-test-child-pid resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
 	"-Wl,--wrap=fread_int,--wrap=fread_uint,--wrap=fread_ulong,--wrap=g_slist_prepend,--wrap=g_slist_remove -O0 -g -ggdb")
 
 # add unit test to test target
@@ -134,20 +134,20 @@ ADD_MEMORY_TESTS(lowmem-system-test ""
 ADD_MEMORY_TESTS(lowmem-dbus-test "${GLIB2_LDFLAGS}" ""
                lowmem-dbus-test.cpp lowmem-dbus-mock.cpp lowmem-dbus-env.cpp lowmem-env.cpp lowmem-env-mock.cpp
 			   ../src/memory/lowmem-dbus.c)
-ADD_TEST(proc_dbus_aul_group cmocka_proc_dbus_aul_group)
-ADD_DEPENDENCIES(do-test cmocka_proc_dbus_aul_group)
+ADD_TEST(proc-dbus-aul-group cmocka-proc-dbus-aul-group)
+ADD_DEPENDENCIES(do-test cmocka-proc-dbus-aul-group)
 
-ADD_TEST(dbus_get_memory_lists cmocka_dbus_get_memory_lists)
-ADD_DEPENDENCIES(do-test cmocka_dbus_get_memory_lists)
+ADD_TEST(dbus-get-memory-lists cmocka-dbus-get-memory-lists)
+ADD_DEPENDENCIES(do-test cmocka-dbus-get-memory-lists)
 
-ADD_TEST(dbus_get_cpu_lists cmocka_dbus_get_cpu_lists)
-ADD_DEPENDENCIES(do-test cmocka_dbus_get_cpu_lists)
+ADD_TEST(dbus-get-cpu-lists cmocka-dbus-get-cpu-lists)
+ADD_DEPENDENCIES(do-test cmocka-dbus-get-cpu-lists)
 
 ADD_TEST(proc-dbus-typecheck cmocka-proc-dbus-typecheck)
 ADD_DEPENDENCIES(do-test cmocka-proc-dbus-typecheck)
 
-ADD_TEST(proc_add_app_info cmocka_proc_add_app_info)
-ADD_DEPENDENCIES(do-test cmocka_proc_add_app_info)
+ADD_TEST(proc-add-app-info cmocka-proc-add-app-info)
+ADD_DEPENDENCIES(do-test cmocka-proc-add-app-info)
 
 INSTALL(TARGETS watchdog-test
   DESTINATION ${RD_TESTS_PATH})
diff --git a/tests/cmocka-core.c b/tests/cmocka-core.c
index 3d3f132..e7e2730 100644
--- a/tests/cmocka-core.c
+++ b/tests/cmocka-core.c
@@ -190,14 +190,14 @@ static void test_config_parse(void **state)
 	assert_int_equal(config_parse("the_x_files", config_parser_cb, NULL), -EIO);
 
 	/* invalid section header test */
-	assert_int_equal(config_parse("../../tests/config_parser_test_1.conf", config_parser_cb, NULL), -EBADMSG);
+	assert_int_equal(config_parse("../../tests/config-parser-test-1.conf", config_parser_cb, NULL), -EBADMSG);
 
 	/* key with no value test */
-	assert_int_equal(config_parse("../../tests/config_parser_test_2.conf", config_parser_cb, NULL), -EBADMSG);
+	assert_int_equal(config_parse("../../tests/config-parser-test-2.conf", config_parser_cb, NULL), -EBADMSG);
 
 	/* callback return value test */
 	will_return(config_parser_cb, 1);
-	assert_int_equal(config_parse("../../tests/config_parser_test_3.conf", config_parser_cb, NULL), -EBADMSG);
+	assert_int_equal(config_parse("../../tests/config-parser-test-3.conf", config_parser_cb, NULL), -EBADMSG);
 
 	/* positive test */
 	will_return(config_parser_cb, 0);
@@ -205,7 +205,7 @@ static void test_config_parse(void **state)
 	will_return(config_parser_cb, cast_ptr_to_largest_integral_type(section));
 	will_return(config_parser_cb, cast_ptr_to_largest_integral_type(key));
 	will_return(config_parser_cb, cast_ptr_to_largest_integral_type(value));
-	assert_int_equal(config_parse("../../tests/config_parser_test_3.conf", config_parser_cb, ptr), 0);
+	assert_int_equal(config_parse("../../tests/config-parser-test-3.conf", config_parser_cb, ptr), 0);
 }
 
 static void test_config_parse_new(void **state)
@@ -234,32 +234,32 @@ static void test_config_parse_new(void **state)
 	assert_int_equal(config_parse_new("the_x_files", NULL), -ENOENT);
 
 	/* invalid section header test */
-	assert_int_equal(config_parse_new("../../tests/config_parser_test_1.conf", NULL), -EBADMSG);
+	assert_int_equal(config_parse_new("../../tests/config-parser-test-1.conf", NULL), -EBADMSG);
 
 	/* oom test 1 */
 	will_return(__wrap_strndup, true);
-	assert_int_equal(config_parse_new("../../tests/config_parser_test_2.conf", NULL), -ENOMEM);
+	assert_int_equal(config_parse_new("../../tests/config-parser-test-2.conf", NULL), -ENOMEM);
 
 	/* oom test 2 */
 	will_return(__wrap_strndup, false);
 	will_return(__wrap_strndup, true);
-	assert_int_equal(config_parse_new("../../tests/config_parser_test_3.conf", NULL), -ENOMEM);
+	assert_int_equal(config_parse_new("../../tests/config-parser-test-3.conf", NULL), -ENOMEM);
 
 	/* oom test 2 */
 	will_return(__wrap_strndup, false);
 	will_return(__wrap_strndup, false);
 	will_return(__wrap_strdup, true);
-	assert_int_equal(config_parse_new("../../tests/config_parser_test_3.conf", NULL), -ENOMEM);
+	assert_int_equal(config_parse_new("../../tests/config-parser-test-3.conf", NULL), -ENOMEM);
 
 	/* too much data in a file test */
 	will_return_count(__wrap_strndup, false, 131);
 	will_return_count(__wrap_strdup, false, 65);
-	assert_int_equal(config_parse_new("../../tests/config_parser_test_4.conf", dummy_items), -EOVERFLOW);
+	assert_int_equal(config_parse_new("../../tests/config-parser-test-4.conf", dummy_items), -EOVERFLOW);
 
 	/* lookup keys not present in config */
 	will_return_count(__wrap_strndup, false, 2);
 	will_return_count(__wrap_strdup, false, 1);
-	assert_int_equal(config_parse_new("../../tests/config_parser_test_3.conf", items), 0);
+	assert_int_equal(config_parse_new("../../tests/config-parser-test-3.conf", items), 0);
 	assert(str == NULL);
 	assert(b == false);
 	assert (i == 0);
@@ -269,7 +269,7 @@ static void test_config_parse_new(void **state)
 	/* positive test */
 	will_return_count(__wrap_strndup, false, 8);
 	will_return_count(__wrap_strdup, false, 7);
-	assert_int_equal(config_parse_new("../../tests/config_parser_test_5.conf", items), 0);
+	assert_int_equal(config_parse_new("../../tests/config-parser-test-5.conf", items), 0);
 	assert(str);
 	assert(!strcmp(str, "xD"));
 	assert(b == true);
diff --git a/tests/cmocka_dbus_get_cpu_lists.c b/tests/cmocka-dbus-get-cpu-lists.c
similarity index 100%
rename from tests/cmocka_dbus_get_cpu_lists.c
rename to tests/cmocka-dbus-get-cpu-lists.c
diff --git a/tests/cmocka_dbus_get_memory_lists.c b/tests/cmocka-dbus-get-memory-lists.c
similarity index 100%
rename from tests/cmocka_dbus_get_memory_lists.c
rename to tests/cmocka-dbus-get-memory-lists.c
diff --git a/tests/cmocka-file-helper.c b/tests/cmocka-file-helper.c
index bcabd9c..5dde689 100644
--- a/tests/cmocka-file-helper.c
+++ b/tests/cmocka-file-helper.c
@@ -252,7 +252,7 @@ static void test_fwrite_ulong(void **state)
 
 static void test_fread_str(void **state)
 {
-	const char *file = "../../tests/test_fread_str.txt";
+	const char *file = "../../tests/test-fread-str.txt";
 	char *str = 0xc0ffee;
 
 	will_return(__wrap_fopen, true);
@@ -278,7 +278,7 @@ static void test_fread_str(void **state)
 
 static void test_fread_nth_int(void **state)
 {
-	const char *file = "../../tests/test_fread_nth_int.txt";
+	const char *file = "../../tests/test-fread-nth-int.txt";
 	int32_t val;
 
 	will_return(__wrap_fopen, true);
@@ -305,7 +305,7 @@ static void test_fread_nth_int(void **state)
 
 static void test_fread_nth_uint(void **state)
 {
-	const char *file = "../../tests/test_fread_nth_uint.txt";
+	const char *file = "../../tests/test-fread-nth-uint.txt";
 	u_int32_t val;
 
 	will_return(__wrap_fopen, true);
@@ -332,7 +332,7 @@ static void test_fread_nth_uint(void **state)
 
 static void test_fread_nth_ulong(void **state)
 {
-	const char *file = "../../tests/test_fread_nth_ulong.txt";
+	const char *file = "../../tests/test-fread-nth-ulong.txt";
 	unsigned long val;
 
 	will_return(__wrap_fopen, true);
diff --git a/tests/cmocka_proc_add_app_info.c b/tests/cmocka-proc-add-app-info.c
similarity index 100%
rename from tests/cmocka_proc_add_app_info.c
rename to tests/cmocka-proc-add-app-info.c
diff --git a/tests/cmocka_proc_dbus_aul_group.c b/tests/cmocka-proc-dbus-aul-group.c
similarity index 100%
rename from tests/cmocka_proc_dbus_aul_group.c
rename to tests/cmocka-proc-dbus-aul-group.c
diff --git a/tests/cmocka_test_child_pid.c b/tests/cmocka-test-child-pid.c
similarity index 100%
rename from tests/cmocka_test_child_pid.c
rename to tests/cmocka-test-child-pid.c
diff --git a/tests/cmocka_wrap.hpp b/tests/cmocka-wrap.hpp
similarity index 100%
rename from tests/cmocka_wrap.hpp
rename to tests/cmocka-wrap.hpp
diff --git a/tests/config_parser_test_1.conf b/tests/config-parser-test-1.conf
similarity index 100%
rename from tests/config_parser_test_1.conf
rename to tests/config-parser-test-1.conf
diff --git a/tests/config_parser_test_2.conf b/tests/config-parser-test-2.conf
similarity index 100%
rename from tests/config_parser_test_2.conf
rename to tests/config-parser-test-2.conf
diff --git a/tests/config_parser_test_3.conf b/tests/config-parser-test-3.conf
similarity index 100%
rename from tests/config_parser_test_3.conf
rename to tests/config-parser-test-3.conf
diff --git a/tests/config_parser_test_4.conf b/tests/config-parser-test-4.conf
similarity index 100%
rename from tests/config_parser_test_4.conf
rename to tests/config-parser-test-4.conf
diff --git a/tests/config_parser_test_5.conf b/tests/config-parser-test-5.conf
similarity index 100%
rename from tests/config_parser_test_5.conf
rename to tests/config-parser-test-5.conf
diff --git a/tests/lowmem-dbus-env.cpp b/tests/lowmem-dbus-env.cpp
index 3d3d2e1..afb51a3 100644
--- a/tests/lowmem-dbus-env.cpp
+++ b/tests/lowmem-dbus-env.cpp
@@ -1,6 +1,6 @@
 #include "lowmem-dbus-env.hpp"
 
-#include "cmocka_wrap.hpp"
+#include "cmocka-wrap.hpp"
 
 LowmemDbusEnv *global_test_lowmem_dbus_env{nullptr};
 
diff --git a/tests/lowmem-dbus-test.cpp b/tests/lowmem-dbus-test.cpp
index 1ffab4d..a34b14d 100644
--- a/tests/lowmem-dbus-test.cpp
+++ b/tests/lowmem-dbus-test.cpp
@@ -1,5 +1,5 @@
 #include "lowmem-dbus-env.hpp"
-#include "cmocka_wrap.hpp"
+#include "cmocka-wrap.hpp"
 
 extern "C" {
 #include "lowmem-handler.h"
diff --git a/tests/lowmem-env.cpp b/tests/lowmem-env.cpp
index c786112..47a0fd4 100644
--- a/tests/lowmem-env.cpp
+++ b/tests/lowmem-env.cpp
@@ -1,5 +1,5 @@
 #include "lowmem-env.hpp"
-#include "cmocka_wrap.hpp"
+#include "cmocka-wrap.hpp"
 
 #include <iostream>
 #include <algorithm>
diff --git a/tests/lowmem-limit-env.cpp b/tests/lowmem-limit-env.cpp
index 2a1fa70..ad9245d 100644
--- a/tests/lowmem-limit-env.cpp
+++ b/tests/lowmem-limit-env.cpp
@@ -1,7 +1,7 @@
 
 #include <iostream>
 
-#include "cmocka_wrap.hpp"
+#include "cmocka-wrap.hpp"
 
 extern "C" {
 #include "notifier.h"
diff --git a/tests/lowmem-limit-test.cpp b/tests/lowmem-limit-test.cpp
index 66ef637..6cef839 100644
--- a/tests/lowmem-limit-test.cpp
+++ b/tests/lowmem-limit-test.cpp
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include <iostream>
-#include "cmocka_wrap.hpp"
+#include "cmocka-wrap.hpp"
 
 extern "C" {
 #include "lowmem-handler.h"
diff --git a/tests/lowmem-mock.hpp b/tests/lowmem-mock.hpp
index 4c418f2..993c81b 100644
--- a/tests/lowmem-mock.hpp
+++ b/tests/lowmem-mock.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <iostream>
-#include "cmocka_wrap.hpp"
+#include "cmocka-wrap.hpp"
 
 /* Macro WRAP is used for wrapping and mocking functions from libraries, e.g. from glibc or glib.
  *
diff --git a/tests/lowmem-system-env.cpp b/tests/lowmem-system-env.cpp
index 84591cd..5f73956 100644
--- a/tests/lowmem-system-env.cpp
+++ b/tests/lowmem-system-env.cpp
@@ -1,6 +1,6 @@
 #include "lowmem-system-env.hpp"
 
-#include "cmocka_wrap.hpp"
+#include "cmocka-wrap.hpp"
 
 #include "resourced.h"
 
diff --git a/tests/lowmem-system-test.cpp b/tests/lowmem-system-test.cpp
index 95a7a67..4bb1549 100644
--- a/tests/lowmem-system-test.cpp
+++ b/tests/lowmem-system-test.cpp
@@ -1,5 +1,5 @@
 #include "lowmem-system-env.hpp"
-#include "cmocka_wrap.hpp"
+#include "cmocka-wrap.hpp"
 
 extern "C" {
 #include "lowmem-handler.h"
diff --git a/tests/test_fread_nth_int.txt b/tests/test-fread-nth-int.txt
similarity index 100%
rename from tests/test_fread_nth_int.txt
rename to tests/test-fread-nth-int.txt
diff --git a/tests/test_fread_nth_uint.txt b/tests/test-fread-nth-uint.txt
similarity index 100%
rename from tests/test_fread_nth_uint.txt
rename to tests/test-fread-nth-uint.txt
diff --git a/tests/test_fread_nth_ulong.txt b/tests/test-fread-nth-ulong.txt
similarity index 100%
rename from tests/test_fread_nth_ulong.txt
rename to tests/test-fread-nth-ulong.txt
diff --git a/tests/test_fread_str.txt b/tests/test-fread-str.txt
similarity index 100%
rename from tests/test_fread_str.txt
rename to tests/test-fread-str.txt