Provide a bogus result (a newline) when a skipped result has no context

This allows kyua to function in a backwards compatible manner, allowing
previous versions to read databases from newer versions.

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>

engine/googletest_result.cpp

@@ -236,8 +236,9 @@ engine::googletest_result::parse(std::istream& input)
         context = invalid_output_message;
         status = "broken";
     }
-
-    if (context == "")
+    if (status == "skipped" && context.empty())
+        context = bogus_googletest_skipped_nul_message;
+    if (context.empty())
         return parse_without_reason(status, context);
     else
         return parse_with_reason(status, context);

engine/googletest_result.hpp

@@ -100,6 +100,12 @@ model::test_result calculate_googletest_result(
     const utils::fs::path&);
 
 
+/// A bogus identifier for nul reasons provided by the test writer.
+///
+/// TODO: Support nul messages with skipped results in the schema, etc.
+const std::string bogus_googletest_skipped_nul_message = "\n";
+
+
 }  // namespace engine
 
 #endif  // !defined(ENGINE_GOOGLETEST_RESULT_HPP)

engine/googletest_result_test.cpp

@@ -167,7 +167,8 @@ const char skipped_message[] = (
 );
 
 PARSE(skipped,
-      engine::googletest_result::skipped, NULL,
+      engine::googletest_result::skipped,
+      engine::bogus_googletest_skipped_nul_message.c_str(),
       skipped_message
 );
 

store/read_transaction.cpp

@@ -196,22 +196,13 @@ parse_result(sqlite::statement& stmt, const char* type_column,
     try {
         const model::test_result_type type =
             store::column_test_result_type(stmt, type_column);
-        switch (type) {
-        case model::test_result_passed:
+        if (type == model::test_result_passed) {
             if (stmt.column_type(stmt.column_id(reason_column)) !=
                 sqlite::type_null)
                 throw store::integrity_error("Result of type 'passed' has a "
                                              "non-NULL reason");
             return model::test_result(type);
-        /// Some test interfaces don't have to provide a reason when skipping a
-        /// test, e.g., Google Test.
-        case model::test_result_skipped:
-            if (stmt.column_type(stmt.column_id(reason_column)) ==
-                sqlite::type_null) {
-                return model::test_result(type);
-            }
-            /// FALLTHROUGH
-        default:
+        } else {
             return model::test_result(type,
                                       stmt.safe_column_text(reason_column));
         }