Refactor to avoid code duplication.

2 files changed, 6 insertions, 16 deletions

diff --git a/config/src/tests/configgen/vector_inserter.cpp b/config/src/tests/configgen/vector_inserter.cpp
index e2b0d7c875f..80ebf0fc95f 100644
--- a/config/src/tests/configgen/vector_inserter.cpp
+++ b/config/src/tests/configgen/vector_inserter.cpp
@@ -100,8 +100,9 @@ TEST("require that vector of bool can be inserted") {
     ASSERT_TRUE(vector[2]);
 }
 
-TEST("require that vector of string can be inserted") {
-    std::vector<vespalib::string> vector;
+template<typename V>
+void
+verify_vector_strings_can_be_inserted(V vector) {
     Slime slime;
     Cursor & root = slime.setArray();
     root.addString("foo");
@@ -115,19 +116,9 @@ TEST("require that vector of string can be inserted") {
     ASSERT_EQUAL("baz", vector[2]);
 }
 
-TEST("require that vector of string can be inserted") {
-    StringVector vector;
-    Slime slime;
-    Cursor & root = slime.setArray();
-    root.addString("foo");
-    root.addString("bar");
-    root.addString("baz");
-    VectorInserter inserter(vector);
-    root.traverse(inserter);
-    ASSERT_EQUAL(3u, vector.size());
-    ASSERT_EQUAL("foo", vector[0]);
-    ASSERT_EQUAL("bar", vector[1]);
-    ASSERT_EQUAL("baz", vector[2]);
+TEST("require that different vectors of strings can be inserted") {
+    verify_vector_strings_can_be_inserted(std::vector<vespalib::string>());
+    verify_vector_strings_can_be_inserted(StringVector());
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/config/src/vespa/config/common/types.h b/config/src/vespa/config/common/types.h
index 0c9ad15d046..7bec2666db7 100644
--- a/config/src/vespa/config/common/types.h
+++ b/config/src/vespa/config/common/types.h
@@ -8,7 +8,6 @@
 
 namespace config {
 
-//using StringVector = std::vector<vespalib::string>;
 using StringVector = std::vector<vespalib::string, vespalib::allocator_large<vespalib::string>>;
 using BoolVector = std::vector<bool>;
 using DoubleVector = std::vector<double>;