From 2f4636e2df02c7f802932045f7417af56637b0dd Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 17 Sep 2019 16:19:50 +0200
Subject: [PATCH] Fix stringTools join function.

---
 src/tools/stringTools.cpp |  4 ++--
 test/meson.build          |  3 ++-
 test/stringTools.cpp      | 44 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 test/stringTools.cpp

diff --git a/src/tools/stringTools.cpp b/src/tools/stringTools.cpp
index f3d206e4..ef596f1e 100644
--- a/src/tools/stringTools.cpp
+++ b/src/tools/stringTools.cpp
@@ -303,10 +303,10 @@ std::string kiwix::join(const std::vector<std::string>& list, const std::string&
   std::stringstream ss;
   bool first = true;
   for (auto& s:list) {
-    if (first) {
+    if (!first) {
       ss << sep;
-      first = false;
     }
+    first = false;
     ss << s;
   }
   return ss.str();
diff --git a/test/meson.build b/test/meson.build
index 2777d1ea..437f5b52 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -4,7 +4,8 @@ tests = [
     'parseUrl',
     'library',
     'regex',
-    'tagParsing'
+    'tagParsing',
+    'stringTools'
 ]
 
 
diff --git a/test/stringTools.cpp b/test/stringTools.cpp
new file mode 100644
index 00000000..c632f0b7
--- /dev/null
+++ b/test/stringTools.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 Matthieu Gautier
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ */
+
+#include "gtest/gtest.h"
+#include <string>
+#include <vector>
+
+namespace kiwix {
+std::string join(const std::vector<std::string>& list, const std::string& sep);
+};
+
+using namespace kiwix;
+#define parse_tag getTagValueFromTagList
+
+namespace
+{
+TEST(stringTools, join)
+{
+  std::vector<std::string> list = { "a", "b", "c" };
+  ASSERT_EQ(join(list, ";"), "a;b;c");
+}
+
+};
+int main(int argc, char** argv)
+{
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}