mike-lischke#132 Refactor test a little

Signed-off-by: vityaman <vityaman.dev@yandex.ru>
vityaman · Jul 31, 2024 · 5e06d07 · 5e06d07
1 parent 32a793c
commit 5e06d07
Showing 1 changed file with 25 additions and 24 deletions.
diff --git a/ports/cpp/test/cpp14/Cpp14Test.cpp b/ports/cpp/test/cpp14/Cpp14Test.cpp
@@ -196,6 +196,23 @@ TEST(CPP14Parser, SimpleExample) {  // NOLINT: complexity
         CPP14Parser::RulePrimaryexpression,
     };
 
+    const auto classnameStack = [&] {
+      auto stack = idexpressionStack;
+      stack.pop_back();
+      stack.emplace_back(CPP14Parser::RuleSimpletypespecifier);
+      stack.emplace_back(CPP14Parser::RuleNestednamespecifier);
+      stack.emplace_back(CPP14Parser::RuleTypename);
+      return stack;
+    }();
+
+    const auto namespacenameStack = [&] {
+      auto stack = idexpressionStack;
+      stack.pop_back();
+      stack.emplace_back(CPP14Parser::RuleSimpletypespecifier);
+      stack.emplace_back(CPP14Parser::RuleNestednamespecifier);
+      return stack;
+    }();
+
     EXPECT_THAT(
         Keys(candidates.rules),
         UnorderedElementsAre(
@@ -210,30 +227,14 @@ TEST(CPP14Parser, SimpleExample) {  // NOLINT: complexity
         ElementsAreArray(idexpressionStack)
     );
 
-    EXPECT_THAT(candidates.rules[CPP14Parser::RuleClassname].ruleList, ElementsAreArray([&] {
-                  auto stack = idexpressionStack;
-                  stack.pop_back();
-                  for (auto rule : {
-                           CPP14Parser::RuleSimpletypespecifier,
-                           CPP14Parser::RuleNestednamespecifier,
-                           CPP14Parser::RuleTypename,
-                       }) {
-                    stack.emplace_back(rule);
-                  }
-                  return stack;
-                }()));
-
-    EXPECT_THAT(candidates.rules[CPP14Parser::RuleNamespacename].ruleList, ElementsAreArray([&] {
-                  auto stack = idexpressionStack;
-                  stack.pop_back();
-                  for (auto rule : {
-                           CPP14Parser::RuleSimpletypespecifier,
-                           CPP14Parser::RuleNestednamespecifier,
-                       }) {
-                    stack.emplace_back(rule);
-                  }
-                  return stack;
-                }()));
+    EXPECT_THAT(
+        candidates.rules[CPP14Parser::RuleClassname].ruleList, ElementsAreArray(classnameStack)
+    );
+
+    EXPECT_THAT(
+        candidates.rules[CPP14Parser::RuleNamespacename].ruleList,
+        ElementsAreArray(namespacenameStack)
+    );
   }
   {
     // 2) Within the method body.