Skip to content

Commit

Permalink
Prefer using directives for commonly used gmock matchers
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobinTF
RobinTF committed Jan 23, 2022
1 parent c58af5f commit 153a863
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 47 deletions.
64 changes: 26 additions & 38 deletions test/SparqlAntlrParserTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ auto rest = "<http://www.w3.org/1999/02/22-rdf-syntax-ns#rest>";
auto type = "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>";

using ::testing::ElementsAre;
using ::testing::IsEmpty;
using ::testing::SizeIs;

TEST(SparqlParser, NumericLiterals) {
testNumericLiteral("3.0", 3.0);
Expand Down Expand Up @@ -160,7 +162,7 @@ TEST(SparqlParser, ComplexConstructQuery) {
auto triples = p.parser.constructQuery()
->accept(&p.visitor)
.as<ad_utility::sparql_types::Triples>();
ASSERT_THAT(triples, ::testing::SizeIs(11));
ASSERT_THAT(triples, SizeIs(11));
auto something =
"<http://wallscope.co.uk/resource/olympics/medal/#something>";
auto somethingElse =
Expand Down Expand Up @@ -269,9 +271,7 @@ TEST(SparqlParser, RdfCollectionSingleVar) {
EXPECT_THAT(node.first, IsBlankNode(true, "0"));

const auto& triples = node.second;
ASSERT_THAT(triples, ::testing::SizeIs(2));

using ::testing::ElementsAre;
ASSERT_THAT(triples, SizeIs(2));

EXPECT_THAT(triples[0], ElementsAre(IsBlankNode(true, "0"), //
IsIri(first), //
Expand All @@ -292,9 +292,7 @@ TEST(SparqlParser, RdfCollectionTripleVar) {
EXPECT_THAT(node.first, IsBlankNode(true, "2"));

const auto& triples = node.second;
ASSERT_THAT(triples, ::testing::SizeIs(6));

using ::testing::ElementsAre;
ASSERT_THAT(triples, SizeIs(6));

EXPECT_THAT(triples[0], ElementsAre(IsBlankNode(true, "0"), //
IsIri(first), //
Expand Down Expand Up @@ -344,7 +342,7 @@ TEST(SparqlParser, ConstructTemplateEmpty) {
auto triples = p.parser.constructTemplate()
->accept(&p.visitor)
.as<ad_utility::sparql_types::Triples>();
ASSERT_THAT(triples, ::testing::IsEmpty());
ASSERT_THAT(triples, IsEmpty());
}

TEST(SparqlParser, ConstructTriplesSingletonWithTerminator) {
Expand All @@ -354,9 +352,8 @@ TEST(SparqlParser, ConstructTriplesSingletonWithTerminator) {
auto triples = p.parser.constructTriples()
->accept(&p.visitor)
.as<ad_utility::sparql_types::Triples>();
ASSERT_THAT(triples, ::testing::SizeIs(1));
ASSERT_THAT(triples, SizeIs(1));

using ::testing::ElementsAre;
EXPECT_THAT(triples[0], ElementsAre(IsVariable("?a"), //
IsVariable("?a"), //
IsVariable("?a")));
Expand All @@ -369,9 +366,8 @@ TEST(SparqlParser, ConstructTriplesWithTerminator) {
auto triples = p.parser.constructTriples()
->accept(&p.visitor)
.as<ad_utility::sparql_types::Triples>();
ASSERT_THAT(triples, ::testing::SizeIs(3));
ASSERT_THAT(triples, SizeIs(3));

using ::testing::ElementsAre;
EXPECT_THAT(triples[0], ElementsAre(IsVariable("?a"), //
IsVariable("?a"), //
IsVariable("?a")));
Expand All @@ -392,9 +388,8 @@ TEST(SparqlParser, TriplesSameSubjectVarOrTerm) {
auto triples = p.parser.constructTriples()
->accept(&p.visitor)
.as<ad_utility::sparql_types::Triples>();
ASSERT_THAT(triples, ::testing::SizeIs(1));
ASSERT_THAT(triples, SizeIs(1));

using ::testing::ElementsAre;
EXPECT_THAT(triples[0], ElementsAre(IsVariable("?a"), //
IsVariable("?a"), //
IsVariable("?a")));
Expand All @@ -407,9 +402,8 @@ TEST(SparqlParser, TriplesSameSubjectTriplesNodeWithPropertyList) {
auto triples = p.parser.triplesSameSubject()
->accept(&p.visitor)
.as<ad_utility::sparql_types::Triples>();
ASSERT_THAT(triples, ::testing::SizeIs(3));
ASSERT_THAT(triples, SizeIs(3));

using ::testing::ElementsAre;
EXPECT_THAT(triples[0], ElementsAre(IsBlankNode(true, "0"), //
IsIri(first), //
IsVariable("?a")));
Expand All @@ -430,9 +424,8 @@ TEST(SparqlParser, TriplesSameSubjectTriplesNodeEmptyPropertyList) {
auto triples = p.parser.triplesSameSubject()
->accept(&p.visitor)
.as<ad_utility::sparql_types::Triples>();
ASSERT_THAT(triples, ::testing::SizeIs(2));
ASSERT_THAT(triples, SizeIs(2));

using ::testing::ElementsAre;
EXPECT_THAT(triples[0], ElementsAre(IsBlankNode(true, "0"), //
IsIri(first), //
IsVariable("?a")));
Expand All @@ -449,12 +442,11 @@ TEST(SparqlParser, PropertyList) {
auto propertyList = p.parser.propertyList()
->accept(&p.visitor)
.as<ad_utility::sparql_types::PropertyList>();
EXPECT_THAT(propertyList.second, ::testing::IsEmpty());
EXPECT_THAT(propertyList.second, IsEmpty());

const auto& tuples = propertyList.first;
ASSERT_THAT(tuples, ::testing::SizeIs(1));
ASSERT_THAT(tuples, SizeIs(1));

using ::testing::ElementsAre;
EXPECT_THAT(tuples[0], ElementsAre(IsIri(type), IsVariable("?a")));
}

Expand All @@ -464,8 +456,8 @@ TEST(SparqlParser, EmptyPropertyList) {
auto propertyList = p.parser.propertyList()
->accept(&p.visitor)
.as<ad_utility::sparql_types::PropertyList>();
ASSERT_THAT(propertyList.first, ::testing::IsEmpty());
ASSERT_THAT(propertyList.second, ::testing::IsEmpty());
ASSERT_THAT(propertyList.first, IsEmpty());
ASSERT_THAT(propertyList.second, IsEmpty());
}

TEST(SparqlParser, PropertyListNotEmptySingletonWithTerminator) {
Expand All @@ -475,12 +467,11 @@ TEST(SparqlParser, PropertyListNotEmptySingletonWithTerminator) {
auto propertyList = p.parser.propertyListNotEmpty()
->accept(&p.visitor)
.as<ad_utility::sparql_types::PropertyList>();
EXPECT_THAT(propertyList.second, ::testing::IsEmpty());
EXPECT_THAT(propertyList.second, IsEmpty());

const auto& tuples = propertyList.first;
ASSERT_THAT(tuples, ::testing::SizeIs(1));
ASSERT_THAT(tuples, SizeIs(1));

using ::testing::ElementsAre;
EXPECT_THAT(tuples[0], ElementsAre(IsIri(type), IsVariable("?a")));
}

Expand All @@ -491,12 +482,11 @@ TEST(SparqlParser, PropertyListNotEmptyWithTerminator) {
auto propertyList = p.parser.propertyListNotEmpty()
->accept(&p.visitor)
.as<ad_utility::sparql_types::PropertyList>();
EXPECT_THAT(propertyList.second, ::testing::IsEmpty());
EXPECT_THAT(propertyList.second, IsEmpty());

const auto& tuples = propertyList.first;
ASSERT_THAT(tuples, ::testing::SizeIs(3));
ASSERT_THAT(tuples, SizeIs(3));

using ::testing::ElementsAre;
EXPECT_THAT(tuples[0], ElementsAre(IsIri(type), IsVariable("?a")));
EXPECT_THAT(tuples[1], ElementsAre(IsIri(type), IsVariable("?b")));
EXPECT_THAT(tuples[2], ElementsAre(IsIri(type), IsVariable("?c")));
Expand Down Expand Up @@ -525,10 +515,10 @@ TEST(SparqlParser, ObjectListSingleton) {
auto objectList = p.parser.objectList()
->accept(&p.visitor)
.as<ad_utility::sparql_types::ObjectList>();
EXPECT_THAT(objectList.second, ::testing::IsEmpty());
EXPECT_THAT(objectList.second, IsEmpty());

const auto& objects = objectList.first;
ASSERT_THAT(objects, ::testing::SizeIs(1));
ASSERT_THAT(objects, SizeIs(1));
ASSERT_THAT(objects[0], IsVariable("?a"));
}

Expand All @@ -539,10 +529,10 @@ TEST(SparqlParser, ObjectList) {
auto objectList = p.parser.objectList()
->accept(&p.visitor)
.as<ad_utility::sparql_types::ObjectList>();
EXPECT_THAT(objectList.second, ::testing::IsEmpty());
EXPECT_THAT(objectList.second, IsEmpty());

const auto& objects = objectList.first;
ASSERT_THAT(objects, ::testing::SizeIs(3));
ASSERT_THAT(objects, SizeIs(3));
ASSERT_THAT(objects[0], IsVariable("?a"));
ASSERT_THAT(objects[1], IsVariable("?b"));
ASSERT_THAT(objects[2], IsVariable("?c"));
Expand All @@ -558,9 +548,8 @@ TEST(SparqlParser, BlankNodePropertyList) {
EXPECT_THAT(node.first, IsBlankNode(true, "0"));

const auto& triples = node.second;
ASSERT_THAT(triples, ::testing::SizeIs(3));
ASSERT_THAT(triples, SizeIs(3));

using ::testing::ElementsAre;
EXPECT_THAT(triples[0], ElementsAre(IsBlankNode(true, "0"), //
IsIri(type), //
IsVariable("?a")));
Expand All @@ -582,7 +571,7 @@ TEST(SparqlParser, GraphNodeVarOrTerm) {
->accept(&p.visitor)
.as<ad_utility::sparql_types::Node>();
EXPECT_THAT(node.first, IsVariable("?a"));
EXPECT_THAT(node.second, ::testing::IsEmpty());
EXPECT_THAT(node.second, IsEmpty());
}

TEST(SparqlParser, GraphNodeTriplesNode) {
Expand All @@ -595,9 +584,8 @@ TEST(SparqlParser, GraphNodeTriplesNode) {
EXPECT_THAT(node.first, IsBlankNode(true, "0"));

const auto& triples = node.second;
ASSERT_THAT(triples, ::testing::SizeIs(2));
ASSERT_THAT(triples, SizeIs(2));

using ::testing::ElementsAre;
EXPECT_THAT(triples[0], ElementsAre(IsBlankNode(true, "0"), //
IsIri(first), //
IsVariable("?a")));
Expand Down
13 changes: 4 additions & 9 deletions test/SparqlDataTypesTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "../src/parser/data/VarOrTerm.h"

using namespace std::string_literals;
using ::testing::Optional;

ad_utility::AllocatorWithLimit<Id>& allocator() {
static ad_utility::AllocatorWithLimit<Id> a{
Expand Down Expand Up @@ -37,7 +38,6 @@ TEST(SparqlDataTypesTest, BlankNodeInvalidLabelsThrowException) {
}

TEST(SparqlDataTypesTest, BlankNodeEvaluatesCorrectlyBasedOnContext) {
using ::testing::Optional;
auto wrapper = prepareContext();

BlankNode blankNodeA{false, "a"};
Expand Down Expand Up @@ -67,7 +67,7 @@ TEST(SparqlDataTypesTest, BlankNodeEvaluateIsPropagatedCorrectly) {
BlankNode blankNode{false, "label"};
Context context = wrapper.createContextForRow(42);

auto expectedLabel = ::testing::Optional("_:u42_label"s);
auto expectedLabel = Optional("_:u42_label"s);

EXPECT_THAT(blankNode.evaluate(context, SUBJECT), expectedLabel);
EXPECT_THAT(GraphTerm{blankNode}.evaluate(context, SUBJECT), expectedLabel);
Expand Down Expand Up @@ -101,7 +101,6 @@ TEST(SparqlDataTypesTest, IriValidIriIsPreserved) {
}

TEST(SparqlDataTypesTest, IriEvaluatesCorrectlyBasedOnContext) {
using ::testing::Optional;
auto wrapper = prepareContext();

std::string iriString{"<http://some-iri>"};
Expand All @@ -125,7 +124,7 @@ TEST(SparqlDataTypesTest, IriEvaluateIsPropagatedCorrectly) {
Iri iri{"<http://some-iri>"};
Context context = wrapper.createContextForRow(42);

auto expectedString = ::testing::Optional("<http://some-iri>"s);
auto expectedString = Optional("<http://some-iri>"s);

EXPECT_THAT(iri.evaluate(context, SUBJECT), expectedString);
EXPECT_THAT(GraphTerm{iri}.evaluate(context, SUBJECT), expectedString);
Expand All @@ -151,7 +150,6 @@ TEST(SparqlDataTypesTest, LiteralNumberIsCorrectlyFormatted) {
}

TEST(SparqlDataTypesTest, LiteralEvaluatesCorrectlyBasedOnContext) {
using ::testing::Optional;
auto wrapper = prepareContext();

std::string literalString{"true"};
Expand Down Expand Up @@ -180,7 +178,7 @@ TEST(SparqlDataTypesTest, LiteralEvaluateIsPropagatedCorrectly) {
EXPECT_EQ(VarOrTerm{GraphTerm{literal}}.evaluate(context, SUBJECT),
std::nullopt);

auto expectedString = ::testing::Optional("some literal"s);
auto expectedString = Optional("some literal"s);

EXPECT_THAT(literal.evaluate(context, OBJECT), expectedString);
EXPECT_THAT(GraphTerm{literal}.evaluate(context, OBJECT), expectedString);
Expand All @@ -205,7 +203,6 @@ TEST(SparqlDataTypesTest, VariableInvalidNamesThrowException) {
}

TEST(SparqlDataTypesTest, VariableEvaluatesCorrectlyBasedOnContext) {
using ::testing::Optional;
auto wrapper = prepareContext();

wrapper._hashMap["?var"] = 0;
Expand All @@ -231,7 +228,6 @@ TEST(SparqlDataTypesTest, VariableEvaluatesCorrectlyBasedOnContext) {
}

TEST(SparqlDataTypesTest, VariableEvaluatesNothingForUnusedName) {
using ::testing::Optional;
auto wrapper = prepareContext();

Variable variable{"?var"};
Expand All @@ -249,7 +245,6 @@ TEST(SparqlDataTypesTest, VariableEvaluatesNothingForUnusedName) {
}

TEST(SparqlDataTypesTest, VariableEvaluateIsPropagatedCorrectly) {
using ::testing::Optional;
auto wrapper = prepareContext();

wrapper._hashMap["?var"] = 0;
Expand Down

0 comments on commit 153a863

Please sign in to comment.