From 007889b4128e8656c55ba31404a698e98719c262 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@mobatime.cz>
Date: 周六, 14 7月 2018 01:57:31 +0800
Subject: [PATCH] Fix license wordings to correspond with BSD-2-Clause

---
 libscpi/test/test_fifo.c |  160 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 124 insertions(+), 36 deletions(-)

diff --git a/libscpi/test/test_fifo.c b/libscpi/test/test_fifo.c
index bfe7cad..758fda3 100644
--- a/libscpi/test/test_fifo.c
+++ b/libscpi/test/test_fifo.c
@@ -1,87 +1,174 @@
-/*
- * File:   test_fifo.c
- * Author: jaybee
+/*-
+ * BSD 2-Clause License
  *
- * Created on 27.11.2012, 16:01:38
+ * Copyright (c) 2012-2018, Jan Breuer
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <stdio.h>
 #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;
-    fifo_init(&fifo);
-    int16_t value;
-
-    fifo.size = 4;
+static void testFifo() {
+    scpi_fifo_t fifo;
+    scpi_error_t fifo_data[4];
+    fifo_init(&fifo, fifo_data, 4);
+    scpi_error_t value;
+    int16_t count_value;
 
 #define TEST_FIFO_COUNT(n)                      \
     do {                                        \
-        fifo_count(&fifo, &value);              \
-        CU_ASSERT_EQUAL(value, n);              \
+        fifo_count(&fifo, &count_value);        \
+        CU_ASSERT_EQUAL(count_value, n);        \
     } while(0)                                  \
-    
+
 
     TEST_FIFO_COUNT(0);
-    CU_ASSERT_TRUE(fifo_add(&fifo, 1));
+    CU_ASSERT_TRUE(fifo_is_empty(&fifo));
+    CU_ASSERT_FALSE(fifo_is_full(&fifo));
+
+    value.error_code = 1;
+    CU_ASSERT_TRUE(fifo_add(&fifo, &value));
     TEST_FIFO_COUNT(1);
-    CU_ASSERT_TRUE(fifo_add(&fifo, 2));
+    CU_ASSERT_FALSE(fifo_is_empty(&fifo));
+    CU_ASSERT_FALSE(fifo_is_full(&fifo));
+
+    value.error_code = 2;
+    CU_ASSERT_TRUE(fifo_add(&fifo, &value));
     TEST_FIFO_COUNT(2);
-    CU_ASSERT_TRUE(fifo_add(&fifo, 3));
-    TEST_FIFO_COUNT(3);
-    CU_ASSERT_TRUE(fifo_add(&fifo, 4));
-    TEST_FIFO_COUNT(4);
-    CU_ASSERT_TRUE(fifo_add(&fifo, 1));
-    TEST_FIFO_COUNT(4);
+    CU_ASSERT_FALSE(fifo_is_empty(&fifo));
+    CU_ASSERT_FALSE(fifo_is_full(&fifo));
 
-    CU_ASSERT_EQUAL(fifo.data[0], 1);
-    CU_ASSERT_EQUAL(fifo.data[1], 2);
-    CU_ASSERT_EQUAL(fifo.data[2], 3);
-    CU_ASSERT_EQUAL(fifo.data[3], 4);
+    value.error_code = 3;
+    CU_ASSERT_TRUE(fifo_add(&fifo, &value));
+    TEST_FIFO_COUNT(3);
+    CU_ASSERT_FALSE(fifo_is_empty(&fifo));
+    CU_ASSERT_FALSE(fifo_is_full(&fifo));
+
+    value.error_code = 4;
+    CU_ASSERT_TRUE(fifo_add(&fifo, &value));
+    TEST_FIFO_COUNT(4);
+    CU_ASSERT_FALSE(fifo_is_empty(&fifo));
+    CU_ASSERT_TRUE(fifo_is_full(&fifo));
+
+    CU_ASSERT_EQUAL(fifo.data[0].error_code, 1);
+    CU_ASSERT_EQUAL(fifo.data[1].error_code, 2);
+    CU_ASSERT_EQUAL(fifo.data[2].error_code, 3);
+    CU_ASSERT_EQUAL(fifo.data[3].error_code, 4);
+
+    value.error_code = 5;
+    CU_ASSERT_FALSE(fifo_add(&fifo, &value));
+    TEST_FIFO_COUNT(4);
+    CU_ASSERT_FALSE(fifo_is_empty(&fifo));
+    CU_ASSERT_TRUE(fifo_is_full(&fifo));
+
+    CU_ASSERT_EQUAL(fifo.data[0].error_code, 1);
+    CU_ASSERT_EQUAL(fifo.data[1].error_code, 2);
+    CU_ASSERT_EQUAL(fifo.data[2].error_code, 3);
+    CU_ASSERT_EQUAL(fifo.data[3].error_code, 4);
+
+    CU_ASSERT_TRUE(fifo_remove_last(&fifo, &value));
+    CU_ASSERT_EQUAL(value.error_code, 4);
+    TEST_FIFO_COUNT(3);
+    CU_ASSERT_FALSE(fifo_is_empty(&fifo));
+    CU_ASSERT_FALSE(fifo_is_full(&fifo));
+
+    value.error_code = 6;
+    CU_ASSERT_TRUE(fifo_add(&fifo, &value));
+    TEST_FIFO_COUNT(4);
+    CU_ASSERT_FALSE(fifo_is_empty(&fifo));
+    CU_ASSERT_TRUE(fifo_is_full(&fifo));
+
+    CU_ASSERT_EQUAL(fifo.data[0].error_code, 1);
+    CU_ASSERT_EQUAL(fifo.data[1].error_code, 2);
+    CU_ASSERT_EQUAL(fifo.data[2].error_code, 3);
+    CU_ASSERT_EQUAL(fifo.data[3].error_code, 6);
 
     CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
-    CU_ASSERT_EQUAL(value, 2);
+    CU_ASSERT_EQUAL(value.error_code, 1);
     TEST_FIFO_COUNT(3);
+    CU_ASSERT_FALSE(fifo_is_empty(&fifo));
+    CU_ASSERT_FALSE(fifo_is_full(&fifo));
 
-    CU_ASSERT_TRUE(fifo_add(&fifo, 5));
+    value.error_code = 7;
+    CU_ASSERT_TRUE(fifo_add(&fifo, &value));
     TEST_FIFO_COUNT(4);
 
     CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
-    CU_ASSERT_EQUAL(value, 3);
+    CU_ASSERT_EQUAL(value.error_code, 2);
     TEST_FIFO_COUNT(3);
 
     CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
-    CU_ASSERT_EQUAL(value, 4);
+    CU_ASSERT_EQUAL(value.error_code, 3);
     TEST_FIFO_COUNT(2);
 
+    value.error_code = 10;
+    CU_ASSERT_TRUE(fifo_add(&fifo, &value));
+    TEST_FIFO_COUNT(3);
+
+    value.error_code = 11;
+    CU_ASSERT_TRUE(fifo_add(&fifo, &value));
+    TEST_FIFO_COUNT(4);
+
     CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
-    CU_ASSERT_EQUAL(value, 1);
+    CU_ASSERT_EQUAL(value.error_code, 6);
+    TEST_FIFO_COUNT(3);
+
+    CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
+    CU_ASSERT_EQUAL(value.error_code, 7);
+    TEST_FIFO_COUNT(2);
+
+    CU_ASSERT_TRUE(fifo_remove_last(&fifo, &value));
+    CU_ASSERT_EQUAL(value.error_code, 11);
     TEST_FIFO_COUNT(1);
 
     CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
-    CU_ASSERT_EQUAL(value, 5);
+    CU_ASSERT_EQUAL(value.error_code, 10);
     TEST_FIFO_COUNT(0);
-    
+
     CU_ASSERT_FALSE(fifo_remove(&fifo, &value));
     TEST_FIFO_COUNT(0);
+
+    CU_ASSERT_FALSE(fifo_remove_last(&fifo, NULL));
 }
 
 int main() {
+    unsigned int result;
     CU_pSuite pSuite = NULL;
 
     /* Initialize the CUnit test registry */
@@ -104,6 +191,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