Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed Geo* tests

This commit is contained in:
Tobias Gödderz 2019-11-15 15:46:21 +01:00
parent f67e632657
commit 13e8a1d24c
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/Geo/GeoConstructorTest.cpp
View File

@ -34,6 +34,7 @@
#include "Aql/Functions.h"
#include "Aql/Query.h"
#include "Containers/SmallVector.h"
#include "Transaction/Context.h"
#include "Transaction/Methods.h"
#include <velocypack/Builder.h>
@ -57,12 +58,20 @@ class GeoConstructorTest : public ::testing::Test {
fakeit::Mock<transaction::Methods> trxMock;
transaction::Methods& trx;
fakeit::Mock<transaction::Context> contextMock;
transaction::Context& context;
SmallVector<AqlValue>::allocator_type::arena_type arena;
SmallVector<AqlValue> params;
GeoConstructorTest()
: expressionContext(expressionContextMock.get()), trx(trxMock.get()), params{arena} {}
: expressionContext(expressionContextMock.get()),
trx(trxMock.get()),
context(contextMock.get()),
params{arena} {
fakeit::When(Method(trxMock, transactionContextPtr)).AlwaysReturn(&context);
fakeit::When(Method(contextMock, getVPackOptions)).AlwaysReturn(&velocypack::Options::Defaults);
}
};
namespace geo_point {

18
tests/Geo/GeoFunctionsTest.cpp
View File

@ -34,6 +34,7 @@
#include "Aql/Functions.h"
#include "Aql/Query.h"
#include "Containers/SmallVector.h"
#include "Transaction/Context.h"
#include "Transaction/Methods.h"
#include <velocypack/Builder.h>
@ -64,16 +65,25 @@ protected:
fakeit::Mock<transaction::Methods> trxMock;
transaction::Methods& trx;
fakeit::Mock<transaction::Context> contextMock;
transaction::Context& context;
SmallVector<AqlValue>::allocator_type::arena_type arena;
SmallVector<AqlValue> paramsA;
SmallVector<AqlValue> paramsB;
SmallVector<AqlValue> paramsC;
GeoEqualsTest() : expressionContext(expressionContextMock.get()),
trx(trxMock.get()), paramsA{arena}, paramsB{arena}, paramsC{arena} {
GeoEqualsTest()
: expressionContext(expressionContextMock.get()),
trx(trxMock.get()),
context(contextMock.get()),
paramsA{arena},
paramsB{arena},
paramsC{arena} {
fakeit::When(Method(trxMock, transactionContextPtr)).AlwaysReturn(&context);
fakeit::When(Method(contextMock, getVPackOptions)).AlwaysReturn(&velocypack::Options::Defaults);
}
~GeoEqualsTest() {
clearVector(paramsA);
clearVector(paramsB);