Working galaxy test

CMakeLists.txt

@@ -14,8 +14,11 @@ else()
   message("==> CMAKE_BUILD_TYPE == ${CMAKE_BUILD_TYPE}.")
 endif()
 
+## set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG -DGLIBCXX_FORCE_NEW")
+
 ## https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_macros.html
 ## During Debug, use debug version of libstdc++ (asserts on access to invalid iterators, etc!)
+## set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 
@@ -40,7 +43,29 @@ endif()
 
 add_subdirectory(yaml-cpp)
 
-ADD_EXECUTABLE( twproxy twproxy.cpp session.cpp dispatchers.cpp boxes.cpp )
+if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/googletest)
+  message("***")
+  message("*** ERROR/MISSING *** please run: git clone https://github.com/google/googletest.git --depth 1")
+  message("***")
+endif()
+
+add_subdirectory(googletest)
+
+option(gtest_build_samples "Build gtest's sample programs." OFF)
+option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
+
+### TESTS
+add_executable(test-galaxy test-galaxy.cpp galaxy.cpp)
+add_dependencies(test-galaxy gtest)
+target_link_libraries(test-galaxy gtest_main)
+
+enable_testing()
+add_test(NAME test-galaxy
+  COMMAND test-galaxy)
+
+
+
+ADD_EXECUTABLE( twproxy twproxy.cpp session.cpp dispatchers.cpp boxes.cpp galaxy.cpp )
 TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread yaml-cpp)
 
 target_precompile_headers(twproxy PRIVATE pch.hpp)

galaxy.cpp

@@ -22,6 +22,8 @@ std::ostream &operator<<(std::ostream &os, const buysell_text &bst) {
   return os;
 }
 
