[libc++] [test] Improve test coverage for containers' scary.pass.cpp

Author: halbi2

libcxx/test/std/containers/associative/multimap/scary.pass.cpp

@@ -8,20 +8,19 @@
 
 // <map>
 
-// class map class multimap
+// class map
+// class multimap
 
-// Extension:  SCARY/N2913 iterator compatibility between map and multimap
+// Extension: SCARY/N2913 iterator compatibility between map and multimap
 
 #include <map>
 
 #include "test_macros.h"
 
-int main(int, char**) {
+void test() {
   typedef std::map<int, int> M1;
   typedef std::multimap<int, int> M2;
-  M2::iterator i;
-  M1::iterator j = i;
-  ((void)j);
 
-  return 0;
+  ASSERT_SAME_TYPE(M1::iterator, M2::iterator);
+  ASSERT_SAME_TYPE(M1::const_iterator, M2::const_iterator);
 }

libcxx/test/std/containers/associative/multiset/scary.pass.cpp

@@ -8,20 +8,19 @@
 
 // <set>
 
-// class set class multiset
+// class set
+// class multiset
 
-// Extension:  SCARY/N2913 iterator compatibility between set and multiset
+// Extension: SCARY/N2913 iterator compatibility between set and multiset
 
 #include <set>
 
 #include "test_macros.h"
 
-int main(int, char**) {
+void test() {
   typedef std::set<int> M1;
   typedef std::multiset<int> M2;
-  M2::iterator i;
-  M1::iterator j = i;
-  ((void)j);
 
-  return 0;
+  ASSERT_SAME_TYPE(M1::iterator, M2::iterator);
+  ASSERT_SAME_TYPE(M1::const_iterator, M2::const_iterator);
 }

libcxx/test/std/containers/container.adaptors/flat.multimap/scary.pass.cpp

@@ -0,0 +1,26 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// <flat_map>
+
+// class flat_map
+// class flat_multimap
+
+// Extension: SCARY/N2913 iterator compatibility between flat_map and flat_multimap
+
+#include <flat_map>
+
+#include "test_macros.h"
+
+void test() {
+  typedef std::flat_map<int, int> M1;
+  typedef std::flat_multimap<int, int> M2;
+
+  ASSERT_SAME_TYPE(M1::iterator, M2::iterator);
+  ASSERT_SAME_TYPE(M1::const_iterator, M2::const_iterator);
+}

libcxx/test/std/containers/unord/unord.multimap/scary.pass.cpp

@@ -8,20 +8,21 @@
 
 // <unordered_map>
 
-// class unordered_map class unordered_multimap
+// class unordered_map
+// class unordered_multimap
 
-// Extension:  SCARY/N2913 iterator compatibility between unordered_map and unordered_multimap
+// Extension: SCARY/N2913 iterator compatibility between unordered_map and unordered_multimap
 
 #include <unordered_map>
 
 #include "test_macros.h"
 
-int main(int, char**) {
+void test() {
   typedef std::unordered_map<int, int> M1;
   typedef std::unordered_multimap<int, int> M2;
-  M2::iterator i;
-  M1::iterator j = i;
-  ((void)j);
 
-  return 0;
+  ASSERT_SAME_TYPE(M1::iterator, M2::iterator);
+  ASSERT_SAME_TYPE(M1::const_iterator, M2::const_iterator);
+  ASSERT_SAME_TYPE(M1::local_iterator, M2::local_iterator);
+  ASSERT_SAME_TYPE(M1::const_local_iterator, M2::const_local_iterator);
 }

libcxx/test/std/containers/unord/unord.multiset/scary.pass.cpp

@@ -8,20 +8,21 @@
 
 // <unordered_set>
 
-// class unordered_set class unordered_multiset
+// class unordered_set
+// class unordered_multiset
 
-// Extension:  SCARY/N2913 iterator compatibility between unordered_set and unordered_multiset
+// Extension: SCARY/N2913 iterator compatibility between unordered_set and unordered_multiset
 
 #include <unordered_set>
 
 #include "test_macros.h"
 
-int main(int, char**) {
+void test() {
   typedef std::unordered_set<int> M1;
   typedef std::unordered_multiset<int> M2;
-  M2::iterator i;
-  M1::iterator j = i;
-  ((void)j);
 
-  return 0;
+  ASSERT_SAME_TYPE(M1::iterator, M2::iterator);
+  ASSERT_SAME_TYPE(M1::const_iterator, M2::const_iterator);
+  ASSERT_SAME_TYPE(M1::local_iterator, M2::local_iterator);
+  ASSERT_SAME_TYPE(M1::const_local_iterator, M2::const_local_iterator);
 }