From: Carl Hetherington <cth@carlh.net>
Date: Thu, 27 May 2021 09:44:21 +0000 (+0200)
Subject: Sort notes when checking verifications.
X-Git-Tag: v1.8.0~35
X-Git-Url: https://main.carlh.net/gitweb/?p=libdcp.git;a=commitdiff_plain;h=3e866abeee4de737a04719ff8ab6c6bf46bb4d74

Sort notes when checking verifications.

So that the lists in the tests don't have to be in the right order.
---

diff --git a/src/verify.cc b/src/verify.cc
index 7948767a..623794cc 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1618,6 +1618,29 @@ dcp::operator== (dcp::VerificationNote const& a, dcp::VerificationNote const& b)
 }
 
 
+bool
+dcp::operator< (dcp::VerificationNote const& a, dcp::VerificationNote const& b)
+{
+	if (a.type() != b.type()) {
+		return a.type() < b.type();
+	}
+
+	if (a.code() != b.code()) {
+		return a.code() < b.code();
+	}
+
+	if (a.note() != b.note()) {
+		return a.note().get_value_or("") < b.note().get_value_or("");
+	}
+
+	if (a.file() != b.file()) {
+		return a.file().get_value_or("") < b.file().get_value_or("");
+	}
+
+	return a.line().get_value_or(0) < b.line().get_value_or(0);
+}
+
+
 std::ostream&
 dcp::operator<< (std::ostream& s, dcp::VerificationNote const& note)
 {
diff --git a/src/verify.h b/src/verify.h
index 08be77c6..372da764 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -455,6 +455,7 @@ std::vector<VerificationNote> verify (
 std::string note_to_string (dcp::VerificationNote note);
 
 bool operator== (dcp::VerificationNote const& a, dcp::VerificationNote const& b);
+bool operator< (dcp::VerificationNote const& a, dcp::VerificationNote const& b);
 
 std::ostream& operator<<(std::ostream& s, dcp::VerificationNote const& note);
 
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 42da7005..417b4563 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -211,6 +211,8 @@ check_verify_result (vector<path> dir, vector<dcp::VerificationNote> test_notes)
 {
 	auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
 	BOOST_REQUIRE_EQUAL (notes.size(), test_notes.size());
+	std::sort (notes.begin(), notes.end());
+	std::sort (test_notes.begin(), test_notes.end());
 	for (auto i = 0U; i < notes.size(); ++i) {
 		BOOST_REQUIRE_EQUAL (notes[i], test_notes[i]);
 	}