From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 26 Mar 2013 15:39:44 +0000 (+0100)
Subject: Converted tests for chunk_t
X-Git-Tag: 5.1.0dr1~129^2~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e67f1952881e890fbc9e8363f827f24899464cb;p=thirdparty%2Fstrongswan.git

Converted tests for chunk_t
---

diff --git a/src/libcharon/plugins/unit_tester/Makefile.am b/src/libcharon/plugins/unit_tester/Makefile.am
index b597b928bf..db11d934c7 100644
--- a/src/libcharon/plugins/unit_tester/Makefile.am
+++ b/src/libcharon/plugins/unit_tester/Makefile.am
@@ -20,7 +20,6 @@ libstrongswan_unit_tester_la_SOURCES = \
 	tests/test_rsa_gen.c \
 	tests/test_cert.c \
 	tests/test_med_db.c \
-	tests/test_chunk.c \
 	tests/test_pool.c \
 	tests/test_agent.c
 
diff --git a/src/libcharon/plugins/unit_tester/tests.h b/src/libcharon/plugins/unit_tester/tests.h
index 527bb25728..4fd358e6bd 100644
--- a/src/libcharon/plugins/unit_tester/tests.h
+++ b/src/libcharon/plugins/unit_tester/tests.h
@@ -27,7 +27,6 @@ DEFINE_TEST("RSA key generation", test_rsa_gen, FALSE)
 DEFINE_TEST("RSA subjectPublicKeyInfo loading", test_rsa_load_any, FALSE)
 DEFINE_TEST("X509 certificate", test_cert_x509, FALSE)
 DEFINE_TEST("Mediation database key fetch", test_med_db, FALSE)
-DEFINE_TEST("Base64 converter", test_chunk_base64, FALSE)
 DEFINE_TEST("IP pool", test_pool, FALSE)
 DEFINE_TEST("SSH agent", test_agent, FALSE)
 
diff --git a/src/libstrongswan/tests/Makefile.am b/src/libstrongswan/tests/Makefile.am
index 45aab87362..bb1ce91a7b 100644
--- a/src/libstrongswan/tests/Makefile.am
+++ b/src/libstrongswan/tests/Makefile.am
@@ -5,7 +5,7 @@ check_PROGRAMS = $(TESTS)
 test_runner_SOURCES = \
   test_runner.c test_runner.h \
   test_linked_list.c test_enumerator.c test_linked_list_enumerator.c \
-  test_hashtable.c test_identification.c
+  test_chunk.c test_hashtable.c test_identification.c
 
 
 test_runner_CFLAGS = \
diff --git a/src/libcharon/plugins/unit_tester/tests/test_chunk.c b/src/libstrongswan/tests/test_chunk.c
similarity index 74%
rename from src/libcharon/plugins/unit_tester/tests/test_chunk.c
rename to src/libstrongswan/tests/test_chunk.c
index 2e0905b2c4..151775ef7a 100644
--- a/src/libcharon/plugins/unit_tester/tests/test_chunk.c
+++ b/src/libstrongswan/tests/test_chunk.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2013 Tobias Brunner
  * Copyright (C) 2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -13,13 +14,16 @@
  * for more details.
  */
 
-#include <library.h>
-#include <daemon.h>
+
+#include <check.h>
+
+#include <utils/chunk.h>
 
 /*******************************************************************************
- * Base64 encoding/decoding test
- ******************************************************************************/
-bool test_chunk_base64()
+ * BASE64 encoding test
+ */
+
+START_TEST(test_base64)
 {
 	/* test vectors from RFC4648:
 	 *
@@ -31,7 +35,6 @@ bool test_chunk_base64()
 	 * BASE64("fooba") = "Zm9vYmE="
 	 * BASE64("foobar") = "Zm9vYmFy"
 	 */
-
 	typedef struct {
 		char *in;
 		char *out;
@@ -53,13 +56,7 @@ bool test_chunk_base64()
 		chunk_t out;
 
 		out = chunk_to_base64(chunk_create(test[i].in, strlen(test[i].in)), NULL);
-
-		if (!streq(out.ptr, test[i].out))
-		{
-			DBG1(DBG_CFG, "base64 conversion error - should %s, is %s",
-				test[i].out, out.ptr);
-			return FALSE;
-		}
+		ck_assert_str_eq(out.ptr, test[i].out);
 		free(out.ptr);
 	}
 
@@ -68,15 +65,24 @@ bool test_chunk_base64()
 		chunk_t out;
 
 		out = chunk_from_base64(chunk_create(test[i].out, strlen(test[i].out)), NULL);
-
-		if (!strneq(out.ptr, test[i].in, out.len))
-		{
-			DBG1(DBG_CFG, "base64 conversion error - should %s, is %#B",
-				test[i].in, &out);
-			return FALSE;
-		}
+		fail_unless(strneq(out.ptr, test[i].in, out.len),
+					"base64 conversion error - should '%s', is %#B",
+					test[i].in, &out);
 		free(out.ptr);
 	}
-	return TRUE;
 }
+END_TEST
+
+Suite *chunk_suite_create()
+{
+	Suite *s;
+	TCase *tc;
 
+	s = suite_create("chunk");
+
+	tc = tcase_create("base64");
+	tcase_add_test(tc, test_base64);
+	suite_add_tcase(s, tc);
+
+	return s;
+}
diff --git a/src/libstrongswan/tests/test_runner.c b/src/libstrongswan/tests/test_runner.c
index 114ba39e1f..03287e53c6 100644
--- a/src/libstrongswan/tests/test_runner.c
+++ b/src/libstrongswan/tests/test_runner.c
@@ -32,6 +32,7 @@ int main()
 	library_init(NULL);
 
 	sr = srunner_create(NULL);
+	srunner_add_suite(sr, chunk_suite_create());
 	srunner_add_suite(sr, enumerator_suite_create());
 	srunner_add_suite(sr, linked_list_suite_create());
 	srunner_add_suite(sr, linked_list_enumerator_suite_create());
diff --git a/src/libstrongswan/tests/test_runner.h b/src/libstrongswan/tests/test_runner.h
index 490bf54f80..7593c6aa64 100644
--- a/src/libstrongswan/tests/test_runner.h
+++ b/src/libstrongswan/tests/test_runner.h
@@ -18,6 +18,7 @@
 
 #include <check.h>
 
+Suite *chunk_suite_create();
 Suite *enumerator_suite_create();
 Suite *linked_list_suite_create();
 Suite *linked_list_enumerator_suite_create();