From 56f5fce78b6a9881086755b14fd44a74a0d1cc66 Mon Sep 17 00:00:00 2001
From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Mon, 6 Feb 2017 10:56:37 +0100
Subject: [PATCH] tests: extend dynarray checks
---
tests/contrib/test_dynarray.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/tests/contrib/test_dynarray.c b/tests/contrib/test_dynarray.c
index ea439b7d87..ac5814ddcb 100644
--- a/tests/contrib/test_dynarray.c
+++ b/tests/contrib/test_dynarray.c
@@ -14,12 +14,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
#include <string.h>
-#include <stdbool.h>
-#include "contrib/dynarray.h"
#include <tap/basic.h>
+#include "contrib/dynarray.h"
+
#define test_capacity 2
#define test_type(type, prefix) \
@@ -27,31 +26,32 @@
static void prefix ## _test(type const first, type const second) { \
struct prefix ## _dynarray array = { 0 }; \
prefix ## _dynarray_fix(&array); \
- ok(array.capacity == test_capacity && array.size == 0, \
+ ok(array.capacity == test_capacity && array.size == 0 && array.init == array.arr, \
"%s: Fix - initial capacity set", #prefix); \
prefix ## _dynarray_add(&array, &first); \
- ok(array.capacity == test_capacity && array.size == 1 && array.arr[0] == first, \
- "%s: Add item", #prefix); \
+ ok(array.capacity == test_capacity && array.size == 1 && array.arr[0] == first && \
+ array.init == array.arr, "%s: Add item", #prefix); \
prefix ## _dynarray_add(&array, &second); \
- ok(array.capacity == test_capacity && array.size == 2 && array.arr[1] == second, \
- "%s: Array filled (size not changed yet)", #prefix); \
+ ok(array.capacity == test_capacity && array.size == 2 && array.arr[1] == second && \
+ array.init == array.arr, "%s: Array filled (size not changed yet)", #prefix); \
prefix ## _dynarray_add(&array, &first); \
- ok(array.capacity == 2*test_capacity+1 && array.size == 3 && array.arr[2] == first, \
- "%s: Array extended", #prefix); \
+ ok(array.capacity == 2 * test_capacity + 1 && array.size == 3 && array.arr[2] == first && \
+ array.init != array.arr, "%s: Array extended", #prefix); \
prefix ## _dynarray_free(&array); \
prefix ## _dynarray_add(&array, &first); \
- ok(array.capacity == test_capacity && array.size == 1 && array.arr[0] == first, \
- "%s: Free & add first- initial capacity set", #prefix); \
+ ok(array.capacity == test_capacity && array.size == 1 && array.arr[0] == first && \
+ array.init == array.arr, "%s: Free & add first- initial capacity set", #prefix); \
}
test_type(int, int)
-test_type(char*, string)
+test_type(char *, string)
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
{
plan_lazy();
int_test(4, 2);
+
char a = 'a', b = 'b';
string_test(&a, &b);
--
GitLab