Patchwork [v3] Add more string operator+ tests

login
register
mail settings
Submitter Paolo Carlini
Date Dec. 19, 2010, 12:17 p.m.
Message ID <4D0DF7CB.6080908@oracle.com>
Download mbox | patch
Permalink /patch/76121/
State New
Headers show

Comments

Paolo Carlini - Dec. 19, 2010, 12:17 p.m.
Hi,

tested x86_64-linux, committed.

Paolo.

////////////////////////////////
2010-12-19  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/21_strings/basic_string/operators/char/4.cc: New.
	* testsuite/21_strings/basic_string/operators/wchar_t/4.cc: Likewise.
	* testsuite/ext/vstring/operators/2.cc: Likewise.

Patch

Index: testsuite/21_strings/basic_string/operators/wchar_t/4.cc
===================================================================
--- testsuite/21_strings/basic_string/operators/wchar_t/4.cc	(revision 0)
+++ testsuite/21_strings/basic_string/operators/wchar_t/4.cc	(revision 0)
@@ -0,0 +1,79 @@ 
+// 2010-12-19  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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 3, or (at your option)
+// any later version.
+//
+// This library 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 library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+//
+// { dg-options "-std=gnu++0x" }
+// { dg-require-string-conversions "" }
+
+#include <string>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using std::wstring;
+  using std::move;
+
+  wstring s01(L"abc");
+  s01.reserve(30);
+  wstring s02(L"def");
+  s02.reserve(30); 
+  VERIFY( move(s01) + move(s02) == wstring(L"abcdef") );
+
+  wstring s03(L"abcdefghijklmnopqrstuvw");
+  wstring s04(L"xyz");
+  s04.reserve(30); 
+  VERIFY( move(s03) + move(s04) == wstring(L"abcdefghijklmnopqrstuvwxyz") );
+
+  wstring s05(L"abc");
+  s05.reserve(30);
+  wstring s06(L"defghijklmnopqrstuvwxyz");
+  VERIFY( move(s05) + move(s06) == wstring(L"abcdefghijklmnopqrstuvwxyz") );
+
+  const wstring sc1(L"abc");
+  wstring s07(L"def");
+  s07.reserve(30);
+  VERIFY( sc1 + move(s07) == wstring(L"abcdef") );
+
+  const wstring sc2(L"def");
+  wstring s08(L"abc");
+  s08.reserve(30);
+  VERIFY( move(s08) + sc2 == wstring(L"abcdef") );
+  
+  wstring s09(L"abc");
+  s09.reserve(30);
+  VERIFY( move(s09) + L'd' == wstring(L"abcd") );
+
+  wstring s10(L"abc");
+  s10.reserve(30);
+  VERIFY( move(s10) + L"def" == wstring(L"abcdef") );
+
+  wstring s11(L"bcd");
+  s11.reserve(30);
+  VERIFY( L'a' + move(s11) == wstring(L"abcd") );
+
+  wstring s12(L"def");
+  s12.reserve(30);
+  VERIFY( L"abc" + move(s12) == wstring(L"abcdef") );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
Index: testsuite/21_strings/basic_string/operators/char/4.cc
===================================================================
--- testsuite/21_strings/basic_string/operators/char/4.cc	(revision 0)
+++ testsuite/21_strings/basic_string/operators/char/4.cc	(revision 0)
@@ -0,0 +1,79 @@ 
+// 2010-12-19  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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 3, or (at your option)
+// any later version.
+//
+// This library 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 library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+//
+// { dg-options "-std=gnu++0x" }
+// { dg-require-string-conversions "" }
+
+#include <string>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using std::string;
+  using std::move;
+
+  string s01("abc");
+  s01.reserve(30);
+  string s02("def");
+  s02.reserve(30); 
+  VERIFY( move(s01) + move(s02) == string("abcdef") );
+
+  string s03("abcdefghijklmnopqrstuvw");
+  string s04("xyz");
+  s04.reserve(30); 
+  VERIFY( move(s03) + move(s04) == string("abcdefghijklmnopqrstuvwxyz") );
+
+  string s05("abc");
+  s05.reserve(30);
+  string s06("defghijklmnopqrstuvwxyz");
+  VERIFY( move(s05) + move(s06) == string("abcdefghijklmnopqrstuvwxyz") );
+
+  const string sc1("abc");
+  string s07("def");
+  s07.reserve(30);
+  VERIFY( sc1 + move(s07) == string("abcdef") );
+
+  const string sc2("def");
+  string s08("abc");
+  s08.reserve(30);
+  VERIFY( move(s08) + sc2 == string("abcdef") );
+  
+  string s09("abc");
+  s09.reserve(30);
+  VERIFY( move(s09) + 'd' == string("abcd") );
+
+  string s10("abc");
+  s10.reserve(30);
+  VERIFY( move(s10) + "def" == string("abcdef") );
+
+  string s11("bcd");
+  s11.reserve(30);
+  VERIFY( 'a' + move(s11) == string("abcd") );
+
+  string s12("def");
+  s12.reserve(30);
+  VERIFY( "abc" + move(s12) == string("abcdef") );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
Index: testsuite/ext/vstring/operators/2.cc
===================================================================
--- testsuite/ext/vstring/operators/2.cc	(revision 0)
+++ testsuite/ext/vstring/operators/2.cc	(revision 0)
@@ -0,0 +1,79 @@ 
+// 2010-12-19  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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 3, or (at your option)
+// any later version.
+//
+// This library 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 library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+//
+// { dg-options "-std=gnu++0x" }
+// { dg-require-string-conversions "" }
+
+#include <ext/vstring.h>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_cxx::__vstring;
+  using std::move;
+
+  __vstring s01("abc");
+  s01.reserve(30);
+  __vstring s02("def");
+  s02.reserve(30); 
+  VERIFY( move(s01) + move(s02) == __vstring("abcdef") );
+
+  __vstring s03("abcdefghijklmnopqrstuvw");
+  __vstring s04("xyz");
+  s04.reserve(30); 
+  VERIFY( move(s03) + move(s04) == __vstring("abcdefghijklmnopqrstuvwxyz") );
+
+  __vstring s05("abc");
+  s05.reserve(30);
+  __vstring s06("defghijklmnopqrstuvwxyz");
+  VERIFY( move(s05) + move(s06) == __vstring("abcdefghijklmnopqrstuvwxyz") );
+
+  const __vstring sc1("abc");
+  __vstring s07("def");
+  s07.reserve(30);
+  VERIFY( sc1 + move(s07) == __vstring("abcdef") );
+
+  const __vstring sc2("def");
+  __vstring s08("abc");
+  s08.reserve(30);
+  VERIFY( move(s08) + sc2 == __vstring("abcdef") );
+  
+  __vstring s09("abc");
+  s09.reserve(30);
+  VERIFY( move(s09) + 'd' == __vstring("abcd") );
+
+  __vstring s10("abc");
+  s10.reserve(30);
+  VERIFY( move(s10) + "def" == __vstring("abcdef") );
+
+  __vstring s11("bcd");
+  s11.reserve(30);
+  VERIFY( 'a' + move(s11) == __vstring("abcd") );
+
+  __vstring s12("def");
+  s12.reserve(30);
+  VERIFY( "abc" + move(s12) == __vstring("abcdef") );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}