* testsuite/tr1/6_containers/unordered/insert/array_syntax.cc: Fix

	test case to use assignment instead of ==
	* testsuite/tr1/6_containers/unordered/insert/map_range.cc: New test.
	* testsuite/tr1/6_containers/unordered/insert/multimap_range.cc: New test.
	* testsuite/tr1/6_containers/unordered/insert/multiset_range.cc: New test.
	* testsuite/tr1/6_containers/unordered/insert/set_range.cc: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95240 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 363 insertions, 1 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 576318f0e43..e54c43b3930 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-18  Matt Austern  <austern@apple.com>
+	* testsuite/tr1/6_containers/unordered/insert/array_syntax.cc: Fix
+	test case to use assignment instead of ==
+	* testsuite/tr1/6_containers/unordered/insert/map_range.cc: New test.
+	* testsuite/tr1/6_containers/unordered/insert/multimap_range.cc: New test.
+	* testsuite/tr1/6_containers/unordered/insert/multiset_range.cc: New test.
+	* testsuite/tr1/6_containers/unordered/insert/set_range.cc: New test.
+	
 2005-02-18  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* testsuite/thread/pthread1.cc: Do not invoke pthread_setconcurrency
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/array_syntax.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/array_syntax.cc
index 308e5178c7b..f0e614b3577 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/array_syntax.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/array_syntax.cc
@@ -44,7 +44,7 @@ void test01()
   VERIFY(m.begin()->second == 17);
   VERIFY(m["red"] == 17);
 
