Merge pull request #7210 from Icinga/bugfix/boost-asio-deprecated

[icinga2] / test / base-string.cpp

diff --git a/test/base-string.cpp b/test/base-string.cpp
index 44c5a5c3687696d46051dce44fcadd40f1d386d8..835b1a643893ed4e4d1d5bb526b2d7da3f4a7a4d 100644 (file)
--- a/test/base-string.cpp
+++ b/test/base-string.cpp
@@ -1,25 +1,7 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/)        *
- *                                                                            *
- * 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 WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "base/qstring.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/foreach.hpp>
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
+
+#include "base/string.hpp"
+#include <BoostTestTargetConfig.h>
 
 using namespace icinga;
 
@@ -63,20 +45,31 @@ BOOST_AUTO_TEST_CASE(append)
 BOOST_AUTO_TEST_CASE(trim)
 {
        String s1 = "hello";
-       s1.Trim();
-       BOOST_CHECK(s1 == "hello");
+       BOOST_CHECK(s1.Trim() == "hello");
 
        String s2 = "  hello";
-       s2.Trim();
-       BOOST_CHECK(s2 == "hello");
+       BOOST_CHECK(s2.Trim() == "hello");
 
        String s3 = "hello ";
-       s3.Trim();
-       BOOST_CHECK(s3 == "hello");
+       BOOST_CHECK(s3.Trim() == "hello");
 
        String s4 = " hello ";
-       s4.Trim();
-       BOOST_CHECK(s4 == "hello");
+       BOOST_CHECK(s4.Trim() == "hello");
+}
+
+BOOST_AUTO_TEST_CASE(contains)
+{
+       String s1 = "hello world";
+       String s2 = "hello";
+       BOOST_CHECK(s1.Contains(s2));
+
+       String s3 = "  hello world  ";
+       String s4 = "  hello";
+       BOOST_CHECK(s3.Contains(s4));
+
+       String s5 = "  hello world  ";
+       String s6 = "world  ";
+       BOOST_CHECK(s5.Contains(s6));
 }
 
 BOOST_AUTO_TEST_CASE(replace)
@@ -95,7 +88,7 @@ BOOST_AUTO_TEST_CASE(index)
        s[0] = 'x';
        BOOST_CHECK(s == "xello");
 
-       BOOST_FOREACH(char& ch, s) {
+       for (char& ch : s) {
                ch = 'y';
        }
        BOOST_CHECK(s == "yyyyy");