diff options
11 files changed, 14 insertions, 52 deletions
diff --git a/document/src/tests/documenttypetestcase.cpp b/document/src/tests/documenttypetestcase.cpp index 21b9ce69576..4d5f9fd2dc0 100644 --- a/document/src/tests/documenttypetestcase.cpp +++ b/document/src/tests/documenttypetestcase.cpp @@ -1,9 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/document/config/config-documenttypes.h> +#include <vespa/document/base/testdocrepo.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/fieldvalue/fieldvalues.h> #include <vespa/document/repo/configbuilder.h> -#include <vespa/document/repo/documenttyperepo.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/exceptions.h> diff --git a/document/src/tests/repo/documenttyperepo_test.cpp b/document/src/tests/repo/documenttyperepo_test.cpp index 93e08e2667f..d0e0dcf9429 100644 --- a/document/src/tests/repo/documenttyperepo_test.cpp +++ b/document/src/tests/repo/documenttyperepo_test.cpp @@ -1,12 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for documenttyperepo. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("documenttyperepo_test"); - +#include <vespa/document/base/testdocrepo.h> #include <vespa/config/print/asciiconfigwriter.h> -#include <vespa/document/config/config-documenttypes.h> #include <vespa/document/datatype/annotationreferencedatatype.h> #include <vespa/document/datatype/arraydatatype.h> #include <vespa/document/datatype/documenttype.h> @@ -22,6 +18,7 @@ LOG_SETUP("documenttyperepo_test"); #include <set> #include <vespa/config/helper/configgetter.h> + using config::AsciiConfigWriter; using std::set; using std::vector; diff --git a/document/src/tests/serialization/annotationserializer_test.cpp b/document/src/tests/serialization/annotationserializer_test.cpp index 11a3dd08de6..ef44df57802 100644 --- a/document/src/tests/serialization/annotationserializer_test.cpp +++ b/document/src/tests/serialization/annotationserializer_test.cpp @@ -1,17 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for annotation serialization. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("annotationserializer_test"); - -#include <stdlib.h> +#include <vespa/document/base/testdocrepo.h> #include <vespa/document/annotation/alternatespanlist.h> #include <vespa/document/annotation/annotation.h> #include <vespa/document/annotation/span.h> #include <vespa/document/annotation/spanlist.h> #include <vespa/document/annotation/spantree.h> -#include <vespa/document/config/config-documenttypes.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> #include <vespa/document/repo/fixedtyperepo.h> #include <vespa/document/serialization/annotationdeserializer.h> diff --git a/document/src/tests/struct_anno/struct_anno_test.cpp b/document/src/tests/struct_anno/struct_anno_test.cpp index d87d513ab89..c38f7527cac 100644 --- a/document/src/tests/struct_anno/struct_anno_test.cpp +++ b/document/src/tests/struct_anno/struct_anno_test.cpp @@ -1,18 +1,10 @@ // 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("struct_anno_test"); -#include <stdlib.h> +#include <vespa/document/base/testdocrepo.h> #include <vespa/document/annotation/alternatespanlist.h> #include <vespa/document/annotation/annotation.h> -#include <vespa/document/annotation/span.h> -#include <vespa/document/annotation/spanlist.h> #include <vespa/document/annotation/spantree.h> -#include <vespa/document/config/config-documenttypes.h> #include <vespa/document/document.h> -#include <vespa/document/fieldvalue/stringfieldvalue.h> -#include <vespa/document/repo/fixedtyperepo.h> #include <vespa/document/serialization/annotationdeserializer.h> #include <vespa/document/serialization/annotationserializer.h> #include <vespa/document/serialization/vespadocumentdeserializer.h> diff --git a/document/src/tests/testxml.cpp b/document/src/tests/testxml.cpp index 2c513d5188b..da328c7a63f 100644 --- a/document/src/tests/testxml.cpp +++ b/document/src/tests/testxml.cpp @@ -2,15 +2,9 @@ /* $Id$*/ -#include <vespa/fastos/fastos.h> +#include <vespa/document/base/testdocrepo.h> #include <cppunit/extensions/HelperMacros.h> -#include <vespa/document/config/config-documenttypes.h> -#include <vespa/document/repo/documenttyperepo.h> -#include <iostream> -#include <set> -#include <sstream> #include <vespa/document/update/documentupdate.h> -#include <vespa/document/update/fieldupdate.h> #include <vespa/document/update/addvalueupdate.h> #include <vespa/document/update/assignvalueupdate.h> #include <vespa/document/update/removevalueupdate.h> diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp index 3c73c243379..92668de675a 100644 --- a/documentapi/src/tests/messagebus/messagebus_test.cpp +++ b/documentapi/src/tests/messagebus/messagebus_test.cpp @@ -1,11 +1,7 @@ // 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/document/config/config-documenttypes.h> +#include <vespa/document/base/testdocrepo.h> #include <vespa/document/fieldvalue/document.h> -#include <vespa/document/repo/documenttyperepo.h> #include <vespa/documentapi/documentapi.h> -#include <vespa/messagebus/message.h> -#include <vespa/messagebus/routable.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/documentapi/loadtypes/loadtypeset.h> diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp index 54d7a47e4b8..4177ba5a60e 100644 --- a/documentapi/src/tests/messages/testbase.cpp +++ b/documentapi/src/tests/messages/testbase.cpp @@ -1,8 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "testbase.h" -#include <vespa/document/config/config-documenttypes.h> -#include <vespa/document/repo/documenttyperepo.h> +#include <vespa/document/base/testdocrepo.h> #include <vespa/vespalib/util/exception.h> #include <vespa/log/log.h> LOG_SETUP(".testbase"); diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 4362a7a096e..3baad5b0562 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.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/document/config/config-documenttypes.h> +#include <vespa/document/base/testdocrepo.h> #include <vespa/document/datatype/datatype.h> #include <vespa/document/fieldvalue/document.h> #include <vespa/document/fieldvalue/longfieldvalue.h> -#include <vespa/document/repo/documenttyperepo.h> #include <vespa/documentapi/documentapi.h> #include <vespa/documentapi/messagebus/policies/andpolicy.h> #include <vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h> diff --git a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp index ba9ade78253..35307317d49 100644 --- a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp +++ b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp @@ -1,27 +1,23 @@ // 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/document/config/config-documenttypes.h> +#include <vespa/document/base/testdocrepo.h> #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/bytefieldvalue.h> -#include <vespa/document/fieldvalue/doublefieldvalue.h> #include <vespa/document/fieldvalue/floatfieldvalue.h> #include <vespa/document/fieldvalue/intfieldvalue.h> -#include <vespa/document/fieldvalue/longfieldvalue.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> #include <vespa/document/fieldvalue/weightedsetfieldvalue.h> -#include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/update/addvalueupdate.h> #include <vespa/document/update/assignvalueupdate.h> #include <vespa/document/update/clearvalueupdate.h> #include <vespa/document/update/documentupdate.h> #include <vespa/document/update/removevalueupdate.h> #include <vespa/document/update/mapvalueupdate.h> -#include <vespa/log/log.h> #include <vespa/searchcore/proton/common/attrupdate.h> #include <vespa/searchlib/attribute/attributefactory.h> #include <vespa/searchlib/attribute/attributevector.hpp> #include <vespa/vespalib/testkit/testapp.h> -#include <cmath> + +#include <vespa/log/log.h> LOG_SETUP("applyattrupdates_test"); diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp index 15e8cda23b4..5c5c5627feb 100644 --- a/storage/src/tests/storageserver/documentapiconvertertest.cpp +++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp @@ -1,11 +1,8 @@ // 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/document/base/testdocrepo.h> #include <cppunit/extensions/HelperMacros.h> -#include <vespa/document/config/config-documenttypes.h> -#include <vespa/document/datatype/datatype.h> #include <vespa/document/fieldvalue/document.h> -#include <vespa/document/repo/documenttyperepo.h> #include <vespa/documentapi/documentapi.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/storage/storageserver/documentapiconverter.h> @@ -13,8 +10,6 @@ #include <vespa/storageapi/message/datagram.h> #include <vespa/storageapi/message/multioperation.h> #include <vespa/storageapi/message/persistence.h> -#include <vespa/storageapi/message/visitor.h> -#include <vespa/vdslib/container/writabledocumentlist.h> #include <vespa/vespalib/testkit/test_kit.h> using document::DataType; diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp index 5d8e1e15ef9..704066ce964 100644 --- a/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp @@ -1,5 +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/document/base/testdocrepo.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/query/tree/querybuilder.h> #include <vespa/searchlib/query/tree/simplequery.h> |