added last tests, removed Makefile

Author: AlexVonB

Makefile

@@ -1,3 +1,5 @@
+set (CMAKE_CXX_FLAGS "-Wall -Wextra -Wpedantic -std=c++11")
+
 add_executable(
   basics
   basics.cpp
@@ -30,8 +32,30 @@ target_link_libraries(
   GTest::gmock_main
 )
 
+add_executable(
+  largeData
+  largeData.cpp
+)
+target_link_libraries(
+  largeData
+  GTest::gtest_main
+  GTest::gmock_main
+)
+
+add_executable(
+  treeList
+  treeList.cpp
+)
+target_link_libraries(
+  treeList
+  GTest::gtest_main
+  GTest::gmock_main
+)
+
 include(GoogleTest)
 gtest_discover_tests(basics)
 gtest_discover_tests(memory)
 gtest_discover_tests(badData)
+gtest_discover_tests(largeData)
+gtest_discover_tests(treeList)
 

TestTreeList.cpp

@@ -49,9 +49,9 @@ TEST(BasicTests, BasicTests) {
   ASSERT_EQ(nhits, 2);
 
   std::vector<Rect> collectedRects = std::vector<Rect>();
+  std::vector<ValueType> collectedValues = std::vector<ValueType>();
 
   // Iterator test
-  int itIndex = 0;
   MyTree::Iterator it;
   for (tree.GetFirst(it); !tree.IsNull(it); tree.GetNext(it)) {
     int value = tree.GetAt(it);
@@ -61,14 +61,15 @@ TEST(BasicTests, BasicTests) {
     it.GetBounds(boundsMin, boundsMax);
     collectedRects.push_back(
         Rect(boundsMin[0], boundsMin[1], boundsMax[0], boundsMax[1]));
+    collectedValues.push_back(value);
   }
 
   EXPECT_THAT(rects, UnorderedElementsAreArray(collectedRects));
+  EXPECT_THAT(values, UnorderedElementsAreArray(collectedValues));
+  collectedValues.clear();
 
-  std::vector<ValueType> collectedValues = std::vector<ValueType>();
 
   // Iterator test, alternate syntax
-  itIndex = 0;
   tree.GetFirst(it);
   while (!it.IsNull()) {
     int value = *it;
@@ -82,9 +83,9 @@ TEST(BasicTests, BasicTests) {
   MyTree copy = tree;
 
   collectedRects.clear();
+  collectedValues.clear();
 
   // Iterator test
-  itIndex = 0;
   for (copy.GetFirst(it); !copy.IsNull(it); copy.GetNext(it)) {
     int value = copy.GetAt(it);
 
@@ -93,14 +94,15 @@ TEST(BasicTests, BasicTests) {
     it.GetBounds(boundsMin, boundsMax);
     collectedRects.push_back(
         Rect(boundsMin[0], boundsMin[1], boundsMax[0], boundsMax[1]));
+    collectedValues.push_back(value);
   }
+  EXPECT_THAT(values, UnorderedElementsAreArray(collectedValues));
 
   EXPECT_THAT(rects, UnorderedElementsAreArray(collectedRects));
 
   collectedValues.clear();
 
   // Iterator test, alternate syntax
-  itIndex = 0;
   copy.GetFirst(it);
   while (!it.IsNull()) {
     int value = *it;

tests/CMakeLists.txt

@@ -1,28 +1,14 @@
-//
-// TestLargeData.cpp
-//
+#include "../RTree.h"
+#include "util.hpp"
+#include <gmock/gmock.h>
+#include <gtest/gtest-matchers.h>
+#include <gtest/gtest.h>
 
-#include "RTree.h"
+using namespace ::testing;
 
-struct Rect
-{
-  Rect()  {}
-
-  Rect(float a_minX, float a_minY, float a_maxX, float a_maxY)
-  {
-    min[0] = a_minX;
-    min[1] = a_minY;
-
-    max[0] = a_maxX;
-    max[1] = a_maxY;
-  }
+typedef RectTemplate<float> Rect;
 
-
-  float min[2];
-  float max[2];
-};
-
-struct Rect rects1[] =
+Rect rects1[] =
 {
   Rect(-165504234584830402149438989055033344.0f,0,0,0),
   Rect(0,0,0,0),
@@ -35,7 +21,7 @@ struct Rect rects1[] =
   Rect(-169908473233881734291078144928254001152.0f,0,0,-148873525386705775939391178777772949504.0f),
 };
 
-struct Rect rects2[] =
+Rect rects2[] =
 {
   Rect(-0.000487f,311158685411645789022377876652032.0f,0,0),
   Rect(-151115727451828646838272.0f,0,0,0),
@@ -48,8 +34,7 @@ struct Rect rects2[] =
   Rect(-0.453835f,303590248839277909200780151226368.0f,12.07855f,0),
 };
 
-int main()
-{
+TEST(LargeData, LargeData) {
   RTree<int, float, 2> tree;
 
   int data = 0;
@@ -60,5 +45,5 @@ int main()
     tree.Insert(rect.min, rect.max, data++);
   }
 
-  return 0;
+  SUCCEED();
 }

tests/basics.cpp

@@ -0,0 +1,36 @@
+#include "../RTree.h"
+#include "util.hpp"
+#include <gmock/gmock.h>
+#include <gtest/gtest-matchers.h>
+#include <gtest/gtest.h>
+#include <iostream>
+#include <limits>
+
+using namespace ::testing;
+
+typedef int ValueType;
+
+typedef RectTemplate<int> Rect;
+
+Rect rects[] = {
+    Rect(0, 0, 0, 0), Rect(1, 1, 1, 1), Rect(2, 2, 2, 2), Rect(3, 3, 3, 3),
+    Rect(4, 4, 4, 4), Rect(5, 5, 5, 5), Rect(6, 6, 6, 6), Rect(7, 7, 7, 7),
+    Rect(8, 8, 8, 8), Rect(9, 9, 9, 9),
+};
+
+int nrects = sizeof(rects) / sizeof(rects[0]);
+
+TEST(TreeList, TreeList) {
+  typedef RTree<ValueType, int, 2, float, 4> MyTree;
+  MyTree tree;
+
+  for (int i = 0; i < nrects; i++) {
+    tree.Insert(rects[i].min, rects[i].max, i);
+  }
+
+  auto list = tree.ListTree();
+
+  // there are at least nrects internal rectangles, because we use at most 4
+  // items per node
+  EXPECT_GT(list.size(), nrects);
+}