Final touch up

test/SparqlAntlrParserTest.cpp

@@ -1695,7 +1695,7 @@ TEST(SparqlParser, UpdateQuery) {
   expectUpdateFails("INSERT DATA { ?a ?b ?c }");
   expectUpdateFails("WITH <foo> DELETE { ?a ?b ?c } WHERE { ?a ?b ?c }");
   expectUpdateFails("DELETE { ?a ?b ?c } USING <foo> WHERE { ?a ?b ?c }");
-  expectUpdateFails("INSERT DATA { GRAPH <foo> }");
+  expectUpdateFails("INSERT DATA { GRAPH <foo> { } }");
   // Unsupported features.
   expectUpdateFails(
       "INSERT DATA { <a> <b> <c> } ; INSERT { ?a <b> <c> } WHERE { <d> <e> ?a "
@@ -1724,3 +1724,12 @@ TEST(SparqlParser, GraphOrDefault) {
       testing::VariantWith<GraphRef>(AD_PROPERTY(
           TripleComponent::Iri, toStringRepresentation, testing::Eq("<foo>"))));
 }
+
+TEST(SparqlParser, GraphRef) {
+  auto expectGraphRefAll = ExpectCompleteParse<&Parser::graphRefAll>{
+      {{INTERNAL_PREDICATE_PREFIX_NAME, INTERNAL_PREDICATE_PREFIX_IRI}}};
+  expectGraphRefAll("DEFAULT", m::Variant<DEFAULT>());
+  expectGraphRefAll("NAMED", m::Variant<NAMED>());
+  expectGraphRefAll("ALL", m::Variant<ALL>());
+  expectGraphRefAll("GRAPH <foo>", m::GraphRefIri("<foo>"));
+}

test/SparqlAntlrParserTestHelpers.h

@@ -852,4 +852,12 @@ inline auto UpdateQuery =
       RootGraphPattern(graphPatternMatcher));
 };
 
+template <typename T>
+auto inline Variant = []() { return testing::VariantWith<T>(testing::_); };
+
+auto inline GraphRefIri = [](const string& iri) {
+  return testing::VariantWith<GraphRef>(AD_PROPERTY(
+      TripleComponent::Iri, toStringRepresentation, testing::Eq(iri)));
+};
+
 }  // namespace matchers