1 files changed, 40 insertions, 23 deletions

diff --git a/contrib/ntp/sntp/tests/keyFile.c b/contrib/ntp/sntp/tests/keyFile.c
index 3769947..77dfee7 100644
--- a/contrib/ntp/sntp/tests/keyFile.c
+++ b/contrib/ntp/sntp/tests/keyFile.c
@@ -7,10 +7,17 @@
 
 #include "unity.h"
 
-//typedef int bool;
+bool CompareKeys(struct key expected, struct key actual);
+bool CompareKeysAlternative(int key_id,int key_len,const char* type,const char* key_seq,struct key actual);
+void test_ReadEmptyKeyFile(void);
+void test_ReadASCIIKeys(void);
+void test_ReadHexKeys(void);
+void test_ReadKeyFileWithComments(void);
+void test_ReadKeyFileWithInvalidHex(void);
 
 
-bool CompareKeys(struct key expected, struct key actual) {
+bool
+CompareKeys(struct key expected, struct key actual) {
 	if (expected.key_id != actual.key_id){
 		printf("Expected key_id: %d", expected.key_id);
 		printf(" but was: %d\n", actual.key_id);
@@ -34,7 +41,9 @@ bool CompareKeys(struct key expected, struct key actual) {
 	return TRUE;
 }
 
-bool CompareKeysAlternative(int key_id,
+
+bool
+CompareKeysAlternative(int key_id,
 	       int key_len,
 	       const char* type,
 	       const char* key_seq,
@@ -50,91 +59,99 @@ bool CompareKeysAlternative(int key_id,
 }
 
 
-void test_ReadEmptyKeyFile() {
+void
+test_ReadEmptyKeyFile(void) {
 	struct key* keys = NULL;
 
 	TEST_ASSERT_EQUAL(0, auth_init(CreatePath("key-test-empty", INPUT_DIR), &keys));
-
-	TEST_ASSERT_TRUE(keys == NULL);
+	TEST_ASSERT_NULL(keys);
 }
 
-void test_ReadASCIIKeys() {
+
+void
+test_ReadASCIIKeys(void) {
 	struct key* keys = NULL;
 
 	TEST_ASSERT_EQUAL(2, auth_init(CreatePath("key-test-ascii", INPUT_DIR), &keys));
 
-	TEST_ASSERT_TRUE(keys != NULL);
+	TEST_ASSERT_NOT_NULL(keys);
 
 	struct key* result = NULL;
 	get_key(40, &result);
-	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_NOT_NULL(result);
 	TEST_ASSERT_TRUE(CompareKeysAlternative(40, 11, "MD5", "asciikeyTwo", *result));
 
 	result = NULL;
 	get_key(50, &result);
-	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_NOT_NULL(result);
 	TEST_ASSERT_TRUE(CompareKeysAlternative(50, 11, "MD5", "asciikeyOne", *result));
 }
 
-void test_ReadHexKeys() {
+
+void
+test_ReadHexKeys(void) {
 	struct key* keys = NULL;
 
 	TEST_ASSERT_EQUAL(3, auth_init(CreatePath("key-test-hex", INPUT_DIR), &keys));
 
-	TEST_ASSERT_TRUE(keys != NULL);
+	TEST_ASSERT_NOT_NULL(keys);
 
 	struct key* result = NULL;
 	get_key(10, &result);
-	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_NOT_NULL(result);
 	TEST_ASSERT_TRUE(CompareKeysAlternative(10, 13, "MD5",
 		 "\x01\x23\x45\x67\x89\xab\xcd\xef\x01\x23\x45\x67\x89", *result));
 
 	result = NULL;
 	get_key(20, &result);
-	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_NOT_NULL(result);
 	char data1[15]; memset(data1, 0x11, 15);
 	TEST_ASSERT_TRUE(CompareKeysAlternative(20, 15, "MD5", data1, *result));
 
 	result = NULL;
 	get_key(30, &result);
-	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_NOT_NULL(result);
 	char data2[13]; memset(data2, 0x01, 13);
 	TEST_ASSERT_TRUE(CompareKeysAlternative(30, 13, "MD5", data2, *result));
 }
 
-void test_ReadKeyFileWithComments() {
+
+void
+test_ReadKeyFileWithComments(void) {
 	struct key* keys = NULL;
 
 	TEST_ASSERT_EQUAL(2, auth_init(CreatePath("key-test-comments", INPUT_DIR), &keys));
 	
-	TEST_ASSERT_TRUE(keys != NULL);
+	TEST_ASSERT_NOT_NULL(keys);
 
 	struct key* result = NULL;
 	get_key(10, &result);
-	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_NOT_NULL(result);
 	char data[15]; memset(data, 0x01, 15);
 	TEST_ASSERT_TRUE(CompareKeysAlternative(10, 15, "MD5", data, *result));
 
 	result = NULL;
 	get_key(34, &result);
-	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_NOT_NULL(result);
 	TEST_ASSERT_TRUE(CompareKeysAlternative(34, 3, "MD5", "xyz", *result));
 }
 
-void test_ReadKeyFileWithInvalidHex() {
+
+void
+test_ReadKeyFileWithInvalidHex(void) {
 	struct key* keys = NULL;
 
 	TEST_ASSERT_EQUAL(1, auth_init(CreatePath("key-test-invalid-hex", INPUT_DIR), &keys));
 
-	TEST_ASSERT_TRUE(keys != NULL);
+	TEST_ASSERT_NOT_NULL(keys);
 
 	struct key* result = NULL;
 	get_key(10, &result);
-	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_NOT_NULL(result);
 	char data[15]; memset(data, 0x01, 15);
 	TEST_ASSERT_TRUE(CompareKeysAlternative(10, 15, "MD5", data, *result));
 
 	result = NULL;
 	get_key(30, &result); // Should not exist, and result should remain NULL.
-	TEST_ASSERT_TRUE(result == NULL);
+	TEST_ASSERT_NULL(result);
 }