summaryrefslogtreecommitdiffstats
path: root/vbench/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'vbench/src/tests')
-rw-r--r--vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp19
-rw-r--r--vbench/src/tests/app_vbench/app_vbench_test.cpp23
-rw-r--r--vbench/src/tests/buffered_output/.gitignore1
-rw-r--r--vbench/src/tests/buffered_output/CMakeLists.txt9
-rw-r--r--vbench/src/tests/buffered_output/FILES1
-rw-r--r--vbench/src/tests/buffered_output/buffered_output_test.cpp32
-rw-r--r--vbench/src/tests/byte_input/.gitignore1
-rw-r--r--vbench/src/tests/byte_input/CMakeLists.txt9
-rw-r--r--vbench/src/tests/byte_input/FILES1
-rw-r--r--vbench/src/tests/byte_input/byte_input_test.cpp39
-rw-r--r--vbench/src/tests/http_client/http_client_test.cpp61
-rw-r--r--vbench/src/tests/input_reader/.gitignore0
-rw-r--r--vbench/src/tests/line_reader/line_reader_test.cpp17
-rw-r--r--vbench/src/tests/memory/.gitignore1
-rw-r--r--vbench/src/tests/memory/CMakeLists.txt9
-rw-r--r--vbench/src/tests/memory/FILES1
-rw-r--r--vbench/src/tests/memory/memory_test.cpp40
-rw-r--r--vbench/src/tests/simple_buffer/.gitignore1
-rw-r--r--vbench/src/tests/simple_buffer/CMakeLists.txt9
-rw-r--r--vbench/src/tests/simple_buffer/FILES1
-rw-r--r--vbench/src/tests/simple_buffer/simple_buffer_test.cpp70
-rw-r--r--vbench/src/tests/socket/socket_test.cpp6
-rw-r--r--vbench/src/tests/writable_memory/.gitignore1
-rw-r--r--vbench/src/tests/writable_memory/CMakeLists.txt9
-rw-r--r--vbench/src/tests/writable_memory/FILES1
-rw-r--r--vbench/src/tests/writable_memory/writable_memory_test.cpp20
26 files changed, 70 insertions, 312 deletions
diff --git a/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp b/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp
index 2135d53acba..b74f0f4f866 100644
--- a/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp
+++ b/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp
@@ -6,16 +6,19 @@
using namespace vbench;
using vespalib::SlaveProc;
+using InputReader = vespalib::InputReader;
+using OutputWriter = vespalib::OutputWriter;
+
bool endsWith(const Memory &mem, const string &str) {
return (mem.size < str.size()) ? false
: (strncmp(mem.data + mem.size - str.size(), str.data(), str.size()) == 0);
}
void readUntil(Input &input, SimpleBuffer &buffer, const string &end) {
- ByteInput in(input);
+ InputReader in(input);
while (!endsWith(buffer.get(), end)) {
- int c = in.get();
- if (c < 0) {
+ char c = in.read();
+ if (in.failed()) {
return;
}
buffer.reserve(1).data[0] = c;
@@ -34,11 +37,11 @@ TEST_MT_F("run dumpurl", 2, ServerSocket()) {
Stream::UP stream = f1.accept();
SimpleBuffer ignore;
readUntil(*stream, ignore, "\r\n\r\n");
- BufferedOutput out(*stream, 256);
- out.append("HTTP/1.1 200\r\n");
- out.append("content-length: 4\r\n");
- out.append("\r\n");
- out.append("data");
+ OutputWriter out(*stream, 256);
+ out.write("HTTP/1.1 200\r\n");
+ out.write("content-length: 4\r\n");
+ out.write("\r\n");
+ out.write("data");
} else {
std::string out;
EXPECT_TRUE(SlaveProc::run(strfmt("../../apps/dumpurl/vbench_dumpurl_app localhost %d /foo",
diff --git a/vbench/src/tests/app_vbench/app_vbench_test.cpp b/vbench/src/tests/app_vbench/app_vbench_test.cpp
index d1285255959..e65dd9badc0 100644
--- a/vbench/src/tests/app_vbench/app_vbench_test.cpp
+++ b/vbench/src/tests/app_vbench/app_vbench_test.cpp
@@ -6,16 +6,19 @@
using namespace vbench;
using vespalib::SlaveProc;
+using InputReader = vespalib::InputReader;
+using OutputWriter = vespalib::OutputWriter;
+
bool endsWith(const Memory &mem, const string &str) {
return (mem.size < str.size()) ? false
: (strncmp(mem.data + mem.size - str.size(), str.data(), str.size()) == 0);
}
void readUntil(Input &input, SimpleBuffer &buffer, const string &end) {
- ByteInput in(input);
+ InputReader in(input);
while (!endsWith(buffer.get(), end)) {
- int c = in.get();
- if (c < 0) {
+ char c = in.read();
+ if (in.failed()) {
return;
}
buffer.reserve(1).data[0] = c;
@@ -38,13 +41,13 @@ TEST_MT_F("run vbench", 2, ServerSocket()) {
}
SimpleBuffer ignore;
readUntil(*stream, ignore, "\r\n\r\n");
- BufferedOutput out(*stream, 256);
- out.append("HTTP/1.1 200\r\n");
- out.append("content-length: 4\r\n");
- out.append("X-Yahoo-Vespa-NumHits 10\r\n");
- out.append("X-Yahoo-Vespa-TotalHitCount 100\r\n");
- out.append("\r\n");
- out.append("data");
+ OutputWriter out(*stream, 256);
+ out.write("HTTP/1.1 200\r\n");
+ out.write("content-length: 4\r\n");
+ out.write("X-Yahoo-Vespa-NumHits 10\r\n");
+ out.write("X-Yahoo-Vespa-TotalHitCount 100\r\n");
+ out.write("\r\n");
+ out.write("data");
}
} else {
std::string out;
diff --git a/vbench/src/tests/buffered_output/.gitignore b/vbench/src/tests/buffered_output/.gitignore
deleted file mode 100644
index ba59218c6c5..00000000000
--- a/vbench/src/tests/buffered_output/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vbench_buffered_output_test_app
diff --git a/vbench/src/tests/buffered_output/CMakeLists.txt b/vbench/src/tests/buffered_output/CMakeLists.txt
deleted file mode 100644
index c9c3386b0e4..00000000000
--- a/vbench/src/tests/buffered_output/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vbench_buffered_output_test_app TEST
- SOURCES
- buffered_output_test.cpp
- DEPENDS
- vbench_test
- vbench
-)
-vespa_add_test(NAME vbench_buffered_output_test_app COMMAND vbench_buffered_output_test_app)
diff --git a/vbench/src/tests/buffered_output/FILES b/vbench/src/tests/buffered_output/FILES
deleted file mode 100644
index 86ca0ac84c1..00000000000
--- a/vbench/src/tests/buffered_output/FILES
+++ /dev/null
@@ -1 +0,0 @@
-buffered_output_test.cpp
diff --git a/vbench/src/tests/buffered_output/buffered_output_test.cpp b/vbench/src/tests/buffered_output/buffered_output_test.cpp
deleted file mode 100644
index 9514d619f77..00000000000
--- a/vbench/src/tests/buffered_output/buffered_output_test.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vbench/test/all.h>
-
-using namespace vbench;
-
-TEST("buffered output") {
- SimpleBuffer buffer;
- { // produce data
- BufferedOutput dst(buffer, 3);
- dst.append('a').append('b').append('c').append('\n');
- dst.append("foo bar").append('\n');
- dst.append(string("str")).append('\n');
- dst.printf("%d + %d = %d\n", 2, 2, 4);
- }
- { // verify data
- LineReader src(buffer);
- string str;
- EXPECT_TRUE(src.readLine(str));
- EXPECT_EQUAL("abc", str);
- EXPECT_TRUE(src.readLine(str));
- EXPECT_EQUAL("foo bar", str);
- EXPECT_TRUE(src.readLine(str));
- EXPECT_EQUAL("str", str);
- EXPECT_TRUE(src.readLine(str));
- EXPECT_EQUAL("2 + 2 = 4", str);
- EXPECT_TRUE(!src.readLine(str));
- EXPECT_EQUAL("", str);
- }
-}
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/vbench/src/tests/byte_input/.gitignore b/vbench/src/tests/byte_input/.gitignore
deleted file mode 100644
index 350435ffda4..00000000000
--- a/vbench/src/tests/byte_input/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vbench_byte_input_test_app
diff --git a/vbench/src/tests/byte_input/CMakeLists.txt b/vbench/src/tests/byte_input/CMakeLists.txt
deleted file mode 100644
index 3c946c223b6..00000000000
--- a/vbench/src/tests/byte_input/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vbench_byte_input_test_app TEST
- SOURCES
- byte_input_test.cpp
- DEPENDS
- vbench_test
- vbench
-)
-vespa_add_test(NAME vbench_byte_input_test_app COMMAND vbench_byte_input_test_app)
diff --git a/vbench/src/tests/byte_input/FILES b/vbench/src/tests/byte_input/FILES
deleted file mode 100644
index c625277f587..00000000000
--- a/vbench/src/tests/byte_input/FILES
+++ /dev/null
@@ -1 +0,0 @@
-byte_input_test.cpp
diff --git a/vbench/src/tests/byte_input/byte_input_test.cpp b/vbench/src/tests/byte_input/byte_input_test.cpp
deleted file mode 100644
index 28bc3c7b3ad..00000000000
--- a/vbench/src/tests/byte_input/byte_input_test.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vbench/test/all.h>
-
-using namespace vbench;
-
-TEST("byte input") {
- SimpleBuffer buffer;
- {
- BufferedOutput out(buffer, 10);
- out.append("abcdefgh");
- }
- EXPECT_EQUAL(8u, buffer.get().size);
- {
- ByteInput in(buffer);
- EXPECT_EQUAL('a', in.get());
- EXPECT_EQUAL('b', in.get());
- EXPECT_EQUAL('c', in.get());
- EXPECT_EQUAL('d', in.get());
- }
- EXPECT_EQUAL(4u, buffer.get().size);
- {
- ByteInput in(buffer);
- EXPECT_EQUAL('e', in.get());
- EXPECT_EQUAL('f', in.get());
- EXPECT_EQUAL('g', in.get());
- EXPECT_EQUAL('h', in.get());
- EXPECT_EQUAL(-1, in.get());
- EXPECT_EQUAL(-1, in.get());
- }
- EXPECT_EQUAL(0u, buffer.get().size);
- {
- ByteInput in(buffer);
- EXPECT_EQUAL(-1, in.get());
- }
- EXPECT_EQUAL(0u, buffer.get().size);
-}
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/vbench/src/tests/http_client/http_client_test.cpp b/vbench/src/tests/http_client/http_client_test.cpp
index 55cb899f5cb..50331dc1fbe 100644
--- a/vbench/src/tests/http_client/http_client_test.cpp
+++ b/vbench/src/tests/http_client/http_client_test.cpp
@@ -4,6 +4,9 @@
using namespace vbench;
+using InputReader = vespalib::InputReader;
+using OutputWriter = vespalib::OutputWriter;
+
void checkMemory(const string &expect, const Memory &mem) {
EXPECT_EQUAL(expect, string(mem.data, mem.size));
}
@@ -14,10 +17,10 @@ bool endsWith(const Memory &mem, const string &str) {
}
void readUntil(Input &input, SimpleBuffer &buffer, const string &end) {
- ByteInput in(input);
+ InputReader in(input);
while (!endsWith(buffer.get(), end)) {
- int c = in.get();
- if (c < 0) {
+ char c = in.read();
+ if (in.failed()) {
return;
}
buffer.reserve(1).data[0] = c;
@@ -29,13 +32,13 @@ TEST_MT_F("verify request", 2, ServerSocket()) {
if (thread_id == 0) {
SimpleBuffer expect;
{
- BufferedOutput dst(expect, 256);
- dst.append("GET /this/is/the/url HTTP/1.1\r\n");
- dst.append("Host: localhost\r\n");
- dst.append("User-Agent: vbench\r\n");
- dst.append("X-Yahoo-Vespa-Benchmarkdata: true\r\n");
- dst.append("X-Yahoo-Vespa-Benchmarkdata-Coverage: true\r\n");
- dst.append("\r\n");
+ OutputWriter out(expect, 256);
+ out.write("GET /this/is/the/url HTTP/1.1\r\n");
+ out.write("Host: localhost\r\n");
+ out.write("User-Agent: vbench\r\n");
+ out.write("X-Yahoo-Vespa-Benchmarkdata: true\r\n");
+ out.write("X-Yahoo-Vespa-Benchmarkdata-Coverage: true\r\n");
+ out.write("\r\n");
}
SimpleBuffer actual;
Stream::UP stream = f1.accept();
@@ -54,10 +57,10 @@ TEST_MT_F("verify connection close", 2, ServerSocket()) {
Stream::UP stream = f1.accept();
SimpleBuffer ignore;
readUntil(*stream, ignore, "\r\n\r\n");
- BufferedOutput out(*stream, 256);
- out.append("HTTP/1.0 200\r\n");
- out.append("\r\n");
- out.append("data");
+ OutputWriter out(*stream, 256);
+ out.write("HTTP/1.0 200\r\n");
+ out.write("\r\n");
+ out.write("data");
} else {
SimpleHttpResultHandler handler;
HttpClient::fetch(ServerSpec("localhost", f1.port()),
@@ -73,11 +76,11 @@ TEST_MT_F("verify content length", 2, ServerSocket()) {
Stream::UP stream = f1.accept();
SimpleBuffer ignore;
readUntil(*stream, ignore, "\r\n\r\n");
- BufferedOutput out(*stream, 256);
- out.append("HTTP/1.1 200\r\n");
- out.append("content-length: 4\r\n");
- out.append("\r\n");
- out.append("data");
+ OutputWriter out(*stream, 256);
+ out.write("HTTP/1.1 200\r\n");
+ out.write("content-length: 4\r\n");
+ out.write("\r\n");
+ out.write("data");
} else {
SimpleHttpResultHandler handler;
HttpClient::fetch(ServerSpec("localhost", f1.port()),
@@ -93,16 +96,16 @@ TEST_MT_F("verify chunked encoding", 2, ServerSocket()) {
Stream::UP stream = f1.accept();
SimpleBuffer ignore;
readUntil(*stream, ignore, "\r\n\r\n");
- BufferedOutput out(*stream, 256);
- out.append("HTTP/1.1 200\r\n");
- out.append("transfer-encoding: chunked\r\n");
- out.append("\r\n");
- out.append("2\r\n");
- out.append("da\r\n");
- out.append("2\r\n");
- out.append("ta\r\n");
- out.append("0\r\n");
- out.append("\r\n");
+ OutputWriter out(*stream, 256);
+ out.write("HTTP/1.1 200\r\n");
+ out.write("transfer-encoding: chunked\r\n");
+ out.write("\r\n");
+ out.write("2\r\n");
+ out.write("da\r\n");
+ out.write("2\r\n");
+ out.write("ta\r\n");
+ out.write("0\r\n");
+ out.write("\r\n");
} else {
SimpleHttpResultHandler handler;
HttpClient::fetch(ServerSpec("localhost", f1.port()),
diff --git a/vbench/src/tests/input_reader/.gitignore b/vbench/src/tests/input_reader/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/vbench/src/tests/input_reader/.gitignore
+++ /dev/null
diff --git a/vbench/src/tests/line_reader/line_reader_test.cpp b/vbench/src/tests/line_reader/line_reader_test.cpp
index 1b893a4ca15..e731bc1bc9a 100644
--- a/vbench/src/tests/line_reader/line_reader_test.cpp
+++ b/vbench/src/tests/line_reader/line_reader_test.cpp
@@ -4,16 +4,19 @@
using namespace vbench;
+using OutputWriter = vespalib::OutputWriter;
+using SimpleBuffer = vespalib::SimpleBuffer;
+
TEST("line reader") {
SimpleBuffer buffer;
{
- BufferedOutput dst(buffer, 64);
- dst.append("foo\n");
- dst.append("bar\r\n");
- dst.append("\n");
- dst.append("\rbaz\n");
- dst.append("\r\n");
- dst.append("zzz");
+ OutputWriter dst(buffer, 64);
+ dst.write("foo\n");
+ dst.write("bar\r\n");
+ dst.write("\n");
+ dst.write("\rbaz\n");
+ dst.write("\r\n");
+ dst.write("zzz");
}
{
LineReader src(buffer);
diff --git a/vbench/src/tests/memory/.gitignore b/vbench/src/tests/memory/.gitignore
deleted file mode 100644
index e1fd81a3e7c..00000000000
--- a/vbench/src/tests/memory/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vbench_memory_test_app
diff --git a/vbench/src/tests/memory/CMakeLists.txt b/vbench/src/tests/memory/CMakeLists.txt
deleted file mode 100644
index c2dc5b45306..00000000000
--- a/vbench/src/tests/memory/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vbench_memory_test_app TEST
- SOURCES
- memory_test.cpp
- DEPENDS
- vbench_test
- vbench
-)
-vespa_add_test(NAME vbench_memory_test_app COMMAND vbench_memory_test_app)
diff --git a/vbench/src/tests/memory/FILES b/vbench/src/tests/memory/FILES
deleted file mode 100644
index 3627eec5ec7..00000000000
--- a/vbench/src/tests/memory/FILES
+++ /dev/null
@@ -1 +0,0 @@
-memory_test.cpp
diff --git a/vbench/src/tests/memory/memory_test.cpp b/vbench/src/tests/memory/memory_test.cpp
deleted file mode 100644
index 9504914d191..00000000000
--- a/vbench/src/tests/memory/memory_test.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vbench/test/all.h>
-
-using namespace vbench;
-
-TEST("empty memory") {
- Memory m;
- EXPECT_EQUAL((const char*)0, m.data);
- EXPECT_EQUAL(0u, m.size);
-}
-
-TEST("from string") {
- string str("foo");
- Memory m1(str);
- Memory m2 = str;
- EXPECT_EQUAL(str.data(), m1.data);
- EXPECT_EQUAL(str.size(), m1.size);
- EXPECT_EQUAL(str.data(), m2.data);
- EXPECT_EQUAL(str.size(), m2.size);
-}
-
-TEST("from cstring") {
- const char *str = "foo";
- Memory m1(str);
- Memory m2 = str;
- EXPECT_EQUAL(str, m1.data);
- EXPECT_EQUAL(strlen(str), m1.size);
- EXPECT_EQUAL(str, m2.data);
- EXPECT_EQUAL(strlen(str), m2.size);
-}
-
-TEST("from ptr and len") {
- string str("foo");
- Memory m1(str.data(), str.size());
- EXPECT_EQUAL(str.data(), m1.data);
- EXPECT_EQUAL(str.size(), m1.size);
-}
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/vbench/src/tests/simple_buffer/.gitignore b/vbench/src/tests/simple_buffer/.gitignore
deleted file mode 100644
index f40426a6708..00000000000
--- a/vbench/src/tests/simple_buffer/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vbench_simple_buffer_test_app
diff --git a/vbench/src/tests/simple_buffer/CMakeLists.txt b/vbench/src/tests/simple_buffer/CMakeLists.txt
deleted file mode 100644
index 97ce39faa4e..00000000000
--- a/vbench/src/tests/simple_buffer/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vbench_simple_buffer_test_app TEST
- SOURCES
- simple_buffer_test.cpp
- DEPENDS
- vbench_test
- vbench
-)
-vespa_add_test(NAME vbench_simple_buffer_test_app COMMAND vbench_simple_buffer_test_app)
diff --git a/vbench/src/tests/simple_buffer/FILES b/vbench/src/tests/simple_buffer/FILES
deleted file mode 100644
index 3669f575911..00000000000
--- a/vbench/src/tests/simple_buffer/FILES
+++ /dev/null
@@ -1 +0,0 @@
-simple_buffer_test.cpp
diff --git a/vbench/src/tests/simple_buffer/simple_buffer_test.cpp b/vbench/src/tests/simple_buffer/simple_buffer_test.cpp
deleted file mode 100644
index f0be5766e55..00000000000
--- a/vbench/src/tests/simple_buffer/simple_buffer_test.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vbench/test/all.h>
-
-using namespace vbench;
-
-void checkMemory(const string &expect, const Memory &mem) {
- EXPECT_EQUAL(expect, string(mem.data, mem.size));
-}
-
-void checkBuffer(const string &expect, const SimpleBuffer &buf) {
- TEST_DO(checkMemory(expect, buf.get()));
-}
-
-TEST("simple buffer") {
- SimpleBuffer buf;
- TEST_DO(checkBuffer("", buf));
- { // read from empty buffer
- EXPECT_EQUAL(0u, buf.obtain().size);
- }
- { // write to buffer
- WritableMemory mem = buf.reserve(10);
- TEST_DO(checkBuffer("", buf));
- EXPECT_EQUAL(10u, mem.size);
- mem.data[0] = 'a';
- mem.data[1] = 'b';
- mem.data[2] = 'c';
- EXPECT_EQUAL(&buf, &buf.commit(3));
- mem = buf.reserve(0);
- TEST_DO(checkBuffer("abc", buf));
- EXPECT_EQUAL(0u, mem.size);
- }
- { // read without evicting last byte
- Memory mem = buf.obtain();
- TEST_DO(checkBuffer("abc", buf));
- TEST_DO(checkMemory("abc", mem));
- EXPECT_EQUAL(&buf, &buf.evict(2));
- mem = buf.obtain();
- TEST_DO(checkBuffer("c", buf));
- TEST_DO(checkMemory("c", mem));
- mem = buf.obtain();
- TEST_DO(checkBuffer("c", buf));
- TEST_DO(checkMemory("c", mem));
- }
- { // write more to buffer
- WritableMemory mem = buf.reserve(10);
- EXPECT_EQUAL(10u, mem.size);
- TEST_DO(checkBuffer("c", buf));
- mem.data[0] = 'd';
- EXPECT_EQUAL(&buf, &buf.commit(1));
- mem = buf.reserve(5);
- TEST_DO(checkBuffer("cd", buf));
- EXPECT_EQUAL(5u, mem.size);
- }
- { // read until end
- Memory mem = buf.obtain();
- TEST_DO(checkBuffer("cd", buf));
- TEST_DO(checkMemory("cd", mem));
- EXPECT_EQUAL(&buf, &buf.evict(1));
- mem = buf.obtain();
- TEST_DO(checkBuffer("d", buf));
- TEST_DO(checkMemory("d", mem));
- EXPECT_EQUAL(&buf, &buf.evict(1));
- mem = buf.obtain();
- TEST_DO(checkBuffer("", buf));
- TEST_DO(checkMemory("", mem));
- }
-}
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/vbench/src/tests/socket/socket_test.cpp b/vbench/src/tests/socket/socket_test.cpp
index e49a31773f3..02d4caed507 100644
--- a/vbench/src/tests/socket/socket_test.cpp
+++ b/vbench/src/tests/socket/socket_test.cpp
@@ -4,17 +4,19 @@
using namespace vbench;
+using OutputWriter = vespalib::OutputWriter;
+
const size_t numLines = 100;
struct Agent {
Stream::UP socket;
Agent(Stream::UP s) : socket(std::move(s)) {}
void write(const char *prefix) {
- BufferedOutput out(*socket, 32);
+ OutputWriter out(*socket, 32);
for (size_t i = 0; i < numLines; ++i) {
out.printf("%s%zu\n", prefix, i);
}
- out.append("\n");
+ out.write("\n");
}
void read(const char *prefix) {
LineReader reader(*socket);
diff --git a/vbench/src/tests/writable_memory/.gitignore b/vbench/src/tests/writable_memory/.gitignore
deleted file mode 100644
index 00061ea18f7..00000000000
--- a/vbench/src/tests/writable_memory/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vbench_writable_memory_test_app
diff --git a/vbench/src/tests/writable_memory/CMakeLists.txt b/vbench/src/tests/writable_memory/CMakeLists.txt
deleted file mode 100644
index 8b480ff05af..00000000000
--- a/vbench/src/tests/writable_memory/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vbench_writable_memory_test_app TEST
- SOURCES
- writable_memory_test.cpp
- DEPENDS
- vbench_test
- vbench
-)
-vespa_add_test(NAME vbench_writable_memory_test_app COMMAND vbench_writable_memory_test_app)
diff --git a/vbench/src/tests/writable_memory/FILES b/vbench/src/tests/writable_memory/FILES
deleted file mode 100644
index 14718444a2e..00000000000
--- a/vbench/src/tests/writable_memory/FILES
+++ /dev/null
@@ -1 +0,0 @@
-writable_memory_test.cpp
diff --git a/vbench/src/tests/writable_memory/writable_memory_test.cpp b/vbench/src/tests/writable_memory/writable_memory_test.cpp
deleted file mode 100644
index 2be9d6b5153..00000000000
--- a/vbench/src/tests/writable_memory/writable_memory_test.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vbench/test/all.h>
-
-using namespace vbench;
-
-TEST("empty") {
- WritableMemory wm;
- EXPECT_EQUAL((char*)0, wm.data);
- EXPECT_EQUAL(0u, wm.size);
-}
-
-TEST("from buffer") {
- char buf[3];
- WritableMemory wm(buf, 3);
- EXPECT_EQUAL(buf, wm.data);
- EXPECT_EQUAL(3u, wm.size);
-}
-
-TEST_MAIN() { TEST_RUN_ALL(); }