From b92e5eb946015c051e2f40b0f34507b1023a2ad6 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Wed, 3 Jul 2019 15:56:14 +0200 Subject: [PATCH] fix tests that didn't properly use env variable to look for test resource files --- tests/IResearch/IResearchComparer-test.cpp | 8 ++++++-- tests/IResearch/IResearchViewSorted-test.cpp | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/IResearch/IResearchComparer-test.cpp b/tests/IResearch/IResearchComparer-test.cpp index 48f3fd33ebff..b9a5adfc82b2 100644 --- a/tests/IResearch/IResearchComparer-test.cpp +++ b/tests/IResearch/IResearchComparer-test.cpp @@ -32,8 +32,10 @@ #include "velocypack/Iterator.h" TEST(IResearchComparerTest, test_comparer_single_entry) { + arangodb::tests::init(true); + irs::utf8_path resource; - resource /= irs::string_ref(IResearch_test_resource_dir); + resource /= irs::string_ref(arangodb::tests::testResourceDir); resource /= irs::string_ref("simple_sequential.json"); auto builder = arangodb::basics::VelocyPackHelper::velocyPackFromFile(resource.utf8()); @@ -75,8 +77,10 @@ TEST(IResearchComparerTest, test_comparer_single_entry) { } TEST(IResearchComparerTest, test_comparer_multiple_entries) { + arangodb::tests::init(true); + irs::utf8_path resource; - resource /= irs::string_ref(IResearch_test_resource_dir); + resource /= irs::string_ref(arangodb::tests::testResourceDir); resource /= irs::string_ref("simple_sequential.json"); auto builder = arangodb::basics::VelocyPackHelper::velocyPackFromFile(resource.utf8()); diff --git a/tests/IResearch/IResearchViewSorted-test.cpp b/tests/IResearch/IResearchViewSorted-test.cpp index a3f535aa60b1..381df274ecc1 100644 --- a/tests/IResearch/IResearchViewSorted-test.cpp +++ b/tests/IResearch/IResearchViewSorted-test.cpp @@ -294,7 +294,7 @@ TEST_F(IResearchViewSortedTest, SingleField) { // insert into collections { irs::utf8_path resource; - resource /= irs::string_ref(IResearch_test_resource_dir); + resource /= irs::string_ref(arangodb::tests::testResourceDir); resource /= irs::string_ref("simple_sequential.json"); auto builder = @@ -583,7 +583,7 @@ TEST_F(IResearchViewSortedTest, MultipleFields) { // insert into collections { irs::utf8_path resource; - resource /= irs::string_ref(IResearch_test_resource_dir); + resource /= irs::string_ref(arangodb::tests::testResourceDir); resource /= irs::string_ref("simple_sequential.json"); auto builder =