Refactor and add test

Author: php1ic

include/inch/dripline.hpp

@@ -259,6 +259,15 @@ class DripLine
    */
   [[nodiscard]] virtual std::string TearDown() const = 0;
 
+  /**
+   * Write a comment into the file to say what is about to be done
+   *
+   * \param Nothing
+   *
+   * \return The string that can be written to file
+   */
+  [[nodiscard]] virtual std::string Header() const = 0;
+
   /**
    * Read the necessary file for data and output eps code into the chart being created
    *

include/inch/eps_dripline.hpp

@@ -70,6 +70,29 @@ class EPSDripLine : public DripLine
                        "gr\n");
   }
 
+  /**
+   * Write a comment into the file to say what is about to be done
+   *
+   * \param Nothing
+   *
+   * \return The string that can be written to file
+   */
+  [[nodiscard]] inline std::string Header() const override
+  {
+    switch (the_line)
+      {
+        case LineType::singleneutron:
+        default:
+          return "\n%Neutron Drip Line\n";
+        case LineType::doubleneutron:
+          return "\n%Two Neutron Drip Line\n";
+        case LineType::singleproton:
+          return "\n%Proton Drip Line\n";
+        case LineType::doubleproton:
+          return "\n%Two Proton Drip Line\n";
+      }
+  }
+
   /**
    * Read the necessary file for data and output eps code into the chart being created
    *

src/eps_dripline.cpp

@@ -24,22 +24,7 @@ int EPSDripLine::WriteLine(std::ostream& outFile) const
 
   fmt::print("Reading {} and drawing the drip line", drip_file);
 
-  const std::string header = [&]() {
-    switch (the_line)
-      {
-        case LineType::singleneutron:
-        default:
-          return "\n%Neutron Drip Line\n";
-        case LineType::doubleneutron:
-          return "\n%Two Neutron Drip Line\n";
-        case LineType::singleproton:
-          return "\n%Proton Drip Line\n";
-        case LineType::doubleproton:
-          return "\n%Two Proton Drip Line\n";
-      }
-  }();
-
-  fmt::print(outFile, "{}{}", header, Setup());
+  fmt::print(outFile, "{}{}", Header(), Setup());
 
   // We make the file that is read and it always has
   // - one line as a header

tests/dripline_test.cpp

@@ -23,6 +23,7 @@ class DripLineForTest : public DripLine
 
   [[nodiscard]] inline std::string Setup() const override { return std::string(); }
   [[nodiscard]] inline std::string TearDown() const override { return std::string(); }
+  [[nodiscard]] inline std::string Header() const override { return std::string(); }
   inline int WriteLine(std::ostream& /*outFile*/) const override { return 0; }
 };
 

tests/eps_dripline_test.cpp

@@ -6,7 +6,7 @@
 
 const Limits limits;
 
-TEST_CASE("EPS dripline setup is correct", "[EPSDripLine]")
+TEST_CASE("EPS dripline setup", "[EPSDripLine]")
 {
   const EPSDripLine dripline(1.0, 2.0, limits, LineType::singleproton, "green");
   const auto setup{ "gs\n"
@@ -17,7 +17,7 @@ TEST_CASE("EPS dripline setup is correct", "[EPSDripLine]")
 }
 
 
-TEST_CASE("EPS dripline teardown is correct", "[EPSDripLine]")
+TEST_CASE("EPS dripline teardown", "[EPSDripLine]")
 {
   const EPSDripLine dripline(1.0, 2.0, limits, LineType::doubleneutron, "black");
 
@@ -27,6 +27,33 @@ TEST_CASE("EPS dripline teardown is correct", "[EPSDripLine]")
   REQUIRE_THAT(teardown, Catch::Equals(dripline.TearDown()));
 }
 
+
+TEST_CASE("EPS dripline comment", "[EPSDripLine]")
+{
+  EPSDripLine dripline(1.0, 2.0, limits, LineType::doubleneutron, "black");
+
+  SECTION("Double neutron") { REQUIRE_THAT("\n%Two Neutron Drip Line\n", Catch::Equals(dripline.Header())); }
+
+  SECTION("Single proton")
+  {
+    dripline.the_line = LineType::singleproton;
+    REQUIRE_THAT("\n%Proton Drip Line\n", Catch::Equals(dripline.Header()));
+  }
+
+  SECTION("Single neutron")
+  {
+    dripline.the_line = LineType::singleneutron;
+    REQUIRE_THAT("\n%Neutron Drip Line\n", Catch::Equals(dripline.Header()));
+  }
+
+  SECTION("Double proton")
+  {
+    dripline.the_line = LineType::doubleproton;
+    REQUIRE_THAT("\n%Two Proton Drip Line\n", Catch::Equals(dripline.Header()));
+  }
+}
+
+
 TEST_CASE("EPS dripline create file if necessary", "[EPSDripLine]")
 {
   EPSDripLine dripline(1.0, 2.0, limits, LineType::singleneutron, "black");