Clean up header organization

1 files changed, 0 insertions, 334 deletions

diff --git a/src/common/extract_test.cpp b/src/common/extract_test.cpp
deleted file mode 100644
index 3d0610e..0000000
--- a/src/common/extract_test.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-#include "extract.hpp"
-
-#include <gtest/gtest.h>
-
-#include "../strings/xstring.hpp"
-
-TEST(extract, record_int)
-{
-    int x, y, z;
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 3 4", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1 2", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract(" ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(0, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("", record<' '>(&x, &y, &z)));
-    EXPECT_EQ(0, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 3 4", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract(" ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(0, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ(0, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 3 4", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(3, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 2", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(2, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_TRUE(extract("1", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(1, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract(" ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(0, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-    EXPECT_FALSE(extract("", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ(0, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, z);
-    x = y = z = 0;
-}
-
-TEST(extract, record_str)
-{
-    XString x, y, z;
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2 3 4", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract(" ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2 3 4", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract(" ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2 3 4", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract(" ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-}
-
-TEST(extract, mapname)
-{
-    MapName map;
-    EXPECT_TRUE(extract("abc", &map));
-    EXPECT_EQ(map, "abc");
-    EXPECT_TRUE(extract("abc.gat", &map));
-    EXPECT_EQ(map, "abc");
-    EXPECT_TRUE(extract("abcdefghijklmno", &map));
-    EXPECT_EQ(map, "abcdefghijklmno");
-    EXPECT_TRUE(extract("abcdefghijklmno.gat", &map));
-    EXPECT_EQ(map, "abcdefghijklmno");
-}