From e9785c888dddb7449e741ed53796e995f0efa9f7 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@redpitaya.com>
Date: 周四, 08 10月 2015 03:00:33 +0800
Subject: [PATCH] added most new function declarations, replaced all usecases for old functions, missing are most new implementations

---
 libscpi/test/test_fifo.c |   50 ++++++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/libscpi/test/test_fifo.c b/libscpi/test/test_fifo.c
index fd6fa51..4b9847b 100644
--- a/libscpi/test/test_fifo.c
+++ b/libscpi/test/test_fifo.c
@@ -9,22 +9,22 @@
 #include <stdlib.h>
 #include "CUnit/Basic.h"
 
-#include "scpi/fifo.h"
+#include "../src/fifo_private.h"
 
 /*
  * CUnit Test Suite
  */
 
-int init_suite(void) {
+static int init_suite(void) {
     return 0;
 }
 
-int clean_suite(void) {
+static int clean_suite(void) {
     return 0;
 }
 
-void testFifo() {
-    fifo_t fifo;
+static void testFifo() {
+    scpi_fifo_t fifo;
     fifo_init(&fifo);
     int16_t value;
 
@@ -38,15 +38,15 @@
     
 
     TEST_FIFO_COUNT(0);
-    CU_ASSERT_TRUE(fifo_push(&fifo, 1));
+    CU_ASSERT_TRUE(fifo_add(&fifo, 1));
     TEST_FIFO_COUNT(1);
-    CU_ASSERT_TRUE(fifo_push(&fifo, 2));
+    CU_ASSERT_TRUE(fifo_add(&fifo, 2));
     TEST_FIFO_COUNT(2);
-    CU_ASSERT_TRUE(fifo_push(&fifo, 3));
+    CU_ASSERT_TRUE(fifo_add(&fifo, 3));
     TEST_FIFO_COUNT(3);
-    CU_ASSERT_TRUE(fifo_push(&fifo, 4));
+    CU_ASSERT_TRUE(fifo_add(&fifo, 4));
     TEST_FIFO_COUNT(4);
-    CU_ASSERT_FALSE(fifo_push(&fifo, 1));
+    CU_ASSERT_TRUE(fifo_add(&fifo, 1));
     TEST_FIFO_COUNT(4);
 
     CU_ASSERT_EQUAL(fifo.data[0], 1);
@@ -54,34 +54,35 @@
     CU_ASSERT_EQUAL(fifo.data[2], 3);
     CU_ASSERT_EQUAL(fifo.data[3], 4);
 
-    CU_ASSERT_TRUE(fifo_pop(&fifo, &value));
-    CU_ASSERT_EQUAL(value, 1);
-    TEST_FIFO_COUNT(3);
-
-    CU_ASSERT_TRUE(fifo_push(&fifo, 5));
-    TEST_FIFO_COUNT(4);
-
-    CU_ASSERT_TRUE(fifo_pop(&fifo, &value));
+    CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
     CU_ASSERT_EQUAL(value, 2);
     TEST_FIFO_COUNT(3);
 
-    CU_ASSERT_TRUE(fifo_pop(&fifo, &value));
+    CU_ASSERT_TRUE(fifo_add(&fifo, 5));
+    TEST_FIFO_COUNT(4);
+
+    CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
     CU_ASSERT_EQUAL(value, 3);
+    TEST_FIFO_COUNT(3);
+
+    CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
+    CU_ASSERT_EQUAL(value, 4);
     TEST_FIFO_COUNT(2);
 
-    CU_ASSERT_TRUE(fifo_pop(&fifo, &value));
-    CU_ASSERT_EQUAL(value, 4);
+    CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
+    CU_ASSERT_EQUAL(value, 1);
     TEST_FIFO_COUNT(1);
 
-    CU_ASSERT_TRUE(fifo_pop(&fifo, &value));
+    CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
     CU_ASSERT_EQUAL(value, 5);
     TEST_FIFO_COUNT(0);
     
-    CU_ASSERT_FALSE(fifo_pop(&fifo, &value));
+    CU_ASSERT_FALSE(fifo_remove(&fifo, &value));
     TEST_FIFO_COUNT(0);
 }
 
 int main() {
+    unsigned int result;
     CU_pSuite pSuite = NULL;
 
     /* Initialize the CUnit test registry */
@@ -104,6 +105,7 @@
     /* Run all tests using the CUnit Basic interface */
     CU_basic_set_mode(CU_BRM_VERBOSE);
     CU_basic_run_tests();
+    result = CU_get_number_of_tests_failed();
     CU_cleanup_registry();
-    return CU_get_error();
+    return result ? result : CU_get_error();
 }

--
Gitblit v1.9.1