Add some missing fields to the test debug output.
authorCarl Hetherington <cth@carlh.net>
Thu, 11 Apr 2024 08:57:10 +0000 (10:57 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 14 Apr 2024 15:21:15 +0000 (17:21 +0200)
test/verify_test.cc

index 82eee8a31aa248769598b886b1f23e47cd8c7807..b464a7c0c0c23ce0c95e1ab9c727e838d1874b18 100644 (file)
@@ -207,12 +207,18 @@ check_verify_result(vector<path> dir, vector<dcp::DecryptedKDM> kdm, vector<dcp:
        for (auto i: notes) {
                message += "  " + note_to_string(i) + "\n";
                message += dcp::String::compose(
-                       "  [%1 %2 %3 %4 %5 %6 %7]\n",
+                       "  [%1 %2 %3 %4 %5 %6 ",
                        static_cast<int>(i.type()),
                        static_cast<int>(i.code()),
                        i.note().get_value_or("<none>"),
                        i.file().get_value_or("<none>"),
                        i.line().get_value_or(0),
+                       i.frame().get_value_or(0)
+                       );
+               message += dcp::String::compose(
+                       "%1 %2 %3 %4]\n",
+                       i.id().get_value_or("<none>"),
+                       i.other_id().get_value_or("<none>"),
                        i.reference_hash().get_value_or("<none>"),
                        i.calculated_hash().get_value_or("<none>")
                        );
@@ -221,12 +227,18 @@ check_verify_result(vector<path> dir, vector<dcp::DecryptedKDM> kdm, vector<dcp:
        for (auto i: test_notes) {
                message += "  " + note_to_string(i) + "\n";
                message += dcp::String::compose(
-                       "  [%1 %2 %3 %4 %5 %6 %7]\n",
+                       "  [%1 %2 %3 %4 %5 %6 ",
                        static_cast<int>(i.type()),
                        static_cast<int>(i.code()),
                        i.note().get_value_or("<none>"),
                        i.file().get_value_or("<none>"),
                        i.line().get_value_or(0),
+                       i.frame().get_value_or(0)
+                       );
+               message += dcp::String::compose(
+                       "%1 %2 %3 %4]\n",
+                       i.id().get_value_or("<none>"),
+                       i.other_id().get_value_or("<none>"),
                        i.reference_hash().get_value_or("<none>"),
                        i.calculated_hash().get_value_or("<none>")
                        );