Noissue - Allow displaying String in tests

compiled/String.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus 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 Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
 
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
 #include <type_traits>
+#ifdef INSIDE_TESTS
 #include <iostream>

[sergei, 2018/02/01 16:10:46]

Could you please wrap it by #ifdef INSIDE_TESTS too?

[hub, 2018/02/01 19:16:29]

Done.

+#include <codecvt>
+#endif
 
 #include "debug.h"
 #include "library.h"
 
 inline void String_assert_writable(bool isWritable);
 
 class String
 {
   friend class DependentString;
   friend class OwnedString;
@@ skipping 155 matching lines @@
       {
         mBuf[i] = CharToLower(currChar);
       }
     }
   }
 };
 
 #ifdef INSIDE_TESTS
 inline std::ostream& operator<<(std::ostream& os, const String& str)
 {
-  for (String::size_type i = 0; i < str.length(); i++)
-    os << static_cast<char>(str[i]);

[sergei, 2018/02/01 16:10:46]

Even for tests I would like to have a helper function which converts from UCS2
to UTF-8 (the implementation can be based on
http://en.cppreference.com/w/cpp/locale/wstring_convert/to_bytes), and one could
call this function here.

[hub, 2018/02/01 19:16:30]

Done

+  std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> converter;
+  os << converter.to_bytes(str.data(), str.data() + str.length());
   return os;
 }
 #endif
 
 class DependentString : public String
 {
 public:
   explicit DependentString()
       : String(nullptr, 0, INVALID)
   {
@@ skipping 49 matching lines @@
   }
 
   void erase()
   {
     *this = DependentString();
     mLen = DELETED;
   }
 };
 
 #ifdef INSIDE_TESTS
 inline std::ostream& operator<<(std::ostream& os, const DependentString& str)

[sergei, 2018/02/01 16:10:46]

It should not be required.

[hub, 2018/02/01 19:16:30]

Without this it operator<< doesn't get called, unless I actually cast to const
String& on the TEST_EQ() call.

To be complete I'd need to do the same for OwnedString.

[sergei, 2018/02/02 15:03:32]

Acknowledged. I think it is worth investigation, because it's strange. BTW, I
have tried PrintTo and it does not work at all.

 {
   return os << static_cast<const String&>(str);
 }
 #endif
 
 inline DependentString operator "" _str(const String::value_type* str,
     String::size_type len)
 {
   return DependentString(str, len);
 }
@@ skipping 148 matching lines @@
     if (negative)
       mBuf[pos++] = '-';
 
     for (int i = size - 1; i >= 0; i--)
     {
       mBuf[pos + i] = '0' + (num % 10);
       num /= 10;
     }
   }
 };
+
+#ifdef INSIDE_TESTS
+inline std::ostream& operator<<(std::ostream& os, const OwnedString& str)
+{
+  return os << static_cast<const String&>(str);
+}
+#endif