diff options
Diffstat (limited to 'document')
24 files changed, 36 insertions, 39 deletions
diff --git a/document/src/tests/arrayfieldvaluetest.cpp b/document/src/tests/arrayfieldvaluetest.cpp index 11e74c648a2..c1b923de200 100644 --- a/document/src/tests/arrayfieldvaluetest.cpp +++ b/document/src/tests/arrayfieldvaluetest.cpp @@ -1,10 +1,10 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/fieldvalue/fieldvalues.h> +#include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/serialization/vespadocumentdeserializer.h> #include <vespa/vespalib/objects/nbostream.h> -#include <vespa/document/repo/documenttyperepo.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> #include <gmock/gmock.h> using vespalib::nbostream; diff --git a/document/src/tests/bucketselectortest.cpp b/document/src/tests/bucketselectortest.cpp index 3f478be8601..70f29be2f7c 100644 --- a/document/src/tests/bucketselectortest.cpp +++ b/document/src/tests/bucketselectortest.cpp @@ -5,10 +5,10 @@ #include <vespa/document/bucket/bucketid.h> #include <vespa/document/select/parser.h> #include <vespa/document/base/testdocrepo.h> +#include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/test/insertion_operators.h> #include <algorithm> #include <iostream> -#include <gtest/gtest.h> using document::select::Node; using document::select::Parser; diff --git a/document/src/tests/buckettest.cpp b/document/src/tests/buckettest.cpp index 6eb286c8b55..837bad81d3e 100644 --- a/document/src/tests/buckettest.cpp +++ b/document/src/tests/buckettest.cpp @@ -2,10 +2,10 @@ #include <vespa/document/bucket/bucketidfactory.h> #include <vespa/document/base/documentid.h> -#include <vespa/vespalib/util/random.h> #include <vespa/document/bucket/bucketspace.h> #include <vespa/document/bucket/bucket.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> +#include <vespa/vespalib/util/random.h> namespace document { diff --git a/document/src/tests/documentidtest.cpp b/document/src/tests/documentidtest.cpp index e5adcaf025f..b22e5e8f1f1 100644 --- a/document/src/tests/documentidtest.cpp +++ b/document/src/tests/documentidtest.cpp @@ -1,11 +1,11 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/document/bucket/bucketidfactory.h> #include <vespa/document/base/documentid.h> #include <vespa/vespalib/util/md5.h> #include <vespa/fastos/file.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> +#include <vespa/vespalib/testkit/test_path.h> namespace document { diff --git a/document/src/tests/documentselectparsertest.cpp b/document/src/tests/documentselectparsertest.cpp index 1cd94dd25f0..e2bbc026ba8 100644 --- a/document/src/tests/documentselectparsertest.cpp +++ b/document/src/tests/documentselectparsertest.cpp @@ -29,9 +29,9 @@ #include <vespa/document/select/operator.h> #include <vespa/document/select/parse_utils.h> #include <vespa/document/select/parser_limits.h> +#include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/util/exceptions.h> #include <limits> -#include <gtest/gtest.h> using namespace document::config_builder; diff --git a/document/src/tests/documenttestcase.cpp b/document/src/tests/documenttestcase.cpp index 8b434162424..799d4b07db1 100644 --- a/document/src/tests/documenttestcase.cpp +++ b/document/src/tests/documenttestcase.cpp @@ -22,14 +22,13 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/serialization/vespadocumentdeserializer.h> #include <vespa/document/serialization/vespadocumentserializer.h> -#include <vespa/vespalib/objects/nbostream.h> -#include <vespa/vespalib/util/growablebytebuffer.h> - -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/document/util/serializableexceptions.h> #include <vespa/document/util/bytebuffer.h> +#include <vespa/vespalib/gtest/gtest.h> +#include <vespa/vespalib/objects/nbostream.h> +#include <vespa/vespalib/testkit/test_path.h> +#include <vespa/vespalib/util/growablebytebuffer.h> #include <fcntl.h> -#include <gtest/gtest.h> #include <gmock/gmock.h> #include <filesystem> diff --git a/document/src/tests/documenttypetestcase.cpp b/document/src/tests/documenttypetestcase.cpp index 5e5cf07fc8b..e9d479825b6 100644 --- a/document/src/tests/documenttypetestcase.cpp +++ b/document/src/tests/documenttypetestcase.cpp @@ -4,8 +4,8 @@ #include <vespa/document/fieldvalue/fieldvalues.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> -#include <vespa/vespalib/testkit/test_kit.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> +#include <vespa/vespalib/testkit/test_path.h> #include <gmock/gmock.h> using document::config_builder::Struct; diff --git a/document/src/tests/documentupdatetestcase.cpp b/document/src/tests/documentupdatetestcase.cpp index fd2d168b15e..23b998d6800 100644 --- a/document/src/tests/documentupdatetestcase.cpp +++ b/document/src/tests/documentupdatetestcase.cpp @@ -31,11 +31,11 @@ #include <vespa/eval/eval/tensor_spec.h> #include <vespa/eval/eval/test/value_compare.h> #include <vespa/eval/eval/value.h> +#include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/exception.h> #include <vespa/vespalib/util/exceptions.h> #include <fstream> -#include <gtest/gtest.h> #include <unistd.h> using namespace document::config_builder; diff --git a/document/src/tests/feed_reject_helper_test.cpp b/document/src/tests/feed_reject_helper_test.cpp index cb7dd710eaf..23ae0ad486f 100644 --- a/document/src/tests/feed_reject_helper_test.cpp +++ b/document/src/tests/feed_reject_helper_test.cpp @@ -20,14 +20,12 @@ #include <vespa/document/update/addvalueupdate.h> #include <vespa/document/update/mapvalueupdate.h> #include <vespa/document/update/assignvalueupdate.h> - #include <vespa/document/update/tensor_remove_update.h> #include <vespa/document/update/tensor_modify_update.h> #include <vespa/document/update/tensor_add_update.h> #include <vespa/document/update/tensor_partial_update.h> #include <vespa/document/util/feed_reject_helper.h> - -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> #include <gmock/gmock.h> diff --git a/document/src/tests/fieldpathupdatetestcase.cpp b/document/src/tests/fieldpathupdatetestcase.cpp index 676a77fb84a..515fc8c4e6d 100644 --- a/document/src/tests/fieldpathupdatetestcase.cpp +++ b/document/src/tests/fieldpathupdatetestcase.cpp @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/test/fieldvalue_helpers.h> +#include <vespa/document/base/exceptions.h> #include <vespa/document/base/testdocman.h> #include <vespa/document/fieldvalue/iteratorhandler.h> #include <vespa/document/fieldvalue/intfieldvalue.h> @@ -11,7 +12,6 @@ #include <vespa/document/fieldvalue/stringfieldvalue.h> #include <vespa/document/fieldvalue/weightedsetfieldvalue.h> -#include <vespa/document/base/exceptions.h> #include <vespa/document/update/fieldpathupdates.h> #include <vespa/document/update/documentupdate.h> @@ -22,11 +22,11 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/util/bytebuffer.h> -#include <vespa/vespalib/testkit/testapp.h> #include <vespa/document/serialization/vespadocumentserializer.h> #include <vespa/vespalib/objects/nbostream.h> +#include <vespa/vespalib/gtest/gtest.h> +#include <vespa/vespalib/testkit/test_path.h> #include <fcntl.h> -#include <gtest/gtest.h> using vespalib::Identifiable; using vespalib::nbostream; diff --git a/document/src/tests/fieldsettest.cpp b/document/src/tests/fieldsettest.cpp index 895bd083d35..fb6d132d213 100644 --- a/document/src/tests/fieldsettest.cpp +++ b/document/src/tests/fieldsettest.cpp @@ -6,9 +6,9 @@ #include <vespa/document/fieldvalue/document.h> #include <vespa/document/fieldvalue/intfieldvalue.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> +#include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/objects/nbostream.h> #include <algorithm> -#include <gtest/gtest.h> using vespalib::nbostream; diff --git a/document/src/tests/fixed_bucket_spaces_test.cpp b/document/src/tests/fixed_bucket_spaces_test.cpp index 5b5d95416c9..a69eecfb715 100644 --- a/document/src/tests/fixed_bucket_spaces_test.cpp +++ b/document/src/tests/fixed_bucket_spaces_test.cpp @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/bucket/fixed_bucket_spaces.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> namespace document { diff --git a/document/src/tests/forcelinktest.cpp b/document/src/tests/forcelinktest.cpp index 41621dc81df..0944c1db8a3 100644 --- a/document/src/tests/forcelinktest.cpp +++ b/document/src/tests/forcelinktest.cpp @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/base/forcelink.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> namespace document { diff --git a/document/src/tests/gid_filter_test.cpp b/document/src/tests/gid_filter_test.cpp index 52acd6670d8..ba8a5e6d8b4 100644 --- a/document/src/tests/gid_filter_test.cpp +++ b/document/src/tests/gid_filter_test.cpp @@ -4,7 +4,7 @@ #include <vespa/document/select/parser.h> #include <vespa/document/base/documentid.h> #include <vespa/document/base/testdocrepo.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> namespace document::select { diff --git a/document/src/tests/globalidtest.cpp b/document/src/tests/globalidtest.cpp index 28176a279e2..fe11fd3e4a9 100644 --- a/document/src/tests/globalidtest.cpp +++ b/document/src/tests/globalidtest.cpp @@ -4,7 +4,7 @@ #include <vespa/document/base/globalid.h> #include <vespa/vespalib/util/random.h> #include <vespa/vespalib/stllike/asciistream.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> namespace document { diff --git a/document/src/tests/positiontypetest.cpp b/document/src/tests/positiontypetest.cpp index 7779decee00..4fded1cf114 100644 --- a/document/src/tests/positiontypetest.cpp +++ b/document/src/tests/positiontypetest.cpp @@ -1,6 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/datatype/positiondatatype.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> namespace document { diff --git a/document/src/tests/primitivefieldvaluetest.cpp b/document/src/tests/primitivefieldvaluetest.cpp index 9fcdf501d11..7affb190e26 100644 --- a/document/src/tests/primitivefieldvaluetest.cpp +++ b/document/src/tests/primitivefieldvaluetest.cpp @@ -1,11 +1,11 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/fieldvalue/fieldvalues.h> +#include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/serialization/vespadocumentdeserializer.h> +#include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/objects/nbostream.h> -#include <vespa/document/repo/documenttyperepo.h> #include <limits> -#include <gtest/gtest.h> using vespalib::nbostream; diff --git a/document/src/tests/stringtokenizertest.cpp b/document/src/tests/stringtokenizertest.cpp index 23ffc5d3871..8ca81e78f6e 100644 --- a/document/src/tests/stringtokenizertest.cpp +++ b/document/src/tests/stringtokenizertest.cpp @@ -3,8 +3,8 @@ #include <iostream> #include <set> #include <sstream> +#include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/text/stringtokenizer.h> -#include <gtest/gtest.h> using vespalib::StringTokenizer; using std::string; diff --git a/document/src/tests/structfieldvaluetest.cpp b/document/src/tests/structfieldvaluetest.cpp index 10b5b6ee4c2..99ee151c3c1 100644 --- a/document/src/tests/structfieldvaluetest.cpp +++ b/document/src/tests/structfieldvaluetest.cpp @@ -5,9 +5,9 @@ #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/serialization/vespadocumentdeserializer.h> -#include <vespa/vespalib/objects/nbostream.h> #include <vespa/document/util/bytebuffer.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> +#include <vespa/vespalib/objects/nbostream.h> #include <gmock/gmock.h> using vespalib::nbostream; diff --git a/document/src/tests/testbytebuffer.cpp b/document/src/tests/testbytebuffer.cpp index b5c858b9d56..34ae6aadfe7 100644 --- a/document/src/tests/testbytebuffer.cpp +++ b/document/src/tests/testbytebuffer.cpp @@ -4,9 +4,9 @@ #include <vespa/document/util/bytebuffer.h> #include <vespa/document/fieldvalue/serializablearray.h> #include <vespa/document/util/bufferexceptions.h> +#include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/util/macro.h> #include <vespa/vespalib/util/growablebytebuffer.h> -#include <gtest/gtest.h> using namespace document; diff --git a/document/src/tests/testdocmantest.cpp b/document/src/tests/testdocmantest.cpp index 147781f75ff..5691dbb4932 100644 --- a/document/src/tests/testdocmantest.cpp +++ b/document/src/tests/testdocmantest.cpp @@ -6,7 +6,7 @@ #include <vespa/document/fieldvalue/document.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> namespace document { diff --git a/document/src/tests/teststringutil.cpp b/document/src/tests/teststringutil.cpp index b855385ad76..71e02be080d 100644 --- a/document/src/tests/teststringutil.cpp +++ b/document/src/tests/teststringutil.cpp @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/util/stringutil.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> using namespace document; using vespalib::string; diff --git a/document/src/tests/testxml.cpp b/document/src/tests/testxml.cpp index db008574f0c..45b0b5bd993 100644 --- a/document/src/tests/testxml.cpp +++ b/document/src/tests/testxml.cpp @@ -10,8 +10,8 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/vespalib/text/stringtokenizer.h> #include <vespa/document/util/bytebuffer.h> -#include <vespa/vespalib/testkit/test_kit.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> +#include <vespa/vespalib/testkit/test_path.h> using vespalib::StringTokenizer; diff --git a/document/src/tests/weightedsetfieldvaluetest.cpp b/document/src/tests/weightedsetfieldvaluetest.cpp index 2bb19a04abb..65162edc8f5 100644 --- a/document/src/tests/weightedsetfieldvaluetest.cpp +++ b/document/src/tests/weightedsetfieldvaluetest.cpp @@ -10,7 +10,7 @@ #include <vespa/document/serialization/vespadocumentdeserializer.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/document/repo/documenttyperepo.h> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> #include <gmock/gmock.h> using vespalib::nbostream; |