summaryrefslogtreecommitdiffstats
path: root/documentapi/src/tests
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-11-21 01:50:03 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2016-11-21 01:50:03 +0000
commitcfcea9110628b307999e900801e9067fb637efe8 (patch)
tree8946574979c549b55e74559d4ff4c30295e286c5 /documentapi/src/tests
parentfc1265f87b23f28fbacb15348c20719ba8a01024 (diff)
Missing includes
Diffstat (limited to 'documentapi/src/tests')
-rw-r--r--documentapi/src/tests/messagebus/messagebus_test.cpp4
-rw-r--r--documentapi/src/tests/messages/testbase.h1
-rw-r--r--documentapi/src/tests/policyfactory/policyfactory.cpp5
-rw-r--r--documentapi/src/tests/routablefactory/routablefactory.cpp4
4 files changed, 5 insertions, 9 deletions
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp
index caa2bb84d46..3c73c243379 100644
--- a/documentapi/src/tests/messagebus/messagebus_test.cpp
+++ b/documentapi/src/tests/messagebus/messagebus_test.cpp
@@ -4,13 +4,11 @@
#include <vespa/document/fieldvalue/document.h>
#include <vespa/document/repo/documenttyperepo.h>
#include <vespa/documentapi/documentapi.h>
-#include <vespa/log/log.h>
#include <vespa/messagebus/message.h>
#include <vespa/messagebus/routable.h>
#include <vespa/vdslib/state/clusterstate.h>
#include <vespa/vespalib/testkit/testapp.h>
-
-LOG_SETUP("messages_test");
+#include <vespa/documentapi/loadtypes/loadtypeset.h>
using document::DocumentTypeRepo;
using document::readDocumenttypesConfig;
diff --git a/documentapi/src/tests/messages/testbase.h b/documentapi/src/tests/messages/testbase.h
index 5ebe154cb94..6b802f30066 100644
--- a/documentapi/src/tests/messages/testbase.h
+++ b/documentapi/src/tests/messages/testbase.h
@@ -3,6 +3,7 @@
#include <vespa/document/repo/documenttyperepo.h>
#include <vespa/documentapi/messagebus/documentprotocol.h>
+#include <vespa/documentapi/loadtypes/loadtypeset.h>
#include <vespa/messagebus/routable.h>
#include <vespa/vespalib/component/version.h>
#include <vespa/vespalib/testkit/testapp.h>
diff --git a/documentapi/src/tests/policyfactory/policyfactory.cpp b/documentapi/src/tests/policyfactory/policyfactory.cpp
index 3caba70496b..25ce9f3d1c9 100644
--- a/documentapi/src/tests/policyfactory/policyfactory.cpp
+++ b/documentapi/src/tests/policyfactory/policyfactory.cpp
@@ -1,10 +1,9 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("policyfactory_test");
#include <vespa/document/repo/documenttyperepo.h>
#include <vespa/documentapi/messagebus/documentprotocol.h>
+#include <vespa/documentapi/loadtypes/loadtypeset.h>
#include <vespa/documentapi/messagebus/messages/removedocumentmessage.h>
#include <vespa/messagebus/testlib/receptor.h>
#include <vespa/messagebus/testlib/slobrok.h>
@@ -45,7 +44,7 @@ void
MyPolicy::merge(mbus::RoutingContext &ctx)
{
(void)ctx;
- LOG_ASSERT(false);
+ ASSERT_TRUE(false);
}
class MyFactory : public IRoutingPolicyFactory {
diff --git a/documentapi/src/tests/routablefactory/routablefactory.cpp b/documentapi/src/tests/routablefactory/routablefactory.cpp
index 5bd7ee48471..ba886f2f7d2 100644
--- a/documentapi/src/tests/routablefactory/routablefactory.cpp
+++ b/documentapi/src/tests/routablefactory/routablefactory.cpp
@@ -1,8 +1,5 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("routablefactory_test");
-
#include <vespa/document/repo/documenttyperepo.h>
#include <vespa/documentapi/messagebus/documentprotocol.h>
#include <vespa/documentapi/messagebus/routablefactories51.h>
@@ -10,6 +7,7 @@ LOG_SETUP("routablefactory_test");
#include <vespa/messagebus/testlib/slobrok.h>
#include <vespa/messagebus/testlib/testserver.h>
#include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/documentapi/loadtypes/loadtypeset.h>
using document::DocumentTypeRepo;
using namespace documentapi;