diff -r 3ca984931e1d -r db1c8dfe403a tests/test_buffer.c
--- a/tests/test_buffer.c	Wed Jan 03 22:17:40 2024 +0100
+++ b/tests/test_buffer.c	Thu Jan 04 21:05:32 2024 +0100
@@ -430,7 +430,7 @@
 #define TEST_BUFFER_SHIFT_TEARDOWN(buf) \
     cxBufferDestroy(&buf); \
     CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); \
-    cx_testing_allocator_destroy(&talloc);
+    cx_testing_allocator_destroy(&talloc)
 
 
 CX_TEST(test_buffer_shift_left_zero) {
@@ -585,6 +585,529 @@
     }
 }
 
+static size_t mock_write_limited_rate(
+        void const *ptr,
+        size_t size,
+        __attribute__((unused)) size_t nitems,
+        CxBuffer *buffer
+) {
+    // simulate limited target drain capacity
+    static bool full = false;
+    if (full) {
+        full = false;
+        return 0;
+    } else {
+        full = true;
+        return cxBufferWrite(ptr, size, nitems > 2 ? 2 : nitems, buffer);
+    }
+}
+
+CX_TEST(test_buffer_write_size_one_fit) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    const char *data = "test";
+    CX_TEST_DO {
+        size_t written = cxBufferWrite(data, 1, 4, &buf);
+        CX_TEST_ASSERT(written == 4);
+        CX_TEST_ASSERT(buf.size == 8);
+        CX_TEST_ASSERT(buf.pos == 8);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "preptest", 8));
+    }
+
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_size_one_discard) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    const char *data = "testing";
+    CX_TEST_DO {
+        size_t written = cxBufferWrite(data, 1, 7, &buf);
+        CX_TEST_ASSERT(written == 4);
+        CX_TEST_ASSERT(buf.size == 8);
+        CX_TEST_ASSERT(buf.pos == 8);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "preptest\0", 9));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_size_one_extend) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    buf.flags |= CX_BUFFER_AUTO_EXTEND;
+    const char *data = "testing";
+    CX_TEST_DO {
+        size_t written = cxBufferWrite(data, 1, 7, &buf);
+        CX_TEST_ASSERT(written == 7);
+        CX_TEST_ASSERT(buf.size == 11);
+        CX_TEST_ASSERT(buf.pos == 11);
+        CX_TEST_ASSERT(buf.capacity >= 11);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "preptesting", 11));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_multibyte_fit) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    const char *data = "test";
+    CX_TEST_DO {
+        size_t written = cxBufferWrite(data, 2, 2, &buf);
+        CX_TEST_ASSERT(written == 2);
+        CX_TEST_ASSERT(buf.size == 8);
+        CX_TEST_ASSERT(buf.pos == 8);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "preptest", 8));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_multibyte_discard) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = 4;
+    buf.pos = 3;
+    const char *data = "testing";
+    CX_TEST_DO {
+        size_t written = cxBufferWrite(data, 2, 4, &buf);
+        // remember: whole elements are discarded if they do not fit
+        CX_TEST_ASSERT(written == 2);
+        CX_TEST_ASSERT(buf.size == 7);
+        CX_TEST_ASSERT(buf.pos == 7);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "pretest\0", 8));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_multibyte_extend) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = 4;
+    buf.pos = 3;
+    buf.flags |= CX_BUFFER_AUTO_EXTEND;
+    const char *data = "tester";
+    CX_TEST_DO {
+        size_t written = cxBufferWrite(data, 2, 3, &buf);
+        // remember: whole elements are discarded if they do not fit
+        CX_TEST_ASSERT(written == 3);
+        CX_TEST_ASSERT(buf.size == 9);
+        CX_TEST_ASSERT(buf.pos == 9);
+        CX_TEST_ASSERT(buf.capacity >= 9);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "pretester", 9));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_put_fit) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    CX_TEST_DO {
+        int c = cxBufferPut(&buf, 0x200 | 'a');
+        CX_TEST_ASSERT(c == 'a');
+        CX_TEST_ASSERT(buf.size == 5);
+        CX_TEST_ASSERT(buf.pos == 5);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "prepa\0", 6));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_put_discard) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = 4;
+    buf.pos = 8;
+    CX_TEST_DO {
+        int c = cxBufferPut(&buf, 0x200 | 'a');
+        CX_TEST_ASSERT(c == EOF);
+        CX_TEST_ASSERT(buf.size == 4);
+        CX_TEST_ASSERT(buf.pos == 8);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "prep\0\0\0\0\0", 9));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_put_extend) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = 4;
+    buf.pos = 8;
+    buf.flags |= CX_BUFFER_AUTO_EXTEND;
+    CX_TEST_DO {
+        int c = cxBufferPut(&buf, 0x200 | 'a');
+        CX_TEST_ASSERT(c == 'a');
+        CX_TEST_ASSERT(buf.size == 9);
+        CX_TEST_ASSERT(buf.pos == 9);
+        CX_TEST_ASSERT(buf.capacity >= 9);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "prep\0\0\0\0a", 9));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_put_string_fit) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    const char *data = "test";
+    CX_TEST_DO {
+        size_t written = cxBufferPutString(&buf, data);
+        CX_TEST_ASSERT(written == 4);
+        CX_TEST_ASSERT(buf.size == 8);
+        CX_TEST_ASSERT(buf.pos == 8);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "preptest", 8));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_put_string_discard) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    const char *data = "testing";
+    CX_TEST_DO {
+        size_t written = cxBufferPutString(&buf, data);
+        CX_TEST_ASSERT(written == 4);
+        CX_TEST_ASSERT(buf.size == 8);
+        CX_TEST_ASSERT(buf.pos == 8);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "preptest\0", 9));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_put_string_extend) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    buf.flags |= CX_BUFFER_AUTO_EXTEND;
+    const char *data = "testing";
+    CX_TEST_DO {
+        size_t written = cxBufferPutString(&buf, data);
+        CX_TEST_ASSERT(written == 7);
+        CX_TEST_ASSERT(buf.size == 11);
+        CX_TEST_ASSERT(buf.pos == 11);
+        CX_TEST_ASSERT(buf.capacity >= 11);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "preptesting", 11));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_size_overflow) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    const char *data = "testing";
+    CX_TEST_DO {
+        size_t written = cxBufferWrite(data, 8, SIZE_MAX / 4, &buf);
+        CX_TEST_ASSERT(written == 0);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(buf.pos == 4);
+        CX_TEST_ASSERT(buf.size == 4);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "prep\0", 5));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_capacity_overflow) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    buf.flags |= CX_BUFFER_AUTO_EXTEND;
+    const char *data = "testing";
+    CX_TEST_DO {
+        size_t written = cxBufferWrite(data, 1, SIZE_MAX - 2, &buf);
+        CX_TEST_ASSERT(written == 0);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(buf.pos == 4);
+        CX_TEST_ASSERT(buf.size == 4);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "prep\0", 5));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_only_overwrite) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "preptest\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.pos = 3;
+    buf.size = 8;
+    buf.flags |= CX_BUFFER_AUTO_EXTEND;
+    CX_TEST_DO {
+        size_t written = cxBufferWrite("XXX", 2, 2, &buf);
+        CX_TEST_ASSERT(written == 2);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(buf.size == 8);
+        CX_TEST_ASSERT(buf.pos == 7);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, "preXXX\0t", 8));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_flush_at_capacity) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    buf.flush_target = ⌖
+    buf.flush_func = (cx_write_func)cxBufferWrite;
+    buf.flush_blkmax = 1;
+    CX_TEST_DO {
+        size_t written = cxBufferWrite("foo", 1, 3, &buf);
+        CX_TEST_ASSERT(written == 3);
+        CX_TEST_ASSERT(buf.pos == 7);
+        CX_TEST_ASSERT(buf.size == 7);
+        CX_TEST_ASSERT(target.pos == 0);
+        CX_TEST_ASSERT(target.size == 0);
+        written = cxBufferWrite("hello", 1, 5, &buf);
+        CX_TEST_ASSERT(written == 5);
+        CX_TEST_ASSERT(buf.pos == 0);
+        CX_TEST_ASSERT(buf.size == 0);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(target.pos == 12);
+        CX_TEST_ASSERT(target.size == 12);
+        CX_TEST_ASSERT(0 == memcmp(target.space, "prepfoohello", 12));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_flush_at_threshold) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    buf.flush_target = ⌖
+    buf.flush_func = (cx_write_func)cxBufferWrite;
+    buf.flush_blkmax = 1;
+    buf.flush_threshold = 12;
+    buf.flags |= CX_BUFFER_AUTO_EXTEND;
+    CX_TEST_DO {
+        size_t written = cxBufferWrite("foobar", 1, 6, &buf);
+        CX_TEST_ASSERT(written == 6);
+        CX_TEST_ASSERT(buf.pos == 10);
+        CX_TEST_ASSERT(buf.size == 10);
+        CX_TEST_ASSERT(buf.capacity >= 10);
+        CX_TEST_ASSERT(buf.capacity <= 12);
+        CX_TEST_ASSERT(target.pos == 0);
+        CX_TEST_ASSERT(target.size == 0);
+        written = cxBufferWrite("hello", 1, 5, &buf);
+        CX_TEST_ASSERT(written == 5);
+        CX_TEST_ASSERT(buf.pos == 0);
+        CX_TEST_ASSERT(buf.size == 0);
+        CX_TEST_ASSERT(buf.capacity <= 12);
+        CX_TEST_ASSERT(target.pos == 15);
+        CX_TEST_ASSERT(target.size == 15);
+        CX_TEST_ASSERT(0 == memcmp(target.space, "prepfoobarhello", 15));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_write_flush_rate_limited) {
+    CxBuffer buf, target;
+    cxBufferInit(&target, NULL, 16, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "prep\0\0\0\0\0\0\0\0\0\0\0\0", 16);
+    buf.capacity = 8;
+    buf.size = buf.pos = 4;
+    buf.flush_target = &target;
+    buf.flush_blkmax = 1;
+    // limit the rate of the flush function and the capacity of the target
+    buf.flush_func = (cx_write_func) mock_write_limited_rate;
+    target.capacity = 16;
+    target.flags &= ~CX_BUFFER_AUTO_EXTEND;
+    CX_TEST_DO {
+        size_t written = cxBufferWrite("foo", 1, 3, &buf);
+        CX_TEST_ASSERT(written == 3);
+        CX_TEST_ASSERT(buf.pos == 7);
+        CX_TEST_ASSERT(buf.size == 7);
+        CX_TEST_ASSERT(target.pos == 0);
+        CX_TEST_ASSERT(target.size == 0);
+        written = cxBufferWrite("hello, world!", 1, 13, &buf);
+        // " world!" fits into this buffer, the remaining stuff is flushed out
+        CX_TEST_ASSERT(written == 13);
+        CX_TEST_ASSERT(buf.pos == 7);
+        CX_TEST_ASSERT(buf.size == 7);
+        CX_TEST_ASSERT(buf.capacity == 8);
+        CX_TEST_ASSERT(0 == memcmp(buf.space, " world!", 7));
+        CX_TEST_ASSERT(target.pos == 13);
+        CX_TEST_ASSERT(target.size == 13);
+        CX_TEST_ASSERT(target.capacity == 16);
+        CX_TEST_ASSERT(0 == memcmp(target.space, "prepfoohello,", 13));
+    }
+    cxBufferDestroy(&buf);
+    cxBufferDestroy(&target);
+}
+
+CX_TEST(test_buffer_get) {
+    CxBuffer buf;
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "some data\0\0\0\0\0\0\0", 16);
+    buf.capacity = 12;
+    buf.size = 9;
+    buf.pos = 2;
+    CX_TEST_DO {
+        CX_TEST_ASSERT(cxBufferGet(&buf) == 'm');
+        CX_TEST_ASSERT(cxBufferGet(&buf) == 'e');
+        CX_TEST_ASSERT(cxBufferGet(&buf) == ' ');
+        CX_TEST_ASSERT(cxBufferGet(&buf) == 'd');
+        CX_TEST_ASSERT(buf.pos == 6);
+    }
+    cxBufferDestroy(&buf);
+}
+
+CX_TEST(test_buffer_get_eof) {
+    CxBuffer buf;
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "some data\0\0\0\0\0\0\0", 16);
+    buf.capacity = 12;
+    buf.pos = buf.size = 9;
+    CX_TEST_DO {
+        CX_TEST_ASSERT(cxBufferGet(&buf) == EOF);
+    }
+    cxBufferDestroy(&buf);
+}
+
+CX_TEST(test_buffer_read) {
+    CxBuffer buf;
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "some data\0\0\0\0\0\0\0", 16);
+    buf.capacity = 12;
+    buf.size = 9;
+    buf.pos = 2;
+    CX_TEST_DO {
+        char target[4];
+        size_t read = cxBufferRead(&target, 1, 4, &buf);
+        CX_TEST_ASSERT(read == 4);
+        CX_TEST_ASSERT(0 == memcmp(&target, "me d", 4));
+        CX_TEST_ASSERT(buf.pos == 6);
+    }
+    cxBufferDestroy(&buf);
+}
+
+CX_TEST(test_buffer_read_oob) {
+    CxBuffer buf;
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "some data\0\0\0\0\0\0\0", 16);
+    buf.capacity = 12;
+    buf.size = 9;
+    buf.pos = 6;
+    CX_TEST_DO {
+        char target[4];
+        size_t read = cxBufferRead(&target, 1, 4, &buf);
+        CX_TEST_ASSERT(read == 3);
+        CX_TEST_ASSERT(0 == memcmp(&target, "ata", 3));
+        CX_TEST_ASSERT(buf.pos == 9);
+    }
+    cxBufferDestroy(&buf);
+}
+
+CX_TEST(test_buffer_read_oob_multibyte) {
+    CxBuffer buf;
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "some data\0\0\0\0\0\0\0", 16);
+    buf.capacity = 12;
+    buf.size = 9;
+    buf.pos = 6;
+    CX_TEST_DO {
+        char target[4];
+        target[2] = '\0';
+        size_t read = cxBufferRead(&target, 2, 2, &buf);
+        CX_TEST_ASSERT(read == 1);
+        CX_TEST_ASSERT(0 == memcmp(&target, "at\0", 3));
+        CX_TEST_ASSERT(buf.pos == 8);
+    }
+    cxBufferDestroy(&buf);
+}
+
+CX_TEST(test_buffer_read_eof) {
+    CxBuffer buf;
+    cxBufferInit(&buf, NULL, 16, cxDefaultAllocator, CX_BUFFER_DEFAULT);
+    memcpy(buf.space, "some data\0\0\0\0\0\0\0", 16);
+    buf.capacity = 12;
+    buf.size = buf.pos = 9;
+    CX_TEST_DO {
+        char target[4];
+        size_t read = cxBufferRead(&target, 1, 1, &buf);
+        CX_TEST_ASSERT(read == 0);
+        CX_TEST_ASSERT(buf.pos == 9);
+    }
+    cxBufferDestroy(&buf);
+}
+
 CxTestSuite *cx_test_suite_buffer(void) {
     CxTestSuite *suite = cx_test_suite_new("buffer");
 
@@ -623,6 +1146,30 @@
     cx_test_register(suite, test_buffer_shift_right_overshift_discard);
     cx_test_register(suite, test_buffer_shift_right_overshift_extend);
     cx_test_register(suite, test_buffer_shift_right_offset_interface);
-    
+    cx_test_register(suite, test_buffer_write_size_one_fit);
+    cx_test_register(suite, test_buffer_write_size_one_discard);
+    cx_test_register(suite, test_buffer_write_size_one_extend);
+    cx_test_register(suite, test_buffer_write_multibyte_fit);
+    cx_test_register(suite, test_buffer_write_multibyte_discard);
+    cx_test_register(suite, test_buffer_write_multibyte_extend);
+    cx_test_register(suite, test_buffer_put_fit);
+    cx_test_register(suite, test_buffer_put_discard);
+    cx_test_register(suite, test_buffer_put_extend);
+    cx_test_register(suite, test_buffer_put_string_fit);
+    cx_test_register(suite, test_buffer_put_string_discard);
+    cx_test_register(suite, test_buffer_put_string_extend);
+    cx_test_register(suite, test_buffer_write_size_overflow);
+    cx_test_register(suite, test_buffer_write_capacity_overflow);
+    cx_test_register(suite, test_buffer_write_only_overwrite);
+    cx_test_register(suite, test_buffer_write_flush_at_capacity);
+    cx_test_register(suite, test_buffer_write_flush_at_threshold);
+    cx_test_register(suite, test_buffer_write_flush_rate_limited);
+    cx_test_register(suite, test_buffer_get);
+    cx_test_register(suite, test_buffer_get_eof);
+    cx_test_register(suite, test_buffer_read);
+    cx_test_register(suite, test_buffer_read_oob);
+    cx_test_register(suite, test_buffer_read_oob_multibyte);
+    cx_test_register(suite, test_buffer_read_eof);
+
     return suite;
 }