+#define GTEST_COUT std::cerr << "[          ] [ INFO ]"
+
 struct port parse_portcim(const std::string line) {
   struct port p;
   p.sector = std::stoi(line);
@@ -31,6 +33,16 @@ struct port parse_portcim(const std::string line) {
       "]+([0-9]+)[ ]+([0-9]+%) (.)[ ]+([0-9]+)[ ]+([0-9]+%)[ ]*",
       std::regex_constants::ECMAScript);
 
+  // does it not understand {3} ??
+  // NO, it does not, from regex101.com:
+  // A repeated capturing group will only capture the last iteration. Put a
+  // capturing group around the repeated group to capture all iterations or use
+  // a non-capturing group instead if you're not interested in the data
+  //
+  //  static std::regex portrx("[ ]*([0-9]+)( (.)[ ]+([0-9]+)[ ]+([0-9]+%)){3}[
+  //  ]*",
+  //                           std::regex_constants::ECMAScript);
+
   // sector + amount pct + amount pct + amount pct
   // 1      2 3      4   5 6      7   8 9      10
 
@@ -41,8 +53,15 @@ struct port parse_portcim(const std::string line) {
 
   std::smatch matches;
   if (std::regex_match(line, matches, portrx)) {
+      /*
+    for (size_t x = 1; x < matches.size(); ++x) {
+      GTEST_COUT << x << " : " << matches[x] << std::endl;
+    }
+    */
+
     if (matches.size() != 11) {
       // GTEST_COUT << "Now you have 101 problems." << std::endl;
+
       p.sector = 0;
       p.type = 0;
       return p;

test-galaxy.cpp

@@ -0,0 +1,159 @@
+
+#include "gtest/gtest.h"
+
+#include "galaxy.h"
+
+#include <array>
+#include <map>
+#include <string>
+#include <vector>
+
+#define GTEST_COUT std::cerr << "[          ] [ INFO ]"
+
+namespace {
+
+std::map<int, const char *> port_classes = {{1, "BBS"}, {2, "BSB"}, {3, "SBB"},
+                                            {4, "SSB"}, {5, "SBS"}, {6, "BSS"},
+                                            {7, "SSS"}, {8, "BBB"}};
+
+/* From Galaxy.py
+PORT_CLASSES = {
+    1: "BBS",
+    2: "BSB",
+    3: "SBB",
+    4: "SSB",
+    5: "SBS",
+    6: "BSS",
+    7: "SSS",
+    8: "BBB",
+}*/
+
+TEST(ports, get_buysell) {
+  for (int type = 1; type < 9; ++type) {
+    buysell expected;
+    const char *flags;
+
+    flags = port_classes[type];
+    for (int x = 0; x < 3; ++x)
+      expected.foe[x] = flags[x] == 'B';
+    buysell result = get_buysell(type);
+    for (int x = 0; x < 3; ++x)
+      EXPECT_EQ(result.foe[x], expected.foe[x]) << "type: " << type << " pos: " << x;
+  }
+}
+
+TEST(ports, text_from_type) {
+  for (int type = 1; type < 9; ++type) {
+    buysell_text expected;
+    const char *flags;
+
+    flags = port_classes[type];
+    for (int x = 0; x < 3; ++x)
+      expected.txt[x] = flags[x];
+    buysell_text result = text_from_type(type);
+    EXPECT_EQ(result, expected) << "type: " << type;
+  }
+}
+
+TEST(ports, text_from_buysell) {
+  for (int type = 1; type < 9; ++type) {
+    buysell source = get_buysell(type);
+    buysell_text expected;
+    const char *flags;
+
+    flags = port_classes[type];
+    for (int x = 0; x < 3; ++x)
+      expected.txt[x] = flags[x];
+    buysell_text result = text_from_buysell(source);
+    EXPECT_EQ(result, expected) << "type: " << type;
+  }
+}
+
+TEST(ports, type_from_buysell) {
+  for (int type = 1; type < 9; ++type) {
+    buysell source = get_buysell(type);
+    int result = type_from_buysell(source);
+    EXPECT_EQ(result, type) << "type: " << type;
+  }
+}
+
+TEST(ports, parse_portcim) {
+  // This really needs to be checked against real lines from a log file
+  // THis was copied directly from client (indentation may be off)
+  std::map<std::string, port> data = {
+      {"  2 - 2420 100%    612  35% - 2020 100% ", // BSB
+       {2, 2, {2420, 612, 2020}, {100, 35, 100}}},
+      {"  4 - 2880 100% -  275  23%     61   6% ", // BBS
+       {4, 1, {2880, 275, 61}, {100, 23, 6}}},
+      {"  6 -  820 100%   1952  89% - 2680 100% ", // BSB
+       {6, 2, {820, 1952, 2680}, {100, 89, 100}}},
+      {"  8 - 1000 100% -  855  85% - 1000 100% ", // BBB
+       {8, 8, {1000, 855, 1000}, {100, 85, 100}}},
+      {" 20 - 1708  97% -  710  56%    287  15% ", // BBS
+       {20, 1, {1708, 710, 287}, {97, 56, 15}}},
+      {" 23 - 2120 100% -  709  40%   1902  69% ", // BBS
+       {23, 1, {2120, 709, 1902}, {100, 40, 69}}},
+      {" 28   1511  98% -  478  29%    589  35% ", // SBS
+       {28, 5, {1511, 478, 589}, {98, 29, 35}}},
+      {" 29    913  56% -  970 100% - 1990 100% ", // SBB
+       {29, 3, {913, 970, 1990}, {56, 100, 100}}}};
+
+  /*
+  // If you could make this a map or something better please improve
+  std::vector<port> ports;
+  ports.push_back( port{ 2, 2, {2420, 612, 2020}, {100,35,100} });
+
+  struct port p;
+  p.sector = 2;
+  p.type = 2;
+  p.amount[0] = 2420;
+  p.amount[1] = 612;
+  p.amount[2] = 2020;
+  p.percent[0] = 100;
+  p.percent[1] = 35;
+  p.percent[2] = 100;
+  ports.push_back(p);
+  p.sector = 4;
+  p.type = 1;
+  p.amount[0] = 2880;
+  p.amount[1] = 275;
+  p.amount[2] = 61;
+  p.percent[0] = 100;
+  p.percent[1] = 23;
+  p.percent[2] = 6;
+  ports.push_back(p);
+    */
+
+  for (auto testdata : data) {
+    port parse = parse_portcim(testdata.first);
+      EXPECT_EQ((int)parse.sector, (int)testdata.second.sector) << "Text: [" << testdata.first << "]";
+      if (parse.sector != 0) {
+      EXPECT_EQ(parse.type, testdata.second.type);
+      for (int x = 0; x < 3; ++x) {
+        EXPECT_EQ(parse.amount[x], testdata.second.amount[x]) << "Sector:" << parse.sector;
+        EXPECT_EQ(parse.percent[x], testdata.second.percent[x]) << "Sector:" << parse.sector;
+      }
+
+    }
+  }
+  /*
+  port parse = parse_portcim(data[0]);
+  EXPECT_EQ(parse.sector, 2 );
+  EXPECT_EQ(parse.type, 2);
+  EXPECT_EQ(parse.amount[0], 2420);
+
+  EXPECT_EQ(parse.sector, ports[0].sector);
+  EXPECT_EQ(parse.type, ports[0].type);
+    */
+  /*
+  this can't work.  trying to compare "pointers" .. that's why the numbers are
+  huge: Expected equality of these values: parse.amount Which is: 0x7fffc5ef83f6
+  ports[0].amount
+    Which is: 0x5556513ddb94
+  */
+
+  // EXPECT_EQ(parse.amount, ports[0].amount);
+  // EXPECT_EQ(parse.percent, ports[0].percent);
+}
+
+} // namespace