diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-06-18 16:31:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-18 16:31:36 +0200 |
commit | 2594759347edb62f8a973e67c96e96b3f2ebc729 (patch) | |
tree | f1befb1ec17e377e5837e55ed2a4501af8b01689 | |
parent | 18999a8a48b80d304d1418a60c637e68bf66421e (diff) | |
parent | 60fa04ccb84ca0149f47cfe8ab8b4b852e261978 (diff) |
Merge pull request #31615 from vespa-engine/toregge/read-schema-unit-test-config-from-source-directory
Read schema unit test config from source directory.
-rw-r--r-- | searchlib/src/tests/searchcommon/schema/schema_test.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/searchlib/src/tests/searchcommon/schema/schema_test.cpp b/searchlib/src/tests/searchcommon/schema/schema_test.cpp index ad36454b6d7..6e33662a83e 100644 --- a/searchlib/src/tests/searchcommon/schema/schema_test.cpp +++ b/searchlib/src/tests/searchcommon/schema/schema_test.cpp @@ -3,6 +3,7 @@ #include <vespa/searchcommon/common/schema.h> #include <vespa/searchcommon/common/schemaconfigurer.h> #include <vespa/vespalib/gtest/gtest.h> +#include <vespa/vespalib/testkit/test_path.h> #include <vespa/vespalib/stllike/string.h> #include <fstream> @@ -18,6 +19,10 @@ using schema::CollectionType; using SIAF = Schema::ImportedAttributeField; using SIF = Schema::IndexField; +vespalib::string src_path(vespalib::stringref prefix, vespalib::stringref path) { + return prefix + TEST_PATH(path); +} + void assertField(const Schema::Field& exp, const Schema::Field& act) { @@ -144,7 +149,7 @@ TEST(SchemaTest, test_load_and_save) { // load from config -> save to file -> load from file Schema s; - SchemaConfigurer configurer(s, "dir:load-save-cfg"); + SchemaConfigurer configurer(s, src_path("dir:", "load-save-cfg")); EXPECT_EQ(3u, s.getNumIndexFields()); assertIndexField(SIF("a", SDT::STRING), s.getIndexField(0)); assertIndexField(SIF("b", SDT::INT64), s.getIndexField(1)); @@ -308,7 +313,7 @@ TEST(SchemaTest, require_that_imported_attribute_fields_are_not_saved_to_disk) TEST(SchemaTest, require_that_schema_can_be_built_with_imported_attribute_fields) { Schema s; - SchemaConfigurer configurer(s, "dir:imported-fields-cfg"); + SchemaConfigurer configurer(s, src_path("dir:", "imported-fields-cfg")); const auto &imported = s.getImportedAttributeFields(); ASSERT_EQ(2u, imported.size()); @@ -323,7 +328,7 @@ TEST(SchemaTest, require_that_schema_can_be_built_with_imported_attribute_fields TEST(SchemaTest, require_that_index_field_is_loaded_with_default_values_when_properties_are_not_set) { Schema s; - s.loadFromFile("schema-without-index-field-properties.txt"); + s.loadFromFile(TEST_PATH("schema-without-index-field-properties.txt")); const auto& index_fields = s.getIndexFields(); ASSERT_EQ(1, index_fields.size()); @@ -336,7 +341,7 @@ TEST(SchemaTest, require_that_index_field_is_loaded_with_default_values_when_pro TEST(SchemaTest, test_load_from_saved_schema_with_summary_fields) { - vespalib::string schema_name("old-schema-with-summary-fields.txt"); + vespalib::string schema_name(TEST_PATH("old-schema-with-summary-fields.txt")); Schema s; s.addIndexField(Schema::IndexField("ifoo", DataType::STRING)); s.addIndexField(Schema::IndexField("ibar", DataType::INT32)); |