diff options
Diffstat (limited to 'document/src/tests')
-rw-r--r-- | document/src/tests/documentselectparsertest.cpp | 8 | ||||
-rw-r--r-- | document/src/tests/documenttestcase.cpp | 18 | ||||
-rw-r--r-- | document/src/tests/documentupdatetestcase.cpp | 4 | ||||
-rw-r--r-- | document/src/tests/fieldpathupdatetestcase.cpp | 12 | ||||
-rw-r--r-- | document/src/tests/fieldsettest.cpp | 3 | ||||
-rw-r--r-- | document/src/tests/struct_anno/struct_anno_test.cpp | 3 | ||||
-rw-r--r-- | document/src/tests/testdocmantest.cpp | 6 |
7 files changed, 45 insertions, 9 deletions
diff --git a/document/src/tests/documentselectparsertest.cpp b/document/src/tests/documentselectparsertest.cpp index c89cefeae29..f40aec41e16 100644 --- a/document/src/tests/documentselectparsertest.cpp +++ b/document/src/tests/documentselectparsertest.cpp @@ -4,6 +4,14 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/update/assignvalueupdate.h> #include <vespa/document/update/documentupdate.h> +#include <vespa/document/datatype/documenttype.h> +#include <vespa/document/fieldvalue/bytefieldvalue.h> +#include <vespa/document/fieldvalue/intfieldvalue.h> +#include <vespa/document/fieldvalue/longfieldvalue.h> +#include <vespa/document/fieldvalue/stringfieldvalue.h> +#include <vespa/document/fieldvalue/floatfieldvalue.h> +#include <vespa/document/fieldvalue/arrayfieldvalue.h> +#include <vespa/document/fieldvalue/weightedsetfieldvalue.h> #include <vespa/document/base/testdocman.h> #include <vespa/document/select/parser.h> #include <vespa/document/select/visitor.h> diff --git a/document/src/tests/documenttestcase.cpp b/document/src/tests/documenttestcase.cpp index aae4b5c6f40..82c1d62be59 100644 --- a/document/src/tests/documenttestcase.cpp +++ b/document/src/tests/documenttestcase.cpp @@ -1,8 +1,22 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/base/testdocman.h> -#include <vespa/document/datatype/annotationreferencedatatype.h> +#include <vespa/document/datatype/documenttype.h> +#include <vespa/document/datatype/mapdatatype.h> +#include <vespa/document/datatype/weightedsetdatatype.h> +#include <vespa/document/datatype/numericdatatype.h> #include <vespa/document/fieldvalue/iteratorhandler.h> +#include <vespa/document/fieldvalue/document.h> +#include <vespa/document/fieldvalue/bytefieldvalue.h> +#include <vespa/document/fieldvalue/intfieldvalue.h> +#include <vespa/document/fieldvalue/longfieldvalue.h> +#include <vespa/document/fieldvalue/floatfieldvalue.h> +#include <vespa/document/fieldvalue/doublefieldvalue.h> +#include <vespa/document/fieldvalue/stringfieldvalue.h> +#include <vespa/document/fieldvalue/rawfieldvalue.h> +#include <vespa/document/fieldvalue/arrayfieldvalue.h> +#include <vespa/document/fieldvalue/mapfieldvalue.h> +#include <vespa/document/fieldvalue/weightedsetfieldvalue.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/serialization/vespadocumentdeserializer.h> @@ -36,6 +50,8 @@ TEST(DocumentTest, testSizeOf) EXPECT_EQ(88ul, sizeof(IdString)); EXPECT_EQ(104ul, sizeof(DocumentId)); EXPECT_EQ(240ul, sizeof(Document)); + EXPECT_EQ(88ul, sizeof(NumericDataType)); + EXPECT_EQ(24ul, sizeof(LongFieldValue)); EXPECT_EQ(96ul, sizeof(StructFieldValue)); EXPECT_EQ(16ul, sizeof(StructuredFieldValue)); EXPECT_EQ(56ul, sizeof(SerializableArray)); diff --git a/document/src/tests/documentupdatetestcase.cpp b/document/src/tests/documentupdatetestcase.cpp index f505c2dd32d..8a9aef0bde4 100644 --- a/document/src/tests/documentupdatetestcase.cpp +++ b/document/src/tests/documentupdatetestcase.cpp @@ -3,7 +3,9 @@ #include <vespa/document/base/testdocman.h> #include <vespa/document/base/exceptions.h> #include <vespa/document/datatype/tensor_data_type.h> +#include <vespa/document/datatype/documenttype.h> #include <vespa/document/fieldvalue/fieldvalues.h> +#include <vespa/document/fieldvalue/tensorfieldvalue.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/serialization/vespadocumentserializer.h> @@ -28,8 +30,6 @@ #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/exception.h> #include <vespa/vespalib/util/exceptions.h> - -#include <fcntl.h> #include <fstream> #include <gtest/gtest.h> #include <unistd.h> diff --git a/document/src/tests/fieldpathupdatetestcase.cpp b/document/src/tests/fieldpathupdatetestcase.cpp index e4516ab6d70..cd4e03bbfe7 100644 --- a/document/src/tests/fieldpathupdatetestcase.cpp +++ b/document/src/tests/fieldpathupdatetestcase.cpp @@ -1,12 +1,20 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/base/testdocman.h> #include <vespa/document/fieldvalue/iteratorhandler.h> -#include <vespa/document/select/node.h> +#include <vespa/document/fieldvalue/intfieldvalue.h> +#include <vespa/document/fieldvalue/bytefieldvalue.h> +#include <vespa/document/fieldvalue/floatfieldvalue.h> +#include <vespa/document/fieldvalue/document.h> +#include <vespa/document/fieldvalue/arrayfieldvalue.h> +#include <vespa/document/fieldvalue/stringfieldvalue.h> +#include <vespa/document/fieldvalue/weightedsetfieldvalue.h> + #include <vespa/document/base/exceptions.h> -#include <vespa/vespalib/io/fileutil.h> #include <vespa/document/update/fieldpathupdates.h> #include <vespa/document/update/documentupdate.h> +#include <vespa/document/datatype/documenttype.h> +#include <vespa/document/datatype/mapdatatype.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> diff --git a/document/src/tests/fieldsettest.cpp b/document/src/tests/fieldsettest.cpp index 9f00fdd8c0d..4ce8e53ae3c 100644 --- a/document/src/tests/fieldsettest.cpp +++ b/document/src/tests/fieldsettest.cpp @@ -3,6 +3,9 @@ #include <vespa/document/base/testdocman.h> #include <vespa/document/fieldset/fieldsetrepo.h> #include <vespa/document/repo/documenttyperepo.h> +#include <vespa/document/fieldvalue/document.h> +#include <vespa/document/fieldvalue/intfieldvalue.h> +#include <vespa/document/fieldvalue/stringfieldvalue.h> #include <vespa/vespalib/objects/nbostream.h> #include <algorithm> #include <gtest/gtest.h> diff --git a/document/src/tests/struct_anno/struct_anno_test.cpp b/document/src/tests/struct_anno/struct_anno_test.cpp index 18e5fbc5565..57b643a1d27 100644 --- a/document/src/tests/struct_anno/struct_anno_test.cpp +++ b/document/src/tests/struct_anno/struct_anno_test.cpp @@ -4,7 +4,8 @@ #include <vespa/document/annotation/alternatespanlist.h> #include <vespa/document/annotation/annotation.h> #include <vespa/document/annotation/spantree.h> -#include <vespa/document/document.h> +#include <vespa/document/fieldvalue/document.h> +#include <vespa/document/fieldvalue/stringfieldvalue.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/testdocmantest.cpp b/document/src/tests/testdocmantest.cpp index 5aa2b65fb99..6d0a2686a74 100644 --- a/document/src/tests/testdocmantest.cpp +++ b/document/src/tests/testdocmantest.cpp @@ -2,10 +2,10 @@ /* $Id$*/ -#include <iostream> -#include <set> -#include <sstream> #include <vespa/document/base/testdocman.h> +#include <vespa/document/fieldvalue/document.h> +#include <vespa/document/fieldvalue/stringfieldvalue.h> + #include <gtest/gtest.h> namespace document { |