reapack

commit e984df20ac2a4344ef13b887d2aaa64dc965809f
parent afee3cd7e638f6701d21965d8089756ba13274a4
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Sun, 17 Apr 2016 00:15:05 -0400

identify unknown type id as "Unknown" (not an empty string)

Diffstat:
M
src/package.cpp
 | 
6
++----
M
test/package.cpp
 | 
3
+++

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/package.cpp b/src/package.cpp
@@ -42,8 +42,6 @@ Package::Type Package::typeFor(const char *type)
 string Package::displayType(const Type type)
 {
   switch(type) {
-  case UnknownType:
-    return "Unknown";
   case ScriptType:
     return "Script";
   case ExtensionType:
@@ -52,9 +50,9 @@ string Package::displayType(const Type type)
     return "Effect";
   case DataType:
     return "Data";
+  default:
+    return "Unknown";
   }
-
-  return {}; // MSVC is stupid
 }
 
 Package::Package(const Type type, const string &name, const Category *cat)
diff --git a/test/package.cpp b/test/package.cpp
@@ -54,6 +54,9 @@ TEST_CASE("package type to string", M) {
     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)));
 }
 
 TEST_CASE("empty package name", M) {