[PATCH] D98514: [RGT] Fix ASTMatchersTest so all assertions are executed

[Paul Robinson via Phabricator via cfe-commits]

probinson created this revision.
probinson added a reviewer: Prazek.
probinson requested review of this revision.
Herald added a project: clang.

Some 'if' conditions turn out always to be false, so change test
expectations to match.

Found by the Rotten Green Tests project.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D98514

Files:
  clang/unittests/ASTMatchers/ASTMatchersTest.h


Index: clang/unittests/ASTMatchers/ASTMatchersTest.h
===
--- clang/unittests/ASTMatchers/ASTMatchersTest.h
+++ clang/unittests/ASTMatchers/ASTMatchersTest.h
@@ -372,12 +372,8 @@
 ExpectedName(std::string(ExpectedName)) {}
 
   void onEndOfTranslationUnit() override {
-if (ExpectedCount != -1) {
-  EXPECT_EQ(ExpectedCount, Count);
-}
-if (!ExpectedName.empty()) {
-  EXPECT_EQ(ExpectedName, Name);
-}
+EXPECT_EQ(ExpectedCount, -1);
+EXPECT_TRUE(ExpectedName.empty());
 Count = 0;
 Name.clear();
   }
@@ -389,25 +385,21 @@
 
   bool run(const BoundNodes *Nodes) override {
 const BoundNodes::IDToNodeMap &M = Nodes->getMap();
-if (Nodes->getNodeAs(Id)) {
-  ++Count;
-  if (const NamedDecl *Named = Nodes->getNodeAs(Id)) {
-Name = Named->getNameAsString();
-  } else if (const NestedNameSpecifier *NNS =
- Nodes->getNodeAs(Id)) {
-llvm::raw_string_ostream OS(Name);
-NNS->print(OS, PrintingPolicy(LangOptions()));
-  }
-  BoundNodes::IDToNodeMap::const_iterator I = M.find(Id);
-  EXPECT_NE(M.end(), I);
-  if (I != M.end()) {
-EXPECT_EQ(Nodes->getNodeAs(Id), I->second.get());
-  }
-  return true;
+EXPECT_NE(Nodes->getNodeAs(Id), nullptr);
+++Count;
+if (const NamedDecl *Named = Nodes->getNodeAs(Id)) {
+  Name = Named->getNameAsString();
+} else if (const NestedNameSpecifier *NNS =
+   Nodes->getNodeAs(Id)) {
+  llvm::raw_string_ostream OS(Name);
+  NNS->print(OS, PrintingPolicy(LangOptions()));
+}
+BoundNodes::IDToNodeMap::const_iterator I = M.find(Id);
+EXPECT_NE(M.end(), I);
+if (I != M.end()) {
+  EXPECT_EQ(Nodes->getNodeAs(Id), I->second.get());
 }
-EXPECT_TRUE(M.count(Id) == 0 ||
-M.find(Id)->second.template get() == nullptr);
-return false;
+return true;
   }
 
   bool run(const BoundNodes *Nodes, ASTContext *Context) override {


Index: clang/unittests/ASTMatchers/ASTMatchersTest.h
===
--- clang/unittests/ASTMatchers/ASTMatchersTest.h
+++ clang/unittests/ASTMatchers/ASTMatchersTest.h
@@ -372,12 +372,8 @@
 ExpectedName(std::string(ExpectedName)) {}
 
   void onEndOfTranslationUnit() override {
-if (ExpectedCount != -1) {
-  EXPECT_EQ(ExpectedCount, Count);
-}
-if (!ExpectedName.empty()) {
-  EXPECT_EQ(ExpectedName, Name);
-}
+EXPECT_EQ(ExpectedCount, -1);
+EXPECT_TRUE(ExpectedName.empty());
 Count = 0;
 Name.clear();
   }
@@ -389,25 +385,21 @@
 
   bool run(const BoundNodes *Nodes) override {
 const BoundNodes::IDToNodeMap &M = Nodes->getMap();
-if (Nodes->getNodeAs(Id)) {
-  ++Count;
-  if (const NamedDecl *Named = Nodes->getNodeAs(Id)) {
-Name = Named->getNameAsString();
-  } else if (const NestedNameSpecifier *NNS =
- Nodes->getNodeAs(Id)) {
-llvm::raw_string_ostream OS(Name);
-NNS->print(OS, PrintingPolicy(LangOptions()));
-  }
-  BoundNodes::IDToNodeMap::const_iterator I = M.find(Id);
-  EXPECT_NE(M.end(), I);
-  if (I != M.end()) {
-EXPECT_EQ(Nodes->getNodeAs(Id), I->second.get());
-  }
-  return true;
+EXPECT_NE(Nodes->getNodeAs(Id), nullptr);
+++Count;
+if (const NamedDecl *Named = Nodes->getNodeAs(Id)) {
+  Name = Named->getNameAsString();
+} else if (const NestedNameSpecifier *NNS =
+   Nodes->getNodeAs(Id)) {
+  llvm::raw_string_ostream OS(Name);
+  NNS->print(OS, PrintingPolicy(LangOptions()));
+}
+BoundNodes::IDToNodeMap::const_iterator I = M.find(Id);
+EXPECT_NE(M.end(), I);
+if (I != M.end()) {
+  EXPECT_EQ(Nodes->getNodeAs(Id), I->second.get());
 }
-EXPECT_TRUE(M.count(Id) == 0 ||
-M.find(Id)->second.template get() == nullptr);
-return false;
+return true;
   }
 
   bool run(const BoundNodes *Nodes, ASTContext *Context) override {
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D98514: [RGT] Fix ASTMatchersTest so all assertions are executed

[Paul Robinson via Phabricator via cfe-commits]

probinson added a reviewer: gribozavr.
probinson added a comment.

+gribozavr who has been in this file most recently


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D98514/new/

https://reviews.llvm.org/D98514

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D98514: [RGT] Fix ASTMatchersTest so all assertions are executed

[Paul Robinson via Phabricator via cfe-commits]

probinson abandoned this revision.
probinson added a comment.

Problem has gone away, test assertions are now executed.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D98514/new/

https://reviews.llvm.org/D98514

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits