diff options
| author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2016-11-04 13:05:08 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2016-11-04 13:05:08 +0000 |
| commit | 28d80634f49ca5fc9d4f7df15c357ee2a9b34b87 (patch) | |
| tree | 34f035879d7b649655ff0ee209f19aa359bb413e /searchcore/src/tests/proton/reprocessing | |
| parent | 8e97d41a730d82e89a39d46f939e5ad976349deb (diff) | |
Move HwInfo from vespalib to searchcore and simplify code.
Diffstat (limited to 'searchcore/src/tests/proton/reprocessing')
| -rw-r--r-- | searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp index ebd5107f0a5..44eb1353637 100644 --- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp +++ b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp @@ -13,7 +13,7 @@ LOG_SETUP("attribute_reprocessing_initializer_test"); #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/vespalib/util/mock_hw_info.h> +#include <vespa/searchcore/proton/common/hw_info.h> #include <vespa/searchlib/common/foregroundtaskexecutor.h> using namespace proton; @@ -53,14 +53,14 @@ struct MyConfig { DummyFileHeaderContext _fileHeaderContext; ForegroundTaskExecutor _attributeFieldWriter; - std::shared_ptr<vespalib::IHwInfo> _hwInfo; + HwInfo _hwInfo; AttributeManager::SP _mgr; search::index::Schema _schema; MyDocTypeInspector::SP _inspector; MyConfig() : _fileHeaderContext(), _attributeFieldWriter(), - _hwInfo(std::make_shared<vespalib::MockHwInfo>()), + _hwInfo(), _mgr(new AttributeManager(TEST_DIR, "test.subdb", TuneFileAttributes(), _fileHeaderContext, _attributeFieldWriter, _hwInfo)), @@ -97,7 +97,7 @@ struct Fixture test::DirectoryHandler _dirHandler; DummyFileHeaderContext _fileHeaderContext; ForegroundTaskExecutor _attributeFieldWriter; - std::shared_ptr<vespalib::IHwInfo> _hwInfo; + HwInfo _hwInfo; AttributeManager::SP _mgr; MyConfig _oldCfg; MyConfig _newCfg; @@ -107,7 +107,7 @@ struct Fixture : _dirHandler(TEST_DIR), _fileHeaderContext(), _attributeFieldWriter(), - _hwInfo(std::make_shared<vespalib::MockHwInfo>()), + _hwInfo(), _mgr(new AttributeManager(TEST_DIR, "test.subdb", TuneFileAttributes(), _fileHeaderContext, _attributeFieldWriter, _hwInfo)), |