From e67b8032f77ebe337c87aeb3f550089dccfdd990 Mon Sep 17 00:00:00 2001 From: Justin Viiret Date: Tue, 20 Oct 2015 13:24:23 +1100 Subject: [PATCH] Unbreak unit-internal for builds w/o dump support Use printable, rather than escapeString. --- unit/internal/utf8_validate.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unit/internal/utf8_validate.cpp b/unit/internal/utf8_validate.cpp index 83358361..6649e6fe 100644 --- a/unit/internal/utf8_validate.cpp +++ b/unit/internal/utf8_validate.cpp @@ -31,7 +31,7 @@ #include "parser/utf8_validate.h" #include "ue2common.h" -#include "util/ue2string.h" +#include "util/string_util.h" #include "gtest/gtest.h" @@ -46,7 +46,7 @@ struct ValidUtf8TestInfo { // Helper for gtest. static void PrintTo(const ValidUtf8TestInfo &t, ::std::ostream *os) { - *os << "(" << t.str << ", " << t.is_valid << ")"; + *os << "(\"" << printable(t.str) << "\", " << t.is_valid << ")"; } static ValidUtf8TestInfo valid_utf8_tests[] = { @@ -118,5 +118,5 @@ INSTANTIATE_TEST_CASE_P(ValidUtf8, ValidUtf8Test, ValuesIn(valid_utf8_tests)); TEST_P(ValidUtf8Test, check) { const auto &info = GetParam(); ASSERT_EQ(info.is_valid, isValidUtf8(info.str.c_str())) - << "String is: " << escapeString(info.str) << std::endl; + << "String is: " << printable(info.str) << std::endl; }