Merged in dstaesse/ouroboros/be (pull request #24)

tests: added test for the du_buff structure

4 files changed, 59 insertions, 28 deletions

diff --git a/src/lib/du_buff.c b/src/lib/du_buff.c
index d88d7ac4..bd1a092d 100644
--- a/src/lib/du_buff.c
+++ b/src/lib/du_buff.c
@@ -29,7 +29,7 @@
 #define OUROBOROS_PREFIX "du_buff"
 
 #ifndef DU_BUFF_BLOCKSIZE
-#define DU_BUFF_BLOCKSIZE 1 << 16
+#define DU_BUFF_BLOCKSIZE (1 << 16)
 #endif
 
 #include "ouroboros/logs.h"
diff --git a/src/lib/tests/CMakeLists.txt b/src/lib/tests/CMakeLists.txt
index 2b02768b..b1259fa8 100644
--- a/src/lib/tests/CMakeLists.txt
+++ b/src/lib/tests/CMakeLists.txt
@@ -3,7 +3,7 @@ get_filename_component(src_folder "${tmp}" NAME)
 
 create_test_sourcelist(${src_folder}_tests test_suite.c
                        # Add new tests here
-                       linked_list.c
+                       du_buff_test.c
 )
 
 add_executable(${src_folder}_test EXCLUDE_FROM_ALL ${${src_folder}_tests})
diff --git a/src/lib/tests/du_buff_test.c b/src/lib/tests/du_buff_test.c
new file mode 100644
index 00000000..7bdf1459
--- /dev/null
+++ b/src/lib/tests/du_buff_test.c
@@ -0,0 +1,57 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * Test of the du_buff
+ *
+ *    Dimitri Staessens <dimitri.staessens@intec.ugent.be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "du_buff.c"
+
+#define TEST_BUFF_SIZE 16 * DU_BUFF_BLOCKSIZE
+#define MAX(a,b) a > b ? a : b
+
+int du_buff_test(int argc, char ** argv)
+{
+        int i, j, k;
+        int i_inc, j_inc, k_inc;
+
+        uint8_t bits[TEST_BUFF_SIZE];
+
+        for (i = 0; i < TEST_BUFF_SIZE; i++)
+                bits[i] = 170;
+
+        i_inc = MAX(1, DU_BUFF_BLOCKSIZE / 4);
+        j_inc = MAX(1, DU_BUFF_BLOCKSIZE / 8);
+        k_inc = MAX(1, DU_BUFF_BLOCKSIZE / 16);
+
+        for (i = DU_BUFF_BLOCKSIZE / 4; i <= TEST_BUFF_SIZE; i += i_inc) {
+                for (j = 0; j < i; j += j_inc) {
+                        for (k = 0; k < i - j; k += k_inc) {
+                                du_buff_t * dub = du_buff_create(i);
+                                if (dub == NULL)
+                                        return -1;
+
+                                if (du_buff_init(dub, k, bits, j) < 0)
+                                        return -1;
+
+                                du_buff_destroy (dub);
+                        }
+                }
+        }
+        return 0; /* tests succeeded */
+}
diff --git a/src/lib/tests/linked_list.c b/src/lib/tests/linked_list.c
deleted file mode 100644
index 2239b065..00000000
--- a/src/lib/tests/linked_list.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016
- *
- * Test of the linked list
- *
- *    Sander Vrijders <sander.vrijders@intec.ugent.be>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-int linked_list(int argc, char ** argv)
-{
-        return 0;
-}