aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cynapses.org>2010-12-28 14:15:32 +0100
committerAndreas Schneider <asn@cynapses.org>2010-12-28 22:14:47 +0100
commitfa17f33d2b0cff3a066cab788e47372cf6d00c6e (patch)
tree784b136ac5279c63d792bec3354d64dfc3e26a37
parent400fc350a7286649f3b97e3384fb725d8b7b586a (diff)
downloadlibssh-fa17f33d2b0cff3a066cab788e47372cf6d00c6e.tar.gz
libssh-fa17f33d2b0cff3a066cab788e47372cf6d00c6e.tar.xz
libssh-fa17f33d2b0cff3a066cab788e47372cf6d00c6e.zip
tests: Migrated torture_init to cmockery.
-rw-r--r--tests/unittests/CMakeLists.txt2
-rw-r--r--tests/unittests/torture_init.c30
2 files changed, 15 insertions, 17 deletions
diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt
index 5a114b8..0f61f8c 100644
--- a/tests/unittests/CMakeLists.txt
+++ b/tests/unittests/CMakeLists.txt
@@ -2,7 +2,7 @@ project(unittests C)
add_cmockery_test(torture_buffer torture_buffer.c ${TORTURE_LIBRARY})
add_cmockery_test(torture_callbacks torture_callbacks.c ${TORTURE_LIBRARY})
-#add_check_test(torture_init torture_init.c ${TORTURE_LIBRARY})
+add_cmockery_test(torture_init torture_init.c ${TORTURE_LIBRARY})
#add_check_test(torture_keyfiles torture_keyfiles.c ${TORTURE_LIBRARY})
#add_check_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY})
#add_check_test(torture_list torture_list.c ${TORTURE_LIBRARY})
diff --git a/tests/unittests/torture_init.c b/tests/unittests/torture_init.c
index 8b09d36..1d8f3d6 100644
--- a/tests/unittests/torture_init.c
+++ b/tests/unittests/torture_init.c
@@ -1,25 +1,23 @@
#define LIBSSH_STATIC
-#include <libssh/libssh.h>
-#include "libssh/priv.h"
+
#include "torture.h"
+#include "init.c"
-START_TEST (torture_ssh_init)
-{
+static void torture_ssh_init(void **state) {
int rc;
- rc=ssh_init();
- ck_assert_int_eq(rc,SSH_OK);
- rc=ssh_finalize();
- ck_assert_int_eq(rc,SSH_OK);
-}
-END_TEST
-
-Suite *torture_make_suite(void) {
- Suite *s = suite_create("libssh_init");
- torture_create_case(s, "torture_ssh_init", torture_ssh_init);
+ (void) state;
- return s;
+ rc = ssh_init();
+ assert_int_equal(rc, SSH_OK);
+ rc = ssh_finalize();
+ assert_int_equal(rc, SSH_OK);
}
+int torture_run_tests(void) {
+ const UnitTest tests[] = {
+ unit_test(torture_ssh_init),
+ };
-
+ return run_tests(tests);
+}