implements new unit tests for expression_tree_op_node class

Author: attwoodn

tests/CMakeLists.txt

@@ -1,7 +1,12 @@
 if(BUILD_TESTING) 
+    
+    add_executable( operators_test operators.cpp )
+    add_test( operators_test ${EXECUTABLE_OUTPUT_PATH}/operators_test )
+
     add_executable( expression_tree_leaf_node_test expression_tree_leaf_node.cpp )
     add_test( expression_tree_leaf_node_test ${EXECUTABLE_OUTPUT_PATH}/expression_tree_leaf_node_test )
 
-    add_executable( operators_test operators.cpp )
-    add_test( operators_test ${EXECUTABLE_OUTPUT_PATH}/operators_test )
+    add_executable( expression_tree_op_node_test expression_tree_op_node.cpp )
+    add_test( expression_tree_op_node_test ${EXECUTABLE_OUTPUT_PATH}/expression_tree_op_node_test )
+
 endif()

tests/expression_tree_leaf_node.cpp

@@ -1,21 +1,11 @@
 #include <attwoodn/expression_tree.hpp>
+#include "test_utils.hpp"
 #include <limits>
 #include <iostream>
 #include <cassert>
 
 using namespace attwoodn::expression_tree;
 
-struct test_fixture {
-    std::string some_string;
-    const std::string some_const_string = "this IS 4 T3s7 $tRing    ";
-    char* some_char_ptr;
-    uint16_t some_uint;
-
-    bool is_some_uint_greater_than_zero() const {
-        return some_uint;
-    }
-};
-
 void test_string_evaluation();
 void test_char_ptr_evaluation();
 void test_uint_evaluation();

tests/expression_tree_op_node.cpp

@@ -0,0 +1,66 @@
+#include <attwoodn/expression_tree.hpp>
+#include "test_utils.hpp"
+#include <limits>
+#include <iostream>
+#include <cassert>
+
+using namespace attwoodn::expression_tree;
+
+void test_one_layer_op_node_evaluation();
+
+int main(int argc, char** argv) {
+    test_one_layer_op_node_evaluation();
+
+    return EXIT_SUCCESS;
+}
+
+void test_one_layer_op_node_evaluation() {
+    auto child_expr1 = make_expr(&test_fixture::some_string, op::equals, std::string("hello, world!"));
+    auto child_expr2 = make_expr(&test_fixture::some_uint, op::less_than, (uint16_t) 500);
+
+    auto expr = make_op_node<test_fixture>(child_expr1, boolean_op::AND, child_expr2);
+    
+    test_fixture fixture;
+    fixture.some_string = "hello, world!";
+    fixture.some_uint = 499;
+    assert(expr->evaluate(fixture));
+
+    fixture.some_uint = 0;
+    assert(expr->evaluate(fixture));
+
+    fixture.some_uint = 1;
+    assert(expr->evaluate(fixture));
+
+    fixture.some_uint = 250;
+    assert(expr->evaluate(fixture));
+
+    fixture.some_uint = 435;
+    assert(expr->evaluate(fixture));
+
+    fixture.some_uint = 500;
+    assert(!expr->evaluate(fixture));
+    
+    fixture.some_uint = 501;
+    assert(!expr->evaluate(fixture));
+
+    fixture.some_uint = 9999;
+    assert(!expr->evaluate(fixture));
+
+    fixture.some_uint = std::numeric_limits<uint16_t>::max();
+    assert(!expr->evaluate(fixture));
+
+    fixture.some_uint = 499;
+    assert(expr->evaluate(fixture));
+
+    fixture.some_string = "hello!";
+    assert(!expr->evaluate(fixture));
+
+    fixture.some_string = "hello          world!";
+    assert(!expr->evaluate(fixture));
+
+    fixture.some_string = "hello,world!";
+    assert(!expr->evaluate(fixture));
+
+    fixture.some_string = "hello, world!";
+    assert(expr->evaluate(fixture));
+}

tests/test_utils.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <attwoodn/expression_tree.hpp>
+#include <string>
+
+namespace et = attwoodn::expression_tree;
+
+struct test_fixture {
+    std::string some_string;
+    const std::string some_const_string = "this IS 4 T3s7 $tRing    ";
+    char* some_char_ptr;
+    uint16_t some_uint;
+
+    bool is_some_uint_greater_than_zero() const {
+        return some_uint;
+    }
+};
+
+/**
+ * Helper function for creating inner expression tree nodes. I'm undecided if this should be included in the public API
+*/
+template<typename Obj, typename LeftChild, typename RightChild>
+et::node::expression_tree_op_node<Obj, LeftChild, RightChild>* make_op_node(LeftChild* left, et::boolean_op op, RightChild* right) {
+    auto node = new et::node::expression_tree_op_node<Obj, LeftChild, RightChild>(op);
+    node->set_left(left);
+    node->set_right(right);
+    return node;
+}