Rename applyattrupdates -> attribute_updater_test and move it to correct place.

8 files changed, 16 insertions, 16 deletions

diff --git a/searchcore/CMakeLists.txt b/searchcore/CMakeLists.txt
index d5d5544b88c..593834d4f9a 100644
--- a/searchcore/CMakeLists.txt
+++ b/searchcore/CMakeLists.txt
@@ -56,7 +56,6 @@ vespa_define_module(
     src/apps/vespa-transactionlog-inspect
 
     TESTS
-    src/tests/applyattrupdates
     src/tests/fdispatch/randomrow
     src/tests/fdispatch/fnet_search
     src/tests/grouping
@@ -75,6 +74,7 @@ vespa_define_module(
     src/tests/proton/attribute/imported_attributes_repo
     src/tests/proton/bucketdb/bucketdb
     src/tests/proton/common
+    src/tests/proton/common/attribute_updater
     src/tests/proton/common/document_type_inspector
     src/tests/proton/common/hw_info_sampler
     src/tests/proton/common/state_reporter_utils
diff --git a/searchcore/src/testlist.txt b/searchcore/src/testlist.txt
index f11d8d5c329..a846f2015be 100644
--- a/searchcore/src/testlist.txt
+++ b/searchcore/src/testlist.txt
@@ -1,5 +1,4 @@
 ?tests/proton/proton
-tests/applyattrupdates
 tests/fdispatch/randomrow
 tests/fdispatch/fnet_search
 tests/grouping
@@ -11,6 +10,7 @@ tests/proton/attribute/attributes_state_explorer
 tests/proton/attribute/document_field_populator
 tests/proton/bucketdb/bucketdb
 tests/proton/common
+tests/proton/common/attribute_updater
 tests/proton/common/document_type_inspector
 tests/proton/common/state_reporter_utils
 tests/proton/config
diff --git a/searchcore/src/tests/applyattrupdates/.gitignore b/searchcore/src/tests/applyattrupdates/.gitignore
deleted file mode 100644
index b7789427c09..00000000000
--- a/searchcore/src/tests/applyattrupdates/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.depend
-Makefile
-applyattrupdates_test
-searchcore_applyattrupdates_test_app
diff --git a/searchcore/src/tests/applyattrupdates/CMakeLists.txt b/searchcore/src/tests/applyattrupdates/CMakeLists.txt
deleted file mode 100644
index 0957f01b67d..00000000000
--- a/searchcore/src/tests/applyattrupdates/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchcore_applyattrupdates_test_app TEST
-    SOURCES
-    applyattrupdates.cpp
-    DEPENDS
-    searchcore_pcommon
-    searchcore_util
-)
-vespa_add_test(NAME searchcore_applyattrupdates_test_app COMMAND searchcore_applyattrupdates_test_app)
diff --git a/searchcore/src/tests/proton/common/attribute_updater/.gitignore b/searchcore/src/tests/proton/common/attribute_updater/.gitignore
new file mode 100644
index 00000000000..3c6e15d6808
--- /dev/null
+++ b/searchcore/src/tests/proton/common/attribute_updater/.gitignore
@@ -0,0 +1,4 @@
+.depend
+Makefile
+attribute_updater_test
+searchcore_attribute_updater_test_app
diff --git a/searchcore/src/tests/proton/common/attribute_updater/CMakeLists.txt b/searchcore/src/tests/proton/common/attribute_updater/CMakeLists.txt
new file mode 100644
index 00000000000..d25a88c1a71
--- /dev/null
+++ b/searchcore/src/tests/proton/common/attribute_updater/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchcore_attribute_updater_test_app TEST
+    SOURCES
+    attribute_updater_test.cpp
+    DEPENDS
+    searchcore_pcommon
+    searchcore_util
+)
+vespa_add_test(NAME searchcore_attribute_updater_test_app COMMAND searchcore_attribute_updater_test_app)
diff --git a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp b/searchcore/src/tests/proton/common/attribute_updater/attribute_updater_test.cpp
index a1cbed20036..bb9953e3019 100644
--- a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp
+++ b/searchcore/src/tests/proton/common/attribute_updater/attribute_updater_test.cpp
@@ -22,7 +22,7 @@
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <vespa/log/log.h>
-LOG_SETUP("applyattrupdates_test");
+LOG_SETUP("attribute_updater_test");
 
 using namespace document;
 using search::attribute::BasicType;
diff --git a/searchcore/src/tests/applyattrupdates/doctypes.cfg b/searchcore/src/tests/proton/common/attribute_updater/doctypes.cfg
index 7da997e6cc9..7da997e6cc9 100644
--- a/searchcore/src/tests/applyattrupdates/doctypes.cfg
+++ b/searchcore/src/tests/proton/common/attribute_updater/doctypes.cfg