mirror of https://gitee.com/bigwinds/arangodb
Fixed now missing include in test files
This commit is contained in:
Michael Hackstein
parent
d1116c1c72
commit
ca30314c78
|
|
@ -24,17 +24,21 @@
|
|||
#ifndef TESTS_IRESEARCH__COMMON_H
|
||||
#define TESTS_IRESEARCH__COMMON_H 1
|
||||
|
||||
#include "Aql/Query.h"
|
||||
#include "Aql/AstNode.h"
|
||||
#include "VocBase/vocbase.h"
|
||||
#include "Aql/Query.h"
|
||||
#include "Basics/StaticStrings.h"
|
||||
#include "VocBase/VocbaseInfo.h"
|
||||
#include "VocBase/vocbase.h"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#undef NO_INLINE // to avoid GCC warning
|
||||
#include <search/filter.hpp>
|
||||
|
||||
#include <velocypack/Builder.h>
|
||||
#include <velocypack/Slice.h>
|
||||
#include <velocypack/velocypack-aliases.h>
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief a TRI_vocbase_t that will call shutdown() on deallocation
|
||||
|
|
@ -66,7 +70,6 @@ namespace tests {
|
|||
|
||||
extern std::string const AnalyzerCollectionName;
|
||||
|
||||
|
||||
extern std::string testResourceDir;
|
||||
|
||||
void init(bool withICU = false);
|
||||
|
|
@ -84,46 +87,41 @@ void v8Init();
|
|||
|
||||
v8::Isolate* v8Isolate();
|
||||
|
||||
bool assertRules(
|
||||
TRI_vocbase_t& vocbase,
|
||||
std::string const& queryString,
|
||||
bool assertRules(TRI_vocbase_t& vocbase, std::string const& queryString,
|
||||
std::vector<int> expectedRulesIds,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr,
|
||||
std::string const& optionsString = "{}"
|
||||
);
|
||||
std::string const& optionsString = "{}");
|
||||
|
||||
arangodb::aql::QueryResult executeQuery(
|
||||
TRI_vocbase_t& vocbase,
|
||||
std::string const& queryString,
|
||||
TRI_vocbase_t& vocbase, std::string const& queryString,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr,
|
||||
std::string const& optionsString = "{}"
|
||||
);
|
||||
std::string const& optionsString = "{}");
|
||||
|
||||
std::unique_ptr<arangodb::aql::ExecutionPlan> planFromQuery(
|
||||
TRI_vocbase_t& vocbase,
|
||||
std::string const& queryString,
|
||||
TRI_vocbase_t& vocbase, std::string const& queryString,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr,
|
||||
std::string const& optionsString = "{}"
|
||||
);
|
||||
std::string const& optionsString = "{}");
|
||||
|
||||
std::unique_ptr<arangodb::aql::Query> prepareQuery(
|
||||
TRI_vocbase_t& vocbase,
|
||||
std::string const& queryString,
|
||||
TRI_vocbase_t& vocbase, std::string const& queryString,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr,
|
||||
std::string const& optionsString = "{}"
|
||||
);
|
||||
std::string const& optionsString = "{}");
|
||||
|
||||
uint64_t getCurrentPlanVersion();
|
||||
|
||||
void setDatabasePath(arangodb::DatabasePathFeature& feature);
|
||||
|
||||
#define EXPECT_EQUAL_SLICES_STRINGIFY(x) #x
|
||||
#define EXPECT_EQUAL_SLICES_EXPANDER(leftSlice, rightSlice, file, line) arangodb::tests::expectEqualSlices_(leftSlice, rightSlice, file ":" EXPECT_EQUAL_SLICES_STRINGIFY(line))
|
||||
#define EXPECT_EQUAL_SLICES(leftSlice, rightSlice) EXPECT_EQUAL_SLICES_EXPANDER(leftSlice, rightSlice, __FILE__, __LINE__)
|
||||
void expectEqualSlices_(const velocypack::Slice& lhs, const velocypack::Slice& rhs, const char* where);
|
||||
#define EXPECT_EQUAL_SLICES_EXPANDER(leftSlice, rightSlice, file, line) \
|
||||
arangodb::tests::expectEqualSlices_(leftSlice, rightSlice, \
|
||||
file ":" EXPECT_EQUAL_SLICES_STRINGIFY(line))
|
||||
#define EXPECT_EQUAL_SLICES(leftSlice, rightSlice) \
|
||||
EXPECT_EQUAL_SLICES_EXPANDER(leftSlice, rightSlice, __FILE__, __LINE__)
|
||||
void expectEqualSlices_(const velocypack::Slice& lhs,
|
||||
const velocypack::Slice& rhs, const char* where);
|
||||
|
||||
}
|
||||
}
|
||||
} // namespace tests
|
||||
} // namespace arangodb
|
||||
|
||||
std::string mangleType(std::string name);
|
||||
std::string mangleAnalyzer(std::string name);
|
||||
|
|
@ -142,61 +140,40 @@ inline arangodb::aql::AstNode* wrappedExpressionExtractor(arangodb::aql::AstNode
|
|||
}
|
||||
|
||||
void assertExpressionFilter(
|
||||
std::string const& queryString,
|
||||
irs::boost_t boost = irs::no_boost(),
|
||||
std::string const& queryString, irs::boost_t boost = irs::no_boost(),
|
||||
std::function<arangodb::aql::AstNode*(arangodb::aql::AstNode*)> const& expressionExtractor = &defaultExpressionExtractor,
|
||||
std::string const& refName = "d"
|
||||
);
|
||||
std::string const& refName = "d");
|
||||
|
||||
void assertFilterBoost(
|
||||
irs::filter const& expected,
|
||||
irs::filter const& actual
|
||||
);
|
||||
void assertFilterBoost(irs::filter const& expected, irs::filter const& actual);
|
||||
|
||||
void assertFilterOptimized(
|
||||
TRI_vocbase_t& vocbase,
|
||||
std::string const& queryString,
|
||||
void assertFilterOptimized(TRI_vocbase_t& vocbase, std::string const& queryString,
|
||||
irs::filter const& expectedFilter,
|
||||
arangodb::aql::ExpressionContext* exprCtx = nullptr,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr
|
||||
);
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr);
|
||||
|
||||
void assertFilter(
|
||||
bool parseOk,
|
||||
bool execOk,
|
||||
std::string const& queryString,
|
||||
void assertFilter(bool parseOk, bool execOk, std::string const& queryString,
|
||||
irs::filter const& expected,
|
||||
arangodb::aql::ExpressionContext* exprCtx = nullptr,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr,
|
||||
std::string const& refName = "d"
|
||||
);
|
||||
std::string const& refName = "d");
|
||||
|
||||
void assertFilterSuccess(
|
||||
std::string const& queryString,
|
||||
irs::filter const& expected,
|
||||
void assertFilterSuccess(std::string const& queryString, irs::filter const& expected,
|
||||
arangodb::aql::ExpressionContext* exprCtx = nullptr,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr,
|
||||
std::string const& refName = "d"
|
||||
);
|
||||
std::string const& refName = "d");
|
||||
|
||||
void assertFilterFail(
|
||||
std::string const& queryString,
|
||||
void assertFilterFail(std::string const& queryString,
|
||||
arangodb::aql::ExpressionContext* exprCtx = nullptr,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr,
|
||||
std::string const& refName = "d"
|
||||
);
|
||||
std::string const& refName = "d");
|
||||
|
||||
void assertFilterExecutionFail(
|
||||
std::string const& queryString,
|
||||
void assertFilterExecutionFail(std::string const& queryString,
|
||||
arangodb::aql::ExpressionContext* exprCtx = nullptr,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr,
|
||||
std::string const& refName = "d"
|
||||
);
|
||||
std::string const& refName = "d");
|
||||
|
||||
void assertFilterParseFail(
|
||||
std::string const& queryString,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr
|
||||
);
|
||||
void assertFilterParseFail(std::string const& queryString,
|
||||
std::shared_ptr<arangodb::velocypack::Builder> bindVars = nullptr);
|
||||
|
||||
inline VPackBuilder dbArgsBuilder(std::string const& name = "_system") {
|
||||
VPackBuilder builder;
|
||||
|
|
@ -208,9 +185,13 @@ inline VPackBuilder dbArgsBuilder(std::string const& name = "_system") {
|
|||
return builder;
|
||||
};
|
||||
|
||||
arangodb::CreateDatabaseInfo createInfo(std::string const& name, uint64_t id, bool allowSystemDB = false);
|
||||
arangodb::CreateDatabaseInfo systemDBInfo(std::string const& name = arangodb::StaticStrings::SystemDatabase, uint64_t id = 1);
|
||||
arangodb::CreateDatabaseInfo testDBInfo(std::string const& name = "testVocbase", uint64_t id = 2);
|
||||
arangodb::CreateDatabaseInfo unknownDBInfo(std::string const& name = "unknownVocbase", uint64_t id = 3);
|
||||
arangodb::CreateDatabaseInfo createInfo(std::string const& name, uint64_t id,
|
||||
bool allowSystemDB = false);
|
||||
arangodb::CreateDatabaseInfo systemDBInfo(std::string const& name = arangodb::StaticStrings::SystemDatabase,
|
||||
uint64_t id = 1);
|
||||
arangodb::CreateDatabaseInfo testDBInfo(std::string const& name = "testVocbase",
|
||||
uint64_t id = 2);
|
||||
arangodb::CreateDatabaseInfo unknownDBInfo(
|
||||
std::string const& name = "unknownVocbase", uint64_t id = 3);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue