diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-06 12:12:53 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-06 12:12:53 +0000 |
commit | 71c1bdadc65dab0590aaf44e740f6e3cdc87195e (patch) | |
tree | b4eb9c0051ea1678bfa0e943d5894bbe0222bc2c /searchcore | |
parent | d2a15fedd93ee1fa30e2a7ef769f3378675d3be3 (diff) |
Deinline test code.
Diffstat (limited to 'searchcore')
6 files changed, 9 insertions, 12 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt index 49de56a8ecc..75ab705daac 100644 --- a/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt @@ -10,5 +10,6 @@ vespa_add_executable(searchcore_attribute_manager_test_app TEST searchcore_initializer searchcore_flushengine searchcore_pcommon + searchcore_test ) vespa_add_test(NAME searchcore_attribute_manager_test_app COMMAND searchcore_attribute_manager_test_app) diff --git a/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt index 62a59bc04c2..8b53b4e093f 100644 --- a/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt @@ -5,5 +5,6 @@ vespa_add_executable(searchcore_attributes_state_explorer_test_app TEST DEPENDS searchcore_attribute searchcore_pcommon + searchcore_test ) vespa_add_test(NAME searchcore_attributes_state_explorer_test_app COMMAND searchcore_attributes_state_explorer_test_app) diff --git a/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp b/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp index 99cc777196b..da5a8b31671 100644 --- a/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp +++ b/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp @@ -5,6 +5,7 @@ #include <vespa/searchcore/proton/attribute/attributemanager.h> #include <vespa/searchcore/proton/common/hw_info.h> #include <vespa/searchcore/proton/test/attribute_vectors.h> +#include <vespa/searchcore/proton/test/attribute_utils.h> #include <vespa/searchlib/common/foregroundtaskexecutor.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/test/directory_handler.h> diff --git a/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt index 77a0ca98e0d..ad5ae54f6e1 100644 --- a/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(searchcore_test STATIC SOURCES + attribute_vectors.cpp bucketfactory.cpp buckethandler.cpp clusterstatehandler.cpp diff --git a/searchcore/src/vespa/searchcore/proton/test/attribute_vectors.cpp b/searchcore/src/vespa/searchcore/proton/test/attribute_vectors.cpp index 280ef358d26..f2b974a34ef 100644 --- a/searchcore/src/vespa/searchcore/proton/test/attribute_vectors.cpp +++ b/searchcore/src/vespa/searchcore/proton/test/attribute_vectors.cpp @@ -1,15 +1,12 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma once +// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "attribute_vectors.h" #include "attribute_utils.h" -#include <vespa/searchlib/attribute/integerbase.h> #include <vespa/searchlib/attribute/singlenumericattribute.hpp> namespace proton::test { -using Int32Attribute = search::SingleValueNumericAttribute<search::IntegerAttributeTemplate<int32_t> >; - -inline std::unique_ptr<Int32Attribute> +std::unique_ptr<Int32Attribute> createInt32Attribute(const vespalib::string &name) { return std::make_unique<Int32Attribute>(name, AttributeUtils::getInt32Config()); } diff --git a/searchcore/src/vespa/searchcore/proton/test/attribute_vectors.h b/searchcore/src/vespa/searchcore/proton/test/attribute_vectors.h index 280ef358d26..f56cfd84ff4 100644 --- a/searchcore/src/vespa/searchcore/proton/test/attribute_vectors.h +++ b/searchcore/src/vespa/searchcore/proton/test/attribute_vectors.h @@ -1,17 +1,13 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include "attribute_utils.h" #include <vespa/searchlib/attribute/integerbase.h> -#include <vespa/searchlib/attribute/singlenumericattribute.hpp> +#include <vespa/searchlib/attribute/singlenumericattribute.h> namespace proton::test { using Int32Attribute = search::SingleValueNumericAttribute<search::IntegerAttributeTemplate<int32_t> >; -inline std::unique_ptr<Int32Attribute> -createInt32Attribute(const vespalib::string &name) { - return std::make_unique<Int32Attribute>(name, AttributeUtils::getInt32Config()); -} +std::unique_ptr<Int32Attribute> createInt32Attribute(const vespalib::string &name); } |