-  m["blue"] == 9;
+  m["blue"] = 9;
   VERIFY(m.size() == 2);
   VERIFY(m["blue"] == 9);
 
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/map_range.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/map_range.cc
new file mode 100644
index 00000000000..7f8645b43c9
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/map_range.cc
@@ -0,0 +1,99 @@
+// { dg-do run }
+
+// 2005-2-17  Matt Austern  <austern@apple.com>
+//
+// Copyright (C) 2005 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 6.3.4.4 unordered_map
+// range insert
+
+#include <string>
+#include <iterator>
+#include <algorithm>
+#include <tr1/unordered_map>
+#include "testsuite_hooks.h"
+
+bool test __attribute__((unused)) = true;
+
+void test01()
+{
+  typedef std::tr1::unordered_map<std::string, int> Map;
+  typedef std::pair<const std::string, int> Pair;
+
+  Map m;
+  VERIFY(m.empty());
+
+  Pair A[5] =
+    {
+      Pair("red", 5),
+      Pair("green", 9),
+      Pair("blue", 3),
+      Pair("cyan", 8),
+      Pair("magenta", 7)
+    };
+
+  m.insert(A+0, A+5);
+  VERIFY(m.size() == 5);
+  VERIFY(std::distance(m.begin(), m.end()) == 5);
+
+  VERIFY(m["red"] == 5);
+  VERIFY(m["green"] == 9);
+  VERIFY(m["blue"] == 3);
+  VERIFY(m["cyan"] == 8);
+  VERIFY(m["magenta"] == 7);
+}
+
+void test02()
+{
+  typedef std::tr1::unordered_map<std::string, int> Map;
+  typedef std::pair<const std::string, int> Pair;
+
+  Map m;
+  VERIFY(m.empty());
+
+  Pair A[9] =
+    {
+      Pair("red", 5),
+      Pair("green", 9),
+      Pair("red", 19),
+      Pair("blue", 3),
+      Pair("blue", 60),
+      Pair("cyan", 8),
+      Pair("magenta", 7),
+      Pair("blue", 99),
+      Pair("green", 33)
+    };
+
+  m.insert(A+0, A+9);
+  VERIFY(m.size() == 5);
+  VERIFY(std::distance(m.begin(), m.end()) == 5);
+
+  VERIFY(m["red"] == 5);
+  VERIFY(m["green"] == 9);
+  VERIFY(m["blue"] == 3);
+  VERIFY(m["cyan"] == 8);
+  VERIFY(m["magenta"] == 7);
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/multimap_range.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/multimap_range.cc
new file mode 100644
index 00000000000..cbc403a5d2e
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/multimap_range.cc
@@ -0,0 +1,93 @@
+// { dg-do run }
+
+// 2005-2-17  Matt Austern  <austern@apple.com>
+//
+// Copyright (C) 2005 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 6.3.4.6 unordered_multimap
+// range insert
+
+#include <string>
+#include <iterator>
+#include <algorithm>
+#include <tr1/unordered_map>
+#include "testsuite_hooks.h"
+
+bool test __attribute__((unused)) = true;
+
+void test01()
+{
+  typedef std::tr1::unordered_multimap<std::string, int> Map;
+  typedef std::pair<const std::string, int> Pair;
+
+  Map m;
+  VERIFY(m.empty());
+
+  Pair A[5] =
+    {
+      Pair("red", 5),
+      Pair("green", 9),
+      Pair("blue", 3),
+      Pair("cyan", 8),
+      Pair("magenta", 7)
+    };
+
+  m.insert(A+0, A+5);
+  VERIFY(m.size() == 5);
+  VERIFY(std::distance(m.begin(), m.end()) == 5);
+
+  for (int i = 0; i < 5; ++i)
+    VERIFY(std::find(m.begin(), m.end(), A[i]) != m.end());
+}
+
+void test02()
+{
+  typedef std::tr1::unordered_multimap<std::string, int> Map;
+  typedef std::pair<const std::string, int> Pair;
+
+  Map m;
+  VERIFY(m.empty());
+
+  Pair A[9] =
+    {
+      Pair("red", 5),
+      Pair("green", 9),
+      Pair("red", 19),
+      Pair("blue", 3),
+      Pair("blue", 60),
+      Pair("cyan", 8),
+      Pair("magenta", 7),
+      Pair("blue", 99),
+      Pair("green", 33)
+    };
+
+  m.insert(A+0, A+9);
+  VERIFY(m.size() == 9);
+  VERIFY(std::distance(m.begin(), m.end()) == 9);
+
+  for (int i = 0; i < 9; ++i)
+    VERIFY(std::find(m.begin(), m.end(), A[i]) != m.end());
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/multiset_range.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/multiset_range.cc
new file mode 100644
index 00000000000..d7abc0a3847
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/multiset_range.cc
@@ -0,0 +1,81 @@
+// { dg-do run }
+
+// 2005-2-17  Matt Austern  <austern@apple.com>
+//
+// Copyright (C) 2005 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 6.3.4.5 unordered_multiset
+// range insert
+
+#include <string>
+#include <iterator>
+#include <algorithm>
+#include <tr1/unordered_set>
+#include "testsuite_hooks.h"
+
+bool test __attribute__((unused)) = true;
+
+void test01()
+{
+  typedef std::tr1::unordered_multiset<std::string> Set;
+  Set s;
+  VERIFY(s.empty());
+
+  const int N = 10;
+  const std::string A[N] = { "red", "green", "blue", "violet", "cyan",
+			     "magenta", "yellow", "orange", "pink", "gray" };
+
+  s.insert(A+0, A+N);
+  VERIFY(s.size() == N);
+  VERIFY(std::distance(s.begin(), s.end()) == N);
+
+  for (int i = 0; i < N; ++i) {
+    std::string str = A[i];
+    Set::iterator it = std::find(s.begin(), s.end(), str);
+    VERIFY(it != s.end());
+  }
+}
+
+void test02()
+{
+  typedef std::tr1::unordered_multiset<int> Set;
+  Set s;
+  VERIFY(s.empty());
+
+  const int N = 8;
+  const int A[N] = { 3, 7, 4, 8, 2, 4, 6, 7 };
+
+  s.insert(A+0, A+N);
+  VERIFY(s.size() == N);
+  VERIFY(std::distance(s.begin(), s.end()) == N);
+
+  VERIFY(std::count(s.begin(), s.end(), 2) == 1);
+  VERIFY(std::count(s.begin(), s.end(), 3) == 1);
+  VERIFY(std::count(s.begin(), s.end(), 4) == 2);
+  VERIFY(std::count(s.begin(), s.end(), 6) == 1);
+  VERIFY(std::count(s.begin(), s.end(), 7) == 2);
+  VERIFY(std::count(s.begin(), s.end(), 8) == 1);
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/set_range.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/set_range.cc
new file mode 100644
index 00000000000..e67dd4da239
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/insert/set_range.cc
@@ -0,0 +1,81 @@
+// { dg-do run }
+
+// 2005-2-17  Matt Austern  <austern@apple.com>
+//
+// Copyright (C) 2005 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 6.3.4.3 unordered_set
+// range insert
+
+#include <string>
+#include <iterator>
+#include <algorithm>
+#include <tr1/unordered_set>
+#include "testsuite_hooks.h"
+
+bool test __attribute__((unused)) = true;
+
+void test01()
+{
+  typedef std::tr1::unordered_set<std::string> Set;
+  Set s;
+  VERIFY(s.empty());
+
+  const int N = 10;
+  const std::string A[N] = { "red", "green", "blue", "violet", "cyan",
+			     "magenta", "yellow", "orange", "pink", "gray" };
+
+  s.insert(A+0, A+N);
+  VERIFY(s.size() == N);
+  VERIFY(std::distance(s.begin(), s.end()) == N);
+
+  for (int i = 0; i < N; ++i) {
+    std::string str = A[i];
+    Set::iterator it = std::find(s.begin(), s.end(), str);
+    VERIFY(it != s.end());
+  }
+}
+
+void test02()
+{
+  typedef std::tr1::unordered_set<int> Set;
+  Set s;
+  VERIFY(s.empty());
+
+  const int N = 8;
+  const int A[N] = { 3, 7, 4, 8, 2, 4, 6, 7 };
+
+  s.insert(A+0, A+N);
+  VERIFY(s.size() == 6);
+  VERIFY(std::distance(s.begin(), s.end()) == 6);
+
+  VERIFY(std::count(s.begin(), s.end(), 2) == 1);
+  VERIFY(std::count(s.begin(), s.end(), 3) == 1);
+  VERIFY(std::count(s.begin(), s.end(), 4) == 1);
+  VERIFY(std::count(s.begin(), s.end(), 6) == 1);
+  VERIFY(std::count(s.begin(), s.end(), 7) == 1);
+  VERIFY(std::count(s.begin(), s.end(), 8) == 1);
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}