reapack

commit 6ea9bdafee8b67c7ff343229ff9813b35ea2dc57
parent 6c7409e3e297d28f45f397de9a86bf2ca19a3391
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Mon, 11 Jul 2016 21:01:19 -0400

mild refactoring

Diffstat:
M
src/package.cpp
 | 
5
-----
M
src/package.hpp
 | 
2
+-
M
test/package.cpp
 | 
20
+++++---------------
M
test/source.cpp
 | 
7
+++----

4 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/src/package.cpp b/src/package.cpp
@@ -73,11 +73,6 @@ string Package::fullName() const
   return m_category ? m_category->fullName() + "/" + m_name : m_name;
 }
 
-string Package::displayType() const
-{
-  return displayType(m_type);
-}
-
 void Package::addVersion(const Version *ver)
 {
   if(ver->package() != this)
diff --git a/src/package.hpp b/src/package.hpp
@@ -45,7 +45,7 @@ public:
 
   const Category *category() const { return m_category; }
   Type type() const { return m_type; }
-  std::string displayType() const;
+  std::string displayType() const { return displayType(m_type); }
   const std::string &name() const { return m_name; }
   std::string fullName() const;
   void setDescription(const std::string &d) { m_desc = d; }
diff --git a/test/package.cpp b/test/package.cpp
@@ -30,30 +30,20 @@ TEST_CASE("package type from string", M) {
 }
 
 TEST_CASE("package type to string", M) {
-  SECTION("unknown") {
+  SECTION("unknown")
     REQUIRE("Unknown" == Package::displayType(Package::UnknownType));
-    REQUIRE("Unknown" == Package(Package::UnknownType, "test").displayType());
-  }
 
-  SECTION("script") {
+  SECTION("script")
     REQUIRE("Script" == Package::displayType(Package::ScriptType));
-    REQUIRE("Script" == Package(Package::ScriptType, "test").displayType());
-  }
 
-  SECTION("extension") {
+  SECTION("extension")
     REQUIRE("Extension" == Package::displayType(Package::ExtensionType));
-    REQUIRE("Extension" == Package(Package::ExtensionType, "test").displayType());
-  }
 
-  SECTION("effect") {
+  SECTION("effect")
     REQUIRE("Effect" == Package::displayType(Package::EffectType));
-    REQUIRE("Effect" == Package(Package::EffectType, "test").displayType());
-  }
 
-  SECTION("data") {
+  SECTION("data")
     REQUIRE("Data" == Package::displayType(Package::DataType));
-    REQUIRE("Data" == Package(Package::DataType, "test").displayType());
-  }
 
   SECTION("unknown value")
     REQUIRE("Unknown" == Package::displayType(static_cast<Package::Type>(-1)));
diff --git a/test/source.cpp b/test/source.cpp
@@ -114,16 +114,16 @@ TEST_CASE("source target path", M) {
   Source source("file.name", "url", &ver);
 
   Path expected;
-  expected.append("Scripts");
   expected.append("Index Name");
   expected.append("Category Name");
   expected.append("file.name");
 
-  SECTION("script")
+  SECTION("script") {
+    expected.prepend("Scripts");
     REQUIRE(source.targetPath() == expected);
+  }
 
   SECTION("effect") {
-    expected.removeFirst();
     expected.prepend("Effects");
     source.setTypeOverride(Package::EffectType);
     REQUIRE(source.targetPath() == expected);
@@ -138,7 +138,6 @@ TEST_CASE("source target path", M) {
   }
 
   SECTION("data") {
-    expected.removeFirst();
     expected.prepend("Data");
     source.setTypeOverride(Package::DataType);
     REQUIRE(source.targetPath() == expected);