diff options
author | Arnstein Ressem <aressem@gmail.com> | 2016-11-02 23:26:40 +0100 |
---|---|---|
committer | Arnstein Ressem <aressem@gmail.com> | 2016-11-02 23:26:40 +0100 |
commit | 99480b4d72abf3688060d7643816680a30963f74 (patch) | |
tree | 966d8494bca9292e6be2877d91ed838953856f0f /vbench | |
parent | 3d18773cf5357250cb2d35d6e8c13477db6e20a3 (diff) |
Removed TestApp::GetSourceDirectory
Diffstat (limited to 'vbench')
3 files changed, 8 insertions, 8 deletions
diff --git a/vbench/src/tests/input_file_reader/input_file_reader_test.cpp b/vbench/src/tests/input_file_reader/input_file_reader_test.cpp index bb39dcceafd..2b8a2741e10 100644 --- a/vbench/src/tests/input_file_reader/input_file_reader_test.cpp +++ b/vbench/src/tests/input_file_reader/input_file_reader_test.cpp @@ -1,5 +1,5 @@ // 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 <vespa/vespalib/testkit/test_kit.h> #include <vbench/test/all.h> using namespace vbench; @@ -10,7 +10,7 @@ TEST("input file reader") { EXPECT_TRUE(reader.tainted()); } { - InputFileReader reader(vespalib::TestApp::GetSourceDirectory() + "simple_test_input.txt"); + InputFileReader reader(TEST_PATH("simple_test_input.txt")); EXPECT_TRUE(!reader.tainted()); string line; EXPECT_TRUE(reader.readLine(line)); @@ -23,7 +23,7 @@ TEST("input file reader") { TEST_FLUSH(); } { - InputFileReader reader(vespalib::TestApp::GetSourceDirectory() + "hard_test_input.txt"); + InputFileReader reader(TEST_PATH("hard_test_input.txt")); EXPECT_TRUE(!reader.tainted()); string line; EXPECT_TRUE(reader.readLine(line)); diff --git a/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp b/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp index facd70b20ce..639b91bf66b 100644 --- a/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp +++ b/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp @@ -1,5 +1,5 @@ // 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 <vespa/vespalib/testkit/test_kit.h> #include <vbench/test/all.h> using namespace vbench; @@ -10,7 +10,7 @@ TEST("mapped file input") { EXPECT_TRUE(file.tainted()); } { - MappedFileInput file(vespalib::TestApp::GetSourceDirectory() + "file.txt"); + MappedFileInput file(TEST_PATH("file.txt")); EXPECT_TRUE(!file.tainted()); LineReader reader(file, 3); string line; diff --git a/vbench/src/tests/request_generator/request_generator_test.cpp b/vbench/src/tests/request_generator/request_generator_test.cpp index bdaf3fee75e..de5b8a61164 100644 --- a/vbench/src/tests/request_generator/request_generator_test.cpp +++ b/vbench/src/tests/request_generator/request_generator_test.cpp @@ -1,10 +1,10 @@ // 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 <vespa/vespalib/testkit/test_kit.h> #include <vbench/test/all.h> using namespace vbench; -TEST_FF("generate request", RequestReceptor(), RequestGenerator(vespalib::TestApp::GetSourceDirectory() + "input.txt", f1)) { +TEST_FF("generate request", RequestReceptor(), RequestGenerator(TEST_PATH("input.txt"), f1)) { f2.run(); ASSERT_TRUE(f1.request.get() != 0); EXPECT_EQUAL("/this/is/url", f1.request->url()); @@ -17,7 +17,7 @@ TEST_FF("input not found", RequestReceptor(), RequestGenerator("no_such_input.tx EXPECT_TRUE(f2.tainted()); } -TEST_FF("abort request generation", RequestReceptor(), RequestGenerator(vespalib::TestApp::GetSourceDirectory() + "input.txt", f1)) { +TEST_FF("abort request generation", RequestReceptor(), RequestGenerator(TEST_PATH("input.txt"), f1)) { f2.abort(); f2.run(); EXPECT_TRUE(f1.request.get() == 0); |