5 files changed, 40 insertions, 0 deletions
diff --git a/vbench/src/tests/request_generator/.gitignore b/vbench/src/tests/request_generator/.gitignore
new file mode 100644
index 00000000000..8ec28a2df32
--- /dev/null
+++ b/vbench/src/tests/request_generator/.gitignore
@@ -0,0 +1 @@
+vbench_request_generator_test_app
diff --git a/vbench/src/tests/request_generator/CMakeLists.txt b/vbench/src/tests/request_generator/CMakeLists.txt
new file mode 100644
index 00000000000..a59029055d0
--- /dev/null
+++ b/vbench/src/tests/request_generator/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_request_generator_test_app
+    SOURCES
+    request_generator_test.cpp
+    DEPENDS
+    vbench_test
+    vbench
+)
+vespa_add_test(NAME vbench_request_generator_test_app COMMAND vbench_request_generator_test_app)
diff --git a/vbench/src/tests/request_generator/FILES b/vbench/src/tests/request_generator/FILES
new file mode 100644
index 00000000000..2afbcd6ec35
--- /dev/null
+++ b/vbench/src/tests/request_generator/FILES
@@ -0,0 +1,2 @@
+request_generator_test.cpp
+input.txt
diff --git a/vbench/src/tests/request_generator/input.txt b/vbench/src/tests/request_generator/input.txt
new file mode 100644
index 00000000000..259b0f7250f
--- /dev/null
+++ b/vbench/src/tests/request_generator/input.txt
@@ -0,0 +1 @@
+/this/is/url
diff --git a/vbench/src/tests/request_generator/request_generator_test.cpp b/vbench/src/tests/request_generator/request_generator_test.cpp
new file mode 100644
index 00000000000..52aca22954c
--- /dev/null
+++ b/vbench/src/tests/request_generator/request_generator_test.cpp
@@ -0,0 +1,27 @@
+// 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("generate request", RequestReceptor(), RequestGenerator("input.txt", f1)) {
+    f2.run();
+    ASSERT_TRUE(f1.request.get() != 0);
+    EXPECT_EQUAL("/this/is/url", f1.request->url());
+    EXPECT_FALSE(f2.tainted());
+}
+
+TEST_FF("input not found", RequestReceptor(), RequestGenerator("no_such_input.txt", f1)) {
+    f2.run();
+    EXPECT_TRUE(f1.request.get() == 0);
+    EXPECT_TRUE(f2.tainted());
+}
+
+TEST_FF("abort request generation", RequestReceptor(), RequestGenerator("input.txt", f1)) {
+    f2.abort();
+    f2.run();
+    EXPECT_TRUE(f1.request.get() == 0);
+    EXPECT_FALSE(f2.tainted());
+}
+
+TEST_MAIN() { TEST_RUN_ALL(); }