From e71f008388b3c69cf01a534c5084d7e3a441149b Mon Sep 17 00:00:00 2001
From: Vic Yang <victoryang@chromium.org>
Date: Thu, 9 May 2013 07:16:01 +0800
Subject: Put test utility macros in header

Several test utility macros have been duplicated across tests. Let's put
them in a single place.

BUG=chrome-os-partner:19236
TEST='make runtests', 'BOARD=spring make tests'
BRANCH=None

Change-Id: Ib0c9f829715425cc23e33b8ef456b17dfadab13c
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/50513
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
---
 test/kb_scan.c | 73 +++++++++++++++++-----------------------------------------
 1 file changed, 21 insertions(+), 52 deletions(-)

(limited to 'test/kb_scan.c')

diff --git a/test/kb_scan.c b/test/kb_scan.c
index 756d87b8ee..3822e155ae 100644
--- a/test/kb_scan.c
+++ b/test/kb_scan.c
@@ -13,6 +13,7 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "task.h"
+#include "test_util.h"
 #include "timer.h"
 #include "util.h"
 
@@ -20,26 +21,6 @@
 #define KEYDOWN_RETRY        10
 #define NO_KEYDOWN_DELAY_MS  100
 
-#define TEST_ASSERT(n) \
-	do { \
-		if (n() != EC_SUCCESS) { \
-			ccprintf("%s failed.\n", #n); \
-			return EC_ERROR_UNKNOWN; \
-		} \
-	} while (0)
-
-#define RUN_TEST(n) \
-	do { \
-		ccprintf("Running %s...", #n); \
-		cflush(); \
-		if (n() == EC_SUCCESS) { \
-			ccputs("OK\n"); \
-		} else { \
-			ccputs("Fail\n"); \
-			error_count++; \
-		} \
-	} while (0)
-
 #define CHECK_KEY_COUNT(old, expected) \
 	do { \
 		if (verify_key_presses(old, expected) != EC_SUCCESS) \
@@ -50,7 +31,6 @@
 static uint8_t mock_state[KEYBOARD_COLS];
 static int column_driven;
 static int fifo_add_count;
-static int error_count;
 static int lid_open;
 
 #ifdef CONFIG_LID_SWITCH
@@ -138,41 +118,41 @@ int deghost_test(void)
 {
 	/* Test we can detect a keypress */
 	mock_key(1, 1, 1);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(1, 1, 0);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 
 	/* (1, 1) (1, 2) (2, 1) (2, 2) form ghosting keys */
 	mock_key(1, 1, 1);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(2, 2, 1);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(1, 2, 1);
 	mock_key(2, 1, 1);
-	TEST_ASSERT(expect_no_keychange);
+	TEST_ASSERT(expect_no_keychange() == EC_SUCCESS);
 	mock_key(2, 1, 0);
 	mock_key(1, 2, 0);
-	TEST_ASSERT(expect_no_keychange);
+	TEST_ASSERT(expect_no_keychange() == EC_SUCCESS);
 	mock_key(2, 2, 0);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(1, 1, 0);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 
 	/* (1, 1) (2, 0) (2, 1) don't form ghosting keys */
 	mock_key(1, 1, 1);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(2, 0, 1);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(1, 0, 1);
 	mock_key(2, 1, 1);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(1, 0, 0);
 	mock_key(2, 1, 0);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(2, 0, 0);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(1, 1, 0);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 
 	return EC_SUCCESS;
 }
@@ -242,15 +222,15 @@ int lid_test(void)
 {
 	lid_open = 0;
 	mock_key(1, 1, 1);
-	TEST_ASSERT(expect_no_keychange);
+	TEST_ASSERT(expect_no_keychange() == EC_SUCCESS);
 	mock_key(1, 1, 0);
-	TEST_ASSERT(expect_no_keychange);
+	TEST_ASSERT(expect_no_keychange() == EC_SUCCESS);
 
 	lid_open = 1;
 	mock_key(1, 1, 1);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 	mock_key(1, 1, 0);
-	TEST_ASSERT(expect_keychange);
+	TEST_ASSERT(expect_keychange() == EC_SUCCESS);
 
 	return EC_SUCCESS;
 }
@@ -258,8 +238,8 @@ int lid_test(void)
 
 void run_test(void)
 {
-	error_count = 0;
 	lid_open = 1;
+	test_reset();
 
 	RUN_TEST(deghost_test);
 	RUN_TEST(debounce_test);
@@ -267,16 +247,5 @@ void run_test(void)
 	RUN_TEST(lid_test);
 #endif
 
-	if (error_count == 0)
-		ccprintf("Pass!\n");
-	else
-		ccprintf("Fail!\n");
-}
-
-static int command_run_test(int argc, char **argv)
-{
-	run_test();
-	return EC_SUCCESS;
+	test_print_result();
 }
-DECLARE_CONSOLE_COMMAND(runtest, command_run_test,
-			NULL, NULL, NULL);
-- 
cgit v1.2.1