Implement tests for construct query parsing

CMakeLists.txt

@@ -109,10 +109,11 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 
 ################################
-# GTEST
+# GTEST AND GMOCK
 ################################
-add_subdirectory(third_party/googletest/googletest EXCLUDE_FROM_ALL)
+add_subdirectory(third_party/googletest EXCLUDE_FROM_ALL)
 include_directories(third_party/googletest/googletest/include)
+include_directories(third_party/googletest/googlemock/include)
 
 ################################
 # NLOHNMANN-JSON

src/parser/SparqlParser.cpp

@@ -95,7 +95,7 @@ void SparqlParser::parseQuery(ParsedQuery* query, QueryType queryType) {
       for (const auto& triple : constructClause) {
         for (const auto& varOrTerm : triple) {
           if (auto variable = std::get_if<Variable>(&varOrTerm)) {
-            const auto& var = variable->getName();
+            const auto& var = variable->name();
             if (std::find(query->_groupByVariables.begin(),
                           query->_groupByVariables.end(),
                           var) == query->_groupByVariables.end()) {

src/parser/data/BlankNode.h

@@ -18,7 +18,20 @@ class BlankNode {
 
  public:
   BlankNode(bool generated, std::string label)
-      : _generated{generated}, _label{std::move(label)} {}
+      : _generated{generated}, _label{std::move(label)} {
+    // roughly check allowed characters as blank node labels.
+    // Weaker than the SPARQL grammar, but good
+    // enough so that it will likely never be an issue
+    AD_CHECK(ctre::match<"\\w(?:(?:\\w|-|\\.)*\\w)?">(_label));
+  }
+
+  // ___________________________________________________________________________
+  // Used for testing
+  [[nodiscard]] bool isGenerated() const { return _generated; }
+
+  // ___________________________________________________________________________
+  // Used for testing
+  [[nodiscard]] const std::string& label() const { return _label; }
 
   // ___________________________________________________________________________
   [[nodiscard]] std::optional<std::string> evaluate(

src/parser/data/Iri.h

@@ -14,11 +14,14 @@ class Iri {
 
  public:
   explicit Iri(std::string str) : _string{std::move(str)} {
-    AD_CHECK(ctre::match<
-             "(?:@[a-zA-Z]+(?:-(?:[a-zA-Z]|\\d)+)*@)?(?:<.+>|[^:]+:[^:]+)">(
-        _string));
+    AD_CHECK(ctre::match<"(?:@[a-zA-Z]+(?:-(?:[a-zA-Z]|\\d)+)*@)?"
+                         "<[^<>\"{}|^\\\\`\\0- ]*>">(_string));
   }
 
+  // ___________________________________________________________________________
+  // Used for testing
+  [[nodiscard]] const std::string& iri() const { return _string; }
+
   // ___________________________________________________________________________
   [[nodiscard]] std::optional<std::string> evaluate(
       [[maybe_unused]] const Context& context,

src/parser/data/Literal.h

@@ -7,19 +7,36 @@
 #include <sstream>
 #include <string>
 
+#include "../../util/Concepts.h"
+
 class Literal {
   std::string _stringRepresentation;
 
-  template <typename T>
+  template <Streamable T>
   static std::string toString(const T& t) {
     std::ostringstream stream;
     stream << t;
     return stream.str();
   }
 
+  static std::string toString(bool boolean) {
+    return boolean ? "true" : "false";
+  }
+
  public:
-  explicit Literal(auto&& t)
-      : _stringRepresentation(toString(std::forward<decltype(t)>(t))) {}
+  template <Streamable T>
+  explicit Literal(T&& t)
+      : _stringRepresentation(toString(std::forward<T>(t))) {}
+
+  static_assert(!Streamable<Literal>,
+                "If Literal satisfies the Streamable concept, copy and move "
+                "constructors are hidden, leading to unexpected behaviour");
+
+  // ___________________________________________________________________________
+  // Used for testing
+  [[nodiscard]] const std::string& literal() const {
+    return _stringRepresentation;
+  }
 
   // ___________________________________________________________________________
   [[nodiscard]] std::optional<std::string> evaluate(

src/parser/data/Variable.h

@@ -15,14 +15,12 @@ class Variable {
 
  public:
   explicit Variable(std::string name) : _name{std::move(name)} {
-    // Verify variable name is not empty
-    AD_CHECK(_name.length() > 1);
+    // verify variable name starts with ? or $ and continues without any
+    // special characters. This is weaker than the SPARQL grammar,
+    // but it is close enough so that it will likely never cause issues.
+    AD_CHECK(ctre::match<"[$?]\\w+">(_name));
     // normalise notation for consistency
-    if (_name[0] == '$') {
-      _name[0] = '?';
-    }
-    // variables have to start with ?
-    AD_CHECK(_name[0] == '?');
+    _name[0] = '?';
   }
 
   // ___________________________________________________________________________
@@ -77,5 +75,5 @@ class Variable {
   [[nodiscard]] std::string toSparql() const { return _name; }
 
   // ___________________________________________________________________________
-  [[nodiscard]] const std::string& getName() const { return _name; }
+  [[nodiscard]] const std::string& name() const { return _name; }
 };

src/util/Concepts.h

@@ -0,0 +1,16 @@
+// Copyright 2022, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Author: Robin Textor-Falconi (textorr@informatik.uni-freiburg.de)
+
+#pragma once
+
+#include <sstream>
+
+/**
+ * A concept to ensure objects can be formatted by std::ostream.
+ * @tparam T The Type to be formatted
+ */
+template <typename T>
+concept Streamable = requires(T x, std::ostream& os) {
+  os << x;
+};

src/util/TypeTraits.h

@@ -52,6 +52,15 @@ struct TupleToVariantImpl<std::tuple<Ts...>> {
   using type = std::variant<Ts...>;
 };
 
+template <typename, typename... Ts>
+struct LastT : LastT<Ts...> {};
+
+template <typename T>
+struct LastT<T> : public std::type_identity<T> {};
+
+template <typename T, typename...>
+struct FirstWrapper : public std::type_identity<T> {};
+
 }  // namespace detail
 
 /// isInstantiation<SomeTemplate, SomeType> is true iff `SomeType` is an
@@ -97,9 +106,9 @@ constexpr static bool isTypeContainedIn<T, std::variant<Ts...>> = (... || isSimi
 template <typename T, typename... Ts>
 constexpr static bool isTypeContainedIn<T, std::pair<Ts...>> = (... || isSimilar<T, Ts>);
 
-/// A templated bool that is always false, independent of the template parameter
-/// T.
-template <typename T>
+/// A templated bool that is always false,
+/// independent of the template parameter.
+template <typename>
 constexpr static bool alwaysFalse = false;
 
 /// From the type Tuple (std::tuple<A, B, C....>) creates the type
@@ -159,4 +168,10 @@ auto applyFunctionToEachElementOfTuple(Function&& f, Tuple&& tuple) {
   return std::apply(transformer, std::forward<Tuple>(tuple));
 }
 
+template <typename... Ts>
+using Last = typename detail::LastT<Ts...>::type;
+
+template <typename... Ts>
+using First = typename detail::FirstWrapper<Ts...>::type;
+
 }  // namespace ad_utility

src/util/streamable_generator.h

@@ -9,20 +9,12 @@
 
 // Coroutines are still experimental in clang libcpp, therefore
 // adapt the appropriate namespaces using the convenience header.
+#include "./Concepts.h"
 #include "./Coroutines.h"
 #include "./ostringstream.h"
 
 namespace ad_utility::stream_generator {
 
-/**
- * A concept to ensure objects can be formatted by std::ostream.
- * @tparam T The Type to be formatted
- */
-template <typename T>
-concept Streamable = requires(T x, std::ostream& os) {
-  os << x;
-};
-
 template <size_t MIN_BUFFER_SIZE>
 class basic_stream_generator;
 

test/CMakeLists.txt

@@ -164,7 +164,7 @@ target_link_libraries(SortPerformanceEstimatorTest gtest_main SortPerformanceEst
 #add_test(SortPerformanceEstimatorTest SortPerformanceEstimatorTest)
 
 add_executable(SparqlAntlrParserTest SparqlAntlrParserTest.cpp)
-target_link_libraries(SparqlAntlrParserTest gtest_main parser sparqlExpressions ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(SparqlAntlrParserTest gmock_main parser sparqlExpressions ${CMAKE_THREAD_LIBS_INIT})
 add_test(SparqlAntlrParserTest SparqlAntlrParserTest)
 
 add_executable(SerializerTest SerializerTest.cpp)
@@ -220,3 +220,7 @@ add_test(RdfEscapingTest RdfEscapingTest)
 add_executable(CompactStringVectorTest CompactStringVectorTest.cpp)
 target_link_libraries(CompactStringVectorTest gtest_main ${CMAKE_THREAD_LIBS_INIT})
 add_test(CompactStringVectorTest CompactStringVectorTest)
+
+add_executable(SparqlDataTypesTest SparqlDataTypesTest.cpp)
+target_link_libraries(SparqlDataTypesTest gmock_main engine ${CMAKE_THREAD_LIBS_INIT})
+add_test(SparqlDataTypesTest SparqlDataTypesTest)