4 files changed, 28 insertions, 0 deletions
diff --git a/vbench/src/tests/server_tagger/.gitignore b/vbench/src/tests/server_tagger/.gitignore
new file mode 100644
index 00000000000..3ade58a58d5
--- /dev/null
+++ b/vbench/src/tests/server_tagger/.gitignore
@@ -0,0 +1 @@
+vbench_server_tagger_test_app
diff --git a/vbench/src/tests/server_tagger/CMakeLists.txt b/vbench/src/tests/server_tagger/CMakeLists.txt
new file mode 100644
index 00000000000..d7cc0bdbea9
--- /dev/null
+++ b/vbench/src/tests/server_tagger/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(vbench_server_tagger_test_app
+    SOURCES
+    server_tagger_test.cpp
+    DEPENDS
+    vbench_test
+    vbench
+)
+vespa_add_test(NAME vbench_server_tagger_test_app COMMAND vbench_server_tagger_test_app)
diff --git a/vbench/src/tests/server_tagger/FILES b/vbench/src/tests/server_tagger/FILES
new file mode 100644
index 00000000000..b632f6e6916
--- /dev/null
+++ b/vbench/src/tests/server_tagger/FILES
@@ -0,0 +1 @@
+server_tagger_test.cpp
diff --git a/vbench/src/tests/server_tagger/server_tagger_test.cpp b/vbench/src/tests/server_tagger/server_tagger_test.cpp
new file mode 100644
index 00000000000..461ddffc124
--- /dev/null
+++ b/vbench/src/tests/server_tagger/server_tagger_test.cpp
@@ -0,0 +1,17 @@
+// 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_FF("server tagger", RequestReceptor(), ServerTagger(ServerSpec("host", 42), f1)) {
+    Request::UP req(new Request());
+    EXPECT_EQUAL("", req->server().host);
+    EXPECT_EQUAL(0, req->server().port);
+    f2.handle(std::move(req));
+    ASSERT_TRUE(f1.request.get() != 0);
+    EXPECT_EQUAL("host", f1.request->server().host);
+    EXPECT_EQUAL(42, f1.request->server().port);
+}
+
+TEST_MAIN() { TEST_RUN_ALL(); }