summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2022-06-30 14:41:56 +0200
committerTor Egge <Tor.Egge@online.no>2022-06-30 14:41:56 +0200
commitedce55f0556fe222eb720fa10f82da8f903663ca (patch)
treef8751c315f348ce887428f8d37ea61b1620ade76
parent44b2f5114416254d5eb859ea02f436c4b0dfaf0a (diff)
Move summary field converter unit test from searchcore to searchsummary.
-rw-r--r--searchcore/src/tests/proton/docsummary/CMakeLists.txt8
-rwxr-xr-xsearchcore/src/tests/proton/docsummary/docsummary_test.sh1
-rw-r--r--searchsummary/CMakeLists.txt1
-rw-r--r--searchsummary/src/tests/docsummary/summary_field_converter/CMakeLists.txt8
-rw-r--r--searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp (renamed from searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp)0
5 files changed, 10 insertions, 8 deletions
diff --git a/searchcore/src/tests/proton/docsummary/CMakeLists.txt b/searchcore/src/tests/proton/docsummary/CMakeLists.txt
index 274c1e302da..6c94e7fd38a 100644
--- a/searchcore/src/tests/proton/docsummary/CMakeLists.txt
+++ b/searchcore/src/tests/proton/docsummary/CMakeLists.txt
@@ -23,11 +23,5 @@ vespa_add_executable(searchcore_docsummary_test_app TEST
searchcore_proton_metrics
searchcore_fconfig
)
-vespa_add_executable(searchcore_summaryfieldconverter_test_app
- SOURCES
- summaryfieldconverter_test.cpp
- DEPENDS
- searchcore_docsummary
-)
vespa_add_test(NAME searchcore_docsummary_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docsummary_test.sh
- DEPENDS searchcore_docsummary_test_app searchcore_summaryfieldconverter_test_app)
+ DEPENDS searchcore_docsummary_test_app)
diff --git a/searchcore/src/tests/proton/docsummary/docsummary_test.sh b/searchcore/src/tests/proton/docsummary/docsummary_test.sh
index 3722c967455..4f05e6ee6f3 100755
--- a/searchcore/src/tests/proton/docsummary/docsummary_test.sh
+++ b/searchcore/src/tests/proton/docsummary/docsummary_test.sh
@@ -14,4 +14,3 @@ rm -rf summary
rm -rf indexingdocument
rm -rf searchdocument
rm -rf *.dat
-$VALGRIND ./searchcore_summaryfieldconverter_test_app
diff --git a/searchsummary/CMakeLists.txt b/searchsummary/CMakeLists.txt
index d51e29dbd00..17b46499317 100644
--- a/searchsummary/CMakeLists.txt
+++ b/searchsummary/CMakeLists.txt
@@ -21,6 +21,7 @@ vespa_define_module(
src/tests/docsummary/attributedfw
src/tests/docsummary/matched_elements_filter
src/tests/docsummary/slime_summary
+ src/tests/docsummary/summary_field_converter
src/tests/extractkeywords
src/tests/juniper
)
diff --git a/searchsummary/src/tests/docsummary/summary_field_converter/CMakeLists.txt b/searchsummary/src/tests/docsummary/summary_field_converter/CMakeLists.txt
new file mode 100644
index 00000000000..cfda566ee6c
--- /dev/null
+++ b/searchsummary/src/tests/docsummary/summary_field_converter/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchsummary_summary_field_converter_test_app
+ SOURCES
+ summary_field_converter_test.cpp
+ DEPENDS
+ searchsummary
+)
+vespa_add_test(NAME searchsummary_summary_field_converter_test_app COMMAND searchsummary_summary_field_converter_test_app)
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp
index 06766ba370a..06766ba370a 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp