summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJames Shaw <jshaw@netsurf-browser.org>2007-09-26 20:56:25 +0000
committerJames Shaw <jshaw@netsurf-browser.org>2007-09-26 20:56:25 +0000
commitb63f0b924e80fd2e80235127b9759fe03e0a8f16 (patch)
tree1ad7a7c606b53645d4ec587a4a3710040c63a9e2 /test
parentba89caf25cfe662a29c4fa866fc0d440908d5545 (diff)
downloadlibdom-b63f0b924e80fd2e80235127b9759fe03e0a8f16.tar.gz
libdom-b63f0b924e80fd2e80235127b9759fe03e0a8f16.tar.bz2
Alter assert_equals signature, stub out assert_uri_equals
svn path=/trunk/dom/; revision=3594
Diffstat (limited to 'test')
-rw-r--r--test/lib/testassert.c34
-rw-r--r--test/lib/testassert.h10
2 files changed, 34 insertions, 10 deletions
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 <jmb@netsurf-browser.org>
+ * Copyright 2007 James Shaw <jshaw@netsurf-browser.org>
*/
#include <stdio.h>
#include <stdlib.h>
+#include <dom/core/string.h>
+
#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 */
}
diff --git a/test/lib/testassert.h b/test/lib/testassert.h
index 8556075..85472ce 100644
--- a/test/lib/testassert.h
+++ b/test/lib/testassert.h
@@ -22,9 +22,13 @@ void __assert2(const char *expr, const char *function,
void assert_equals_collection(struct list* expected, struct list* actual,
comparator comparator);
-void assert_equals(int expected, int actual, comparator comparator);
-void assert_not_null(void* x);
+void assert_equals(void* expected, void* actual, comparator comparator);
-#endif
+void assert_same(void* expected, void* actual, comparator comparator);
+
+void assert_uri_equals(char* scheme, char* path, char* host, char* file,
+ char* name, char* query, char* fragment, bool isAbsolute,
+ char* actual);
+#endif