diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-06 18:41:45 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:46 +0100 |
commit | 7bad6a0259af674ffc11ff63bf5decb1be632153 (patch) | |
tree | 9f72e04e9b2b5b591daece614d0fb923e9e35fa5 /document | |
parent | 738913b64e69db175491dece5ccab5c3199e69f9 (diff) |
Add correct include.
Diffstat (limited to 'document')
-rw-r--r-- | document/src/tests/documenttypetestcase.cpp | 3 | ||||
-rw-r--r-- | document/src/tests/repo/documenttyperepo_test.cpp | 7 | ||||
-rw-r--r-- | document/src/tests/serialization/annotationserializer_test.cpp | 7 | ||||
-rw-r--r-- | document/src/tests/struct_anno/struct_anno_test.cpp | 10 | ||||
-rw-r--r-- | document/src/tests/testxml.cpp | 8 |
5 files changed, 6 insertions, 29 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> |