diff -r c80c910fe191 -r abae4669fba7 test/buffer_tests.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/buffer_tests.c	Wed Oct 10 09:54:57 2012 +0200
@@ -0,0 +1,186 @@
+/*
+ *
+ */
+
+#include "buffer_tests.h"
+
+UCX_TEST_IMPLEMENT(test_ucx_buffer_seektell) {
+    char *buffer = malloc(16);
+    memset(buffer, 32, 7);
+    buffer[7] = 0;
+
+    UcxBuffer *b = ucx_buffer_new(buffer, 16);
+    int r;
+
+    UCX_TEST_BEGIN
+
+    r = ucx_buffer_seek(b, 5, SEEK_SET);
+    UCX_TEST_ASSERT(r == 0, "seek SET+5 failed");
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 5, "seek SET+5 set wrong position");
+
+    r = ucx_buffer_seek(b, 20, SEEK_SET);
+    UCX_TEST_ASSERT(r != 0, "seek beyond bounds shall fail");
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 5,
+            "failed seek shall leave pos unchanged");
+
+    r = ucx_buffer_seek(b, 5, SEEK_CUR);
+    UCX_TEST_ASSERT(r == 0, "seek CUR+5 failed");
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 10, "seek CUR+5 set wrong position");
+
+    r = ucx_buffer_seek(b, 10, SEEK_CUR);
+    UCX_TEST_ASSERT(r != 0, "seek CUR beyond bounds shall fail");
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 10,
+            "failed seek shall leave pos unchanged");
+
+    r = ucx_buffer_seek(b, -5, SEEK_END);
+    UCX_TEST_ASSERT(r == 0, "seek END-5 failed");
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 2, "seek END-5 set wrong position");
+
+    r = ucx_buffer_seek(b, -10, SEEK_END);
+    UCX_TEST_ASSERT(r != 0, "seek END beyond bounds shall fail");
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 2,
+            "failed seek shall leave pos unchanged");
+
+    UCX_TEST_END
+
+    ucx_buffer_free(b);
+    free(buffer);
+}
+
+UCX_TEST_IMPLEMENT(test_ucx_buffer_putc) {
+    char *buffer = malloc(16);
+    memset(buffer, 32, 16);
+
+    UcxBuffer *b = ucx_buffer_new(buffer, 16);
+    int r;
+
+    UCX_TEST_BEGIN
+
+    ucx_buffer_putc(b, 48); ucx_buffer_putc(b, 48); ucx_buffer_putc(b, 48);
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 3, "pos wrong after first 3 puts");
+    ucx_buffer_seek(b, 10, SEEK_CUR);
+    ucx_buffer_putc(b, 48); ucx_buffer_putc(b, 48); ucx_buffer_putc(b, 48);
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 16, "pos wrong after last 3 puts");
+    UCX_TEST_ASSERT(ucx_buffer_eof(b), "eof not set");
+    UCX_TEST_ASSERT(ucx_buffer_putc(b, 48) == EOF, "put shall return EOF on memof");
+    UCX_TEST_ASSERT(memcmp(buffer, "000          000", 16) == 0,
+            "buffer contains incorrect content");
+
+    UCX_TEST_END
+
+    ucx_buffer_free(b);
+    free(buffer);
+}
+
+UCX_TEST_IMPLEMENT(test_ucx_buffer_getc) {
+    char *buffer = malloc(16);
+    memset(buffer, 32, 8);
+    for (int i = 8; i < 16 ; i++) {
+        buffer[i] = 40+i;
+    }
+
+    UcxBuffer *b = ucx_buffer_new(buffer, 16);
+    int r;
+
+    UCX_TEST_BEGIN
+
+    char rb[16];
+    for (int i = 0 ; i < 16 ; i++) {
+        UCX_TEST_ASSERT(ucx_buffer_tell(b) == i, "pos wrong during read loop");
+        UCX_TEST_ASSERT(!ucx_buffer_eof(b),
+                "EOF shall not be set during read loop");
+        rb[i] = ucx_buffer_getc(b);
+    }
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 16, "pos wrong after read loop");
+    UCX_TEST_ASSERT(ucx_buffer_eof(b), "EOF not set");
+    UCX_TEST_ASSERT(memcmp(rb, "        01234567", 16) == 0,
+            "read data incorrect");
+
+    UCX_TEST_END
+
+    ucx_buffer_free(b);
+    free(buffer);
+}
+
+UCX_TEST_IMPLEMENT(test_ucx_buffer_write) {
+    char *buffer = malloc(16);
+    memset(buffer, 32, 8);
+    for (int i = 8; i < 16 ; i++) {
+        buffer[i] = 40+i;
+    }
+
+    UcxBuffer *b = ucx_buffer_new(buffer, 16);
+    int r;
+
+    UCX_TEST_BEGIN
+
+    char* teststring = "this is way too much";
+    r = ucx_buffer_write(teststring, 1, 20, b);
+    UCX_TEST_ASSERT(r == 16, "string not correctly trimed");
+    UCX_TEST_ASSERT(memcmp(buffer, teststring, 16) == 0,
+            "buffer data incorrect");
+    UCX_TEST_ASSERT(ucx_buffer_eof(b), "eof shall be set");
+
+    ucx_buffer_seek(b, 8, SEEK_SET);
+    r = ucx_buffer_write("not", 1, 3, b);
+    UCX_TEST_ASSERT(r == 3, "three bytes should be replace");
+    UCX_TEST_ASSERT(memcmp(buffer, "this is not too much", 16) == 0,
+            "modified buffer is incorrect");
+
+    char* threebytestring = "  t  h  r  e  e   ";
+    memset(buffer, 49, 16);
+    ucx_buffer_seek(b, 0, SEEK_SET);
+    r = ucx_buffer_write(threebytestring, 3, 6, b);
+    UCX_TEST_ASSERT(r == 15, "three byte string not correctly trimed");
+    UCX_TEST_ASSERT(ucx_buffer_tell(b) == 15,
+            "position after write of three byte string incorrect");
+    UCX_TEST_ASSERT(!ucx_buffer_eof(b), "eof shall not be set");
+    UCX_TEST_ASSERT(memcmp(buffer, "  t  h  r  e  e1", 16) == 0,
+                "bufer is incorrect after three byte string has been written");
+
+    UCX_TEST_END
+
+    ucx_buffer_free(b);
+    free(buffer);
+}
+
+UCX_TEST_IMPLEMENT(test_ucx_buffer_read) {
+    char *buffer = malloc(16);
+    memset(buffer, 56, 8);
+    for (int i = 8; i < 16 ; i++) {
+        buffer[i] = 40+i;
+    }
+
+    UcxBuffer *b = ucx_buffer_new(buffer, 16);
+    int r;
+
+    UCX_TEST_BEGIN
+
+    char rb[16];
+    memset(rb, 32, 16);
+
+    ucx_buffer_seek(b, 8, SEEK_SET);
+    r = ucx_buffer_read(rb, 1, 16, b);
+    UCX_TEST_ASSERT(r == 8, "read did not stop at buffer end");
+    UCX_TEST_ASSERT(memcmp(rb, "01234567        ", 16) == 0,
+            "buffer incorrect after first read");
+    UCX_TEST_ASSERT(ucx_buffer_eof(b), "eof shall be set");
+
+    ucx_buffer_seek(b, 0, SEEK_SET);
+    r = ucx_buffer_read(rb+8, 1, 8, b);
+    UCX_TEST_ASSERT(r == 8, "read did not read the specified amount of bytes");
+    UCX_TEST_ASSERT(memcmp(rb, "0123456788888888", 16) == 0,
+                "buffer incorrect after second read");
+
+    ucx_buffer_seek(b, 0, SEEK_SET);
+    r = ucx_buffer_read(rb, 3, 6, b);
+    UCX_TEST_ASSERT(r == 15,
+            "three byte read did not read the desired amount of bytes");
+    UCX_TEST_ASSERT(memcmp(rb, "8888888801234568", 16) == 0,
+                    "buffer incorrect after three byte read");
+
+    UCX_TEST_END
+
+    ucx_buffer_free(b);
+    free(buffer);
+}