added parsing of fleet government

shitwolfymakes · Jul 16, 2023 · e4a68ea · e4a68ea
1 parent 7e5fc33
commit e4a68ea
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/src/esjsonlib/fleet/filefleetitemparser.cpp b/src/esjsonlib/fleet/filefleetitemparser.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- * fileleetitemparser.cpp
+ * filefleetitemparser.cpp
  *
  * Copyright (c) 2023, Andrew Sneed <wolfy@shitwolfymakes.com>
  */
@@ -20,12 +20,23 @@ FileFleetItemParser::FileFleetItemParser(std::vector<std::string> lines) {
 
 json FileFleetItemParser::run() {
     std::cout << "Parsing fleet node to JSON" << std::endl;
-    // TODO: IMPLEMENT THIS
     std::vector<std::string> tokens;
     std::vector<std::string> lines = getLines();
     tokens = utils::tokenize(lines.at(0));
     fleet["name"] = tokens.at(1);
 
+    for (int i = 1; i < static_cast<int>(lines.size()); i++) {
+        // start by tokenizing each line
+        tokens = utils::tokenize(lines.at(i));
+        std::vector<std::string> nodeLines;
+
+        // TODO: IMPLEMENT THIS
+        if (utils::is(tokens.at(0), "government")) {
+            std::cout << "\tFleet government is: " << tokens.at(1) << std::endl;
+            fleet["government"] = tokens.at(1);
+        }
+    }
+
     std::cout << "Fleet data: " << fleet.dump(4) << std::endl;
     return fleet;
 }

diff --git a/src/esjsonlib/fleet/filefleetitemparser.h b/src/esjsonlib/fleet/filefleetitemparser.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- * fileleetitemparser.h
+ * filefleetitemparser.h
  *
  * Copyright (c) 2023, Andrew Sneed <wolfy@shitwolfymakes.com>
  */

diff --git a/tests/fleet/filefleetitemparser_tests.cpp b/tests/fleet/filefleetitemparser_tests.cpp
@@ -21,4 +21,13 @@ TEST_F(FileFleetItemParserTest, TestEmptyFleetParsing) {
     ASSERT_EQ(fleet, expected);
 }
 
+TEST_F(FileFleetItemParserTest, TestParseGovernment) {
+    std::vector<std::string> nodeLines = {FLEET_NODE_HEADER,
+                                          "\tgovernment \"Free Worlds\"\n"};
+    parser.setLines(nodeLines);
+
+    json fleet = parser.run();
+    ASSERT_EQ(fleet["government"], "Free Worlds");
+}
+
 } // namespace parsertests
diff --git a/tests/fleet/filefleetitemparser_tests.h b/tests/fleet/filefleetitemparser_tests.h
@@ -15,12 +15,12 @@
 
 namespace parsertests {
 
-std::string GOVT_NODE_HEADER = "fleet \"Black Swan\"\n";
+std::string FLEET_NODE_HEADER = "fleet \"Black Swan\"\n";
 
-// Fixture for testing a filter node
+// Fixture for testing a node
 class FileFleetItemParserTest : public ::testing::Test {
 protected:
-    FileFleetItemParser parser = FileFleetItemParser({GOVT_NODE_HEADER});
+    FileFleetItemParser parser = FileFleetItemParser({FLEET_NODE_HEADER});
 };
 
 } // namespace parsertests

diff --git a/tests/government/filegovernmentitemparser_tests.cpp b/tests/government/filegovernmentitemparser_tests.cpp
@@ -4,8 +4,8 @@
  *
  * Copyright (c) 2023, Andrew Sneed <wolfy@shitwolfymakes.com>
  */
-
 #include "filegovernmentitemparser_tests.h"
+#include "common/fileitemparserutils.h"
 
 using namespace testing;