DEV-41402 convert stringize tut test to llcommon integration test.

3 files changed, 88 insertions, 1 deletions

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index d635fad832..d15df60152 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -253,6 +253,7 @@ LL_ADD_INTEGRATION_TEST(llsdserialize "" "${test_libs}")
 LL_ADD_INTEGRATION_TEST(llstring "" "${test_libs}")
 LL_ADD_INTEGRATION_TEST(lltreeiterators "" "${test_libs}")
 LL_ADD_INTEGRATION_TEST(lluri "" "${test_libs}")
+LL_ADD_INTEGRATION_TEST(stringize "" "${test_libs}")
 
 # *TODO - reenable these once tcmalloc libs no longer break the build.
 #ADD_BUILD_TEST(llallocator llcommon)
diff --git a/indra/llcommon/tests/stringize_test.cpp b/indra/llcommon/tests/stringize_test.cpp
new file mode 100644
index 0000000000..e504eb2ac2
--- /dev/null
+++ b/indra/llcommon/tests/stringize_test.cpp
@@ -0,0 +1,87 @@
+/**
+ * @file   stringize_tut.cpp
+ * @author Nat Goodspeed
+ * @date   2008-09-12
+ * @brief  Test of stringize.h
+ * 
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * Copyright (c) 2008, Linden Research, Inc.
+ * $/LicenseInfo$
+ */
+
+/*==========================================================================*|
+#if LL_WINDOWS
+#pragma warning (disable : 4675) // "resolved by ADL" -- just as I want!
+#endif
+|*==========================================================================*/
+
+// STL headers
+#include <iomanip>
+
+// Precompiled header
+#include "linden_common.h"
+
+// associated header
+#include "../stringize.h"
+
+// std headers
+// external library headers
+// other Linden headers
+#include "../llsd.h"
+
+#include "../test/lltut.h"
+
+namespace tut
+{
+    struct stringize_data
+    {
+        stringize_data():
+            c('c'),
+            s(17),
+            i(34),
+            l(68),
+            f(3.14159265358979f),
+            d(3.14159265358979),
+            // Including a space differentiates this from
+            // boost::lexical_cast<std::string>, which doesn't handle embedded
+            // spaces so well.
+            abc("abc def")
+        {
+            llsd["i"]   = i;
+            llsd["d"]   = d;
+            llsd["abc"] = abc;
+        }
+
+        char        c;
+        short       s;
+        int         i;
+        long        l;
+        float       f;
+        double      d;
+        std::string abc;
+        LLSD        llsd;
+    };
+    typedef test_group<stringize_data> stringize_group;
+    typedef stringize_group::object stringize_object;
+    tut::stringize_group strzgrp("stringize");
+
+    template<> template<>
+    void stringize_object::test<1>()
+    {
+        ensure_equals(stringize(c),    "c");
+        ensure_equals(stringize(s),    "17");
+        ensure_equals(stringize(i),    "34");
+        ensure_equals(stringize(l),    "68");
+        ensure_equals(stringize(f),    "3.14159");
+        ensure_equals(stringize(d),    "3.14159");
+        ensure_equals(stringize(abc),  "abc def");
+        ensure_equals(stringize(llsd), "{'abc':'abc def','d':r3.14159,'i':i34}");
+    }
+
+    template<> template<>
+    void stringize_object::test<2>()
+    {
+        ensure_equals(STRINGIZE("c is " << c), "c is c");
+        ensure_equals(STRINGIZE(std::setprecision(4) << d), "3.142");
+    }
+} // namespace tut
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 9d8e781d48..24546e6215 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -58,7 +58,6 @@ set(test_SOURCE_FILES
     llxfer_tut.cpp
     message_tut.cpp
     reflection_tut.cpp
-    stringize_tut.cpp
     test.cpp
     )