summaryrefslogtreecommitdiffstats
path: root/documentapi
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2019-03-04 08:49:39 +0000
committerGeir Storli <geirst@verizonmedia.com>2019-03-04 08:49:39 +0000
commit42929e19c9c482f208ad3c97f47064024e190336 (patch)
treef57996ba5ff81820d73c005c0367fb4f4802f4cc /documentapi
parent1e0ae2265c676e0dcf8ecc08102579379f3ccd85 (diff)
Don't use gmock for now as it triggers valgrind.
Diffstat (limited to 'documentapi')
-rw-r--r--documentapi/src/tests/loadtypes/CMakeLists.txt1
-rw-r--r--documentapi/src/tests/loadtypes/loadtypetest.cpp5
2 files changed, 1 insertions, 5 deletions
diff --git a/documentapi/src/tests/loadtypes/CMakeLists.txt b/documentapi/src/tests/loadtypes/CMakeLists.txt
index 39ee6816c5e..495c05c0e43 100644
--- a/documentapi/src/tests/loadtypes/CMakeLists.txt
+++ b/documentapi/src/tests/loadtypes/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_add_executable(documentapi_loadtype_test_app TEST
DEPENDS
documentapi
vdstestlib
- gmock
gtest
)
vespa_add_test(NAME documentapi_loadtype_test_app COMMAND documentapi_loadtype_test_app)
diff --git a/documentapi/src/tests/loadtypes/loadtypetest.cpp b/documentapi/src/tests/loadtypes/loadtypetest.cpp
index 20efb281300..178b9f9227b 100644
--- a/documentapi/src/tests/loadtypes/loadtypetest.cpp
+++ b/documentapi/src/tests/loadtypes/loadtypetest.cpp
@@ -4,9 +4,6 @@
#include <vespa/config/config.h>
#include <vespa/config/common/exceptions.h>
#include <vespa/vespalib/gtest/gtest.h>
-#include <gmock/gmock.h>
-
-using namespace ::testing;
namespace documentapi {
@@ -17,7 +14,7 @@ assertConfigFailure(const vespalib::string &configId, const vespalib::string &ex
LoadTypeSet createdFromConfigId(configId);
FAIL() << "Config was expected to fail with error: " << expError;
} catch (config::InvalidConfigException &e) {
- EXPECT_THAT(e.getMessage(), HasSubstr(expError));
+ EXPECT_TRUE(e.getMessage().find(expError) != std::string::npos);
}
}