1 files changed, 21 insertions, 36 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
index c360119e31a4..0e5eb1b60700 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
@@ -32,44 +32,29 @@ test(S& s, typename S::const_iterator p, typename S::value_type c, S expected)
         assert(i == p);
 }
 
+template <class S>
+TEST_CONSTEXPR_CXX20 void test_string() {
+  S s;
+  test(s, s.begin(), '1', S("1"));
+  test(s, s.begin(), 'a', S("a1"));
+  test(s, s.end(), 'b', S("a1b"));
+  test(s, s.end()-1, 'c', S("a1cb"));
+  test(s, s.end()-2, 'd', S("a1dcb"));
+  test(s, s.end()-3, '2', S("a12dcb"));
+  test(s, s.end()-4, '3', S("a132dcb"));
+  test(s, s.end()-5, '4', S("a1432dcb"));
+  test(s, s.begin()+1, '5', S("a51432dcb"));
+  test(s, s.begin()+2, '6', S("a561432dcb"));
+  test(s, s.begin()+3, '7', S("a5671432dcb"));
+  test(s, s.begin()+4, 'A', S("a567A1432dcb"));
+  test(s, s.begin()+5, 'B', S("a567AB1432dcb"));
+  test(s, s.begin()+6, 'C', S("a567ABC1432dcb"));
+}
+
 TEST_CONSTEXPR_CXX20 bool test() {
-  {
-    typedef std::string S;
-    S s;
-    test(s, s.begin(), '1', S("1"));
-    test(s, s.begin(), 'a', S("a1"));
-    test(s, s.end(), 'b', S("a1b"));
-    test(s, s.end()-1, 'c', S("a1cb"));
-    test(s, s.end()-2, 'd', S("a1dcb"));
-    test(s, s.end()-3, '2', S("a12dcb"));
-    test(s, s.end()-4, '3', S("a132dcb"));
-    test(s, s.end()-5, '4', S("a1432dcb"));
-    test(s, s.begin()+1, '5', S("a51432dcb"));
-    test(s, s.begin()+2, '6', S("a561432dcb"));
-    test(s, s.begin()+3, '7', S("a5671432dcb"));
-    test(s, s.begin()+4, 'A', S("a567A1432dcb"));
-    test(s, s.begin()+5, 'B', S("a567AB1432dcb"));
-    test(s, s.begin()+6, 'C', S("a567ABC1432dcb"));
-  }
+  test_string<std::string>();
 #if TEST_STD_VER >= 11
-  {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S s;
-    test(s, s.begin(), '1', S("1"));
-    test(s, s.begin(), 'a', S("a1"));
-    test(s, s.end(), 'b', S("a1b"));
-    test(s, s.end()-1, 'c', S("a1cb"));
-    test(s, s.end()-2, 'd', S("a1dcb"));
-    test(s, s.end()-3, '2', S("a12dcb"));
-    test(s, s.end()-4, '3', S("a132dcb"));
-    test(s, s.end()-5, '4', S("a1432dcb"));
-    test(s, s.begin()+1, '5', S("a51432dcb"));
-    test(s, s.begin()+2, '6', S("a561432dcb"));
-    test(s, s.begin()+3, '7', S("a5671432dcb"));
-    test(s, s.begin()+4, 'A', S("a567A1432dcb"));
-    test(s, s.begin()+5, 'B', S("a567AB1432dcb"));
-    test(s, s.begin()+6, 'C', S("a567ABC1432dcb"));
-  }
+  test_string<std::basic_string<char, std::char_traits<char>, min_allocator<char>>>();
 #endif
 
   return true;