From b63f0b924e80fd2e80235127b9759fe03e0a8f16 Mon Sep 17 00:00:00 2001 From: James Shaw Date: Wed, 26 Sep 2007 20:56:25 +0000 Subject: Alter assert_equals signature, stub out assert_uri_equals svn path=/trunk/dom/; revision=3594 --- test/lib/testassert.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'test/lib/testassert.c') diff --git a/test/lib/testassert.c b/test/lib/testassert.c index 3fd339e..191a94b 100644 --- a/test/lib/testassert.c +++ b/test/lib/testassert.c @@ -3,11 +3,14 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2007 John-Mark Bell + * Copyright 2007 James Shaw */ #include #include +#include + #include "testassert.h" #include "comparators.h" #include "utils.h" @@ -26,19 +29,36 @@ void __assert2(const char *expr, const char *function, void assert_equals_collection(struct list* expected, struct list* actual, comparator comparator) { - assert_not_null(expected); - assert_not_null(actual); - assert_equals(expected->size, actual->size, (int (*)(const void* a, const void* b)) int_comparator); + assert(expected != NULL); + assert(actual != NULL); + assert_equals(&(expected->size), &(actual->size), (int (*)(const void* a, const void* b)) int_comparator); list_contains_all(actual, expected, comparator); } -void assert_equals(int expected, int actual, comparator comparator) +void assert_equals(void* expected, void* actual, comparator comparator) { - assert(comparator(&expected, &actual) == 0); + assert(comparator(expected, actual) == 0); } -void assert_not_null(void* x) +void assert_same(void* expected, void* actual, comparator comparator) +{ + if (!(expected == actual)) { + assert_equals(expected, actual, comparator); + } +} +void assert_uri_equals(char* scheme, char* path, char* host, char* file, + char* name, char* query, char* fragment, bool isAbsolute, + char* actual) { - assert(x != NULL); + UNUSED(scheme); + UNUSED(path); + UNUSED(host); + UNUSED(file); + UNUSED(name); + UNUSED(query); + UNUSED(fragment); + UNUSED(isAbsolute); + UNUSED(actual); + /* TODO: implement me. Look at netsurf/url.c */ } -- cgit v1.2.3