combine test cases

Author: ludviggunne

test/testsimplifyusing.cpp

@@ -80,9 +80,6 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing40);
         TEST_CASE(simplifyUsing41);
         TEST_CASE(simplifyUsing42);
-        TEST_CASE(simplifyUsing43);
-        TEST_CASE(simplifyUsing44);
-        TEST_CASE(simplifyUsing45);
 
         TEST_CASE(simplifyUsing8970);
         TEST_CASE(simplifyUsing8971);
@@ -961,31 +958,30 @@ class TestSimplifyUsing : public TestFixture {
     }
 
     void simplifyUsing42() {
-        const char code[] = "using A = bool;\n"
-                            "template<typename T> A func() {}\n";
-        const char expected[] = "template < typename T > bool func ( ) { }";
-        ASSERT_EQUALS(expected, tok(code));
-    }
-
-    void simplifyUsing43() {
-        const char code[] = "using A = bool;\n"
-                            "template<typename A> A func() {}\n";
-        const char expected[] = "template < typename A > A func ( ) { }";
-        ASSERT_EQUALS(expected, tok(code));
-    }
-
-    void simplifyUsing44() {
-        const char code[] = "using A = bool;\n"
-                            "template<typename T> class C { A x; }\n";
-        const char expected[] = "template < typename T > class C { bool x ; }";
-        ASSERT_EQUALS(expected, tok(code));
-    }
-
-    void simplifyUsing45() {
-        const char code[] = "using A = bool;\n"
-                            "template<typename A> class C { A x; }\n";
-        const char expected[] = "template < typename A > class C { A x ; }";
-        ASSERT_EQUALS(expected, tok(code));
+        {
+            const char code[] = "using A = bool;\n"
+                                "template<typename T> A func() {}\n";
+            const char expected[] = "template < typename T > bool func ( ) { }";
+            ASSERT_EQUALS(expected, tok(code));
+        }
+        {
+            const char code[] = "using A = bool;\n"
+                                "template<typename A> A func() {}\n";
+            const char expected[] = "template < typename A > A func ( ) { }";
+            ASSERT_EQUALS(expected, tok(code));
+        }
+        {
+            const char code[] = "using A = bool;\n"
+                                "template<typename T> class C { A x; }\n";
+            const char expected[] = "template < typename T > class C { bool x ; }";
+            ASSERT_EQUALS(expected, tok(code));
+        }
+        {
+            const char code[] = "using A = bool;\n"
+                                "template<typename A> class C { A x; }\n";
+            const char expected[] = "template < typename A > class C { A x ; }";
+            ASSERT_EQUALS(expected, tok(code));
+        }
     }
 
     void simplifyUsing8970() {