diff --git a/Module.mk b/Module.mk index 95bb28c..956e571 100644 --- a/Module.mk +++ b/Module.mk @@ -211,7 +211,6 @@ include src/main/vigemstub/Module.mk include src/test/cconfig/Module.mk include src/test/d3d9hook/Module.mk include src/test/iidxhook-util/Module.mk -include src/test/iidxhook8/Module.mk include src/test/security/Module.mk include src/test/test/Module.mk include src/test/util/Module.mk @@ -923,7 +922,6 @@ $(BUILDDIR)/tests.zip: \ build/bin/indep-32/security-rp3-test.exe \ build/bin/indep-32/security-util-test.exe \ build/bin/indep-32/util-net-test.exe \ - build/bin/indep-64/iidxhook8-config-cam-test.exe \ dist/test/run-tests.sh \ | $(zipdir)/ $(V)echo ... $@ diff --git a/src/test/iidxhook8/Module.mk b/src/test/iidxhook8/Module.mk deleted file mode 100644 index 3de16a8..0000000 --- a/src/test/iidxhook8/Module.mk +++ /dev/null @@ -1,32 +0,0 @@ -testexes += iidxhook8-config-cam-test - -srcdir_iidxhook8-config-cam-test := src/test/iidxhook8 - -libs_iidxhook8-config-cam-test := \ - core \ - camhook \ - cconfig \ - test \ - util \ - iface-core \ - -src_iidxhook8-config-cam-test := \ - iidxhook8-config-cam-test.c \ - -################################################################################ - -testexes += iidxhook8-config-io-test - -srcdir_iidxhook8-config-io-test := src/test/iidxhook8 - -libs_iidxhook8-config-io-test := \ - core \ - cconfig \ - test \ - util \ - iface-core \ - -src_iidxhook8-config-io-test := \ - iidxhook8-config-io-test.c \ - -################################################################################ \ No newline at end of file diff --git a/src/test/iidxhook8/iidxhook8-config-cam-test.c b/src/test/iidxhook8/iidxhook8-config-cam-test.c deleted file mode 100644 index bc7f3ae..0000000 --- a/src/test/iidxhook8/iidxhook8-config-cam-test.c +++ /dev/null @@ -1,74 +0,0 @@ -#include "camhook/config-cam.h" - -#include "test/check.h" -#include "test/test.h" - -/* We don't care about cleaning up some of the memory to avoid cluttering the - * tests */ - -static void test_config_cam_defaults() -{ - struct cconfig *config; - struct camhook_config_cam config_cam; - - config = cconfig_init(); - - camhook_config_cam_init(config, 2, false); - camhook_config_cam_get(&config_cam, config, 2, false); - - cconfig_finit(config); - - check_bool_false(config_cam.disable_emu); - check_str_eq(config_cam.device_id[0], ""); - check_str_eq(config_cam.device_id[1], ""); -} - -static void test_config_cam() -{ - struct cconfig *config; - struct camhook_config_cam config_cam; - - config = cconfig_init(); - - camhook_config_cam_init(config, 2, false); - - cconfig_set2(config, "cam.disable_emu", "true"); - cconfig_set2(config, "cam.device_id1", "asdjkasd"); - cconfig_set2(config, "cam.device_id2", "1234"); - - camhook_config_cam_get(&config_cam, config, 2, false); - - cconfig_finit(config); - - check_bool_true(config_cam.disable_emu); - check_str_eq(config_cam.device_id[0], "asdjkasd"); - check_str_eq(config_cam.device_id[1], "1234"); -} - -static void test_config_cam_invalid_values() -{ - struct cconfig *config; - struct camhook_config_cam config_cam; - - config = cconfig_init(); - - camhook_config_cam_init(config, 2, false); - - cconfig_set2(config, "cam.disable_emu", "123"); - cconfig_set2(config, "cam.device_id1", "asdjkasd"); - cconfig_set2(config, "cam.device_id2", "1234"); - - camhook_config_cam_get(&config_cam, config, 2, false); - - cconfig_finit(config); - - check_bool_false(config_cam.disable_emu); - check_str_eq(config_cam.device_id[0], "asdjkasd"); - check_str_eq(config_cam.device_id[1], "1234"); -} - -TEST_MODULE_BEGIN("camhook-config-cam") -TEST_MODULE_TEST(test_config_cam_defaults) -TEST_MODULE_TEST(test_config_cam) -TEST_MODULE_TEST(test_config_cam_invalid_values) -TEST_MODULE_END() diff --git a/src/test/iidxhook8/iidxhook8-config-io-test.c b/src/test/iidxhook8/iidxhook8-config-io-test.c deleted file mode 100644 index 5524ba6..0000000 --- a/src/test/iidxhook8/iidxhook8-config-io-test.c +++ /dev/null @@ -1,74 +0,0 @@ -#include "iidxhook8/config-io.h" - -#include "test/check.h" -#include "test/test.h" - -/* We don't care about cleaning up some of the memory to avoid cluttering the - * tests */ - -static void test_config_io_defaults() -{ - struct cconfig *config; - struct iidxhook8_config_io config_io; - - config = cconfig_init(); - - iidxhook8_config_io_init(config); - iidxhook8_config_io_get(&config_io, config); - - cconfig_finit(config); - - check_bool_false(config_io.disable_card_reader_emu); - check_bool_false(config_io.disable_bio2_emu); - check_bool_false(config_io.disable_poll_limiter); -} - -static void test_config_io() -{ - struct cconfig *config; - struct iidxhook8_config_io config_io; - - config = cconfig_init(); - - iidxhook8_config_io_init(config); - - cconfig_set2(config, "io.disable_card_reader_emu", "true"); - cconfig_set2(config, "io.disable_bio2_emu", "true"); - cconfig_set2(config, "io.disable_poll_limiter", "true"); - - iidxhook8_config_io_get(&config_io, config); - - cconfig_finit(config); - - check_bool_true(config_io.disable_card_reader_emu); - check_bool_true(config_io.disable_bio2_emu); - check_bool_true(config_io.disable_poll_limiter); -} - -static void test_config_io_invalid_values() -{ - struct cconfig *config; - struct iidxhook8_config_io config_io; - - config = cconfig_init(); - - iidxhook8_config_io_init(config); - - cconfig_set2(config, "io.disable_card_reader_emu", "asdf"); - cconfig_set2(config, "io.disable_bio2_emu", "123"); - cconfig_set2(config, "io.disable_poll_limiter", ""); - - iidxhook8_config_io_get(&config_io, config); - - cconfig_finit(config); - - check_bool_false(config_io.disable_card_reader_emu); - check_bool_false(config_io.disable_bio2_emu); - check_bool_false(config_io.disable_poll_limiter); -} - -TEST_MODULE_BEGIN("iidxhook8-config-io") -TEST_MODULE_TEST(test_config_io_defaults) -TEST_MODULE_TEST(test_config_io) -TEST_MODULE_TEST(test_config_io_invalid_values) -TEST_MODULE_END()