More tests.

Author: 5cript

interval_tree.hpp

@@ -169,11 +169,11 @@ namespace lib_interval_tree
             return {std::min(low_, other.low_), std::max(high_, other.high_)};
         }
 
-#ifdef PUBLICIZE
+#ifdef LIB_INTERVAL_TREE_PUBLICIZE
     public:
 #else
     private:
-#endif // PUBLICIZE
+#endif // LIB_INTERVAL_TREE_PUBLICIZE
         value_type low_;
         value_type high_;
     };
@@ -254,11 +254,11 @@ namespace lib_interval_tree
             }
         }
 
-#ifdef PUBLICIZE
+#ifdef LIB_INTERVAL_TREE_PUBLICIZE
     public:
 #else
     private:
-#endif // PUBLICIZE
+#endif // LIB_INTERVAL_TREE_PUBLICIZE
         interval_type interval_;
         value_type max_;
         node* parent_;
@@ -305,11 +305,11 @@ namespace lib_interval_tree
         {
         }
 
-#ifdef PUBLICIZE
+#ifdef LIB_INTERVAL_TREE_PUBLICIZE
     public:
 #else
     protected:
-#endif // PUBLICIZE
+#endif // LIB_INTERVAL_TREE_PUBLICIZE
         node_ptr_t node_;
         owner_type owner_;
     };
@@ -1205,11 +1205,11 @@ namespace lib_interval_tree
             x->color_ = rb_color::black;
         }
 
-#ifdef PUBLICIZE
+#ifdef LIB_INTERVAL_TREE_PUBLICIZE
     public:
 #else
     private:
-#endif // PUBLICIZE
+#endif // LIB_INTERVAL_TREE_PUBLICIZE
         node_type* root_;
         size_type size_;
     };

tests/insert_tests.hpp

@@ -28,8 +28,14 @@ TEST_F(InsertTests, InsertIntoEmpty2)
 
 TEST_F(InsertTests, InsertMultipleIntoEmpty)
 {
-    tree.insert({0, 16});
-    tree.insert({5, 13});
+    auto firstInterval = types::interval_type{0, 16};
+    auto secondInterval = types::interval_type{5, 13};
+
+    tree.insert(firstInterval);
+    tree.insert(secondInterval);
 
     EXPECT_EQ(tree.size(), 2);
+
+    EXPECT_EQ(*tree.begin(), firstInterval);
+    EXPECT_EQ(*(++tree.begin()), secondInterval);
 }

tests/interval_tests.hpp

@@ -81,6 +81,21 @@ TEST_F(IntervalTests, TestLimits)
     EXPECT_EQ(ival.high(), std::numeric_limits<types::value_type>::max());
 }
 
+TEST_F(IntervalTests, TestIntervalSize)
+{
+    auto ival = types::interval_type{0, 5};
+    EXPECT_EQ(ival.size(), 5);
+
+    auto ival2 = types::interval_type{-21, 5};
+    EXPECT_EQ(ival2.size(), 26);
+
+    auto ival3 = types::interval_type{-20, -5};
+    EXPECT_EQ(ival3.size(), 15);
+
+    auto ival4 = types::interval_type{100, 125};
+    EXPECT_EQ(ival4.size(), 25);
+}
+
 TEST_F(OverlapTests, ShallOverlapItself)
 {
     auto base = types::interval_type{0, 5};
@@ -212,7 +227,34 @@ TEST_F(ContainmentTests, ExpectIntervalNotWithinOther)
 TEST_F(DistanceTests, DistanceIsZeroOnOverlap)
 {
     auto base = types::interval_type{-35, 96};
-
     auto other = types::interval_type{-20, 600};
     EXPECT_EQ(base - other, 0);
 }
+
+TEST_F(DistanceTests, DistanceLeftSide)
+{
+    auto base = types::interval_type{5, 10};
+    auto other = types::interval_type{0, 1};
+    EXPECT_EQ(base - other, 4);
+}
+
+TEST_F(DistanceTests, DistanceRightSide)
+{
+    auto base = types::interval_type{5, 10};
+    auto other = types::interval_type{15, 18};
+    EXPECT_EQ(base - other, 5);
+}
+
+TEST_F(DistanceTests, DistanceAdjacent)
+{
+    auto base = types::interval_type{5, 10};
+    auto other = types::interval_type{10, 18};
+    EXPECT_EQ(base - other, 0);
+}
+
+TEST_F(DistanceTests, DistanceAdjacent2)
+{
+    auto base = types::interval_type{5, 10};
+    auto other = types::interval_type{0, 5};
+    EXPECT_EQ(base - other, 0);
+}