From ce7477d528912601972af14b921604943e859de5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 4 Aug 2021 00:03:06 +0200 Subject: Fix tests after previous commit. --- test/ref/DCP/dcp_test1/audio.mxf | Bin 881326 -> 881326 bytes .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- .../pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml | 4 ++-- test/ref/DCP/dcp_test2/audio.mxf | Bin 161326 -> 161326 bytes .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- .../pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml | 4 ++-- test/ref/DCP/dcp_test5/audio.mxf | Bin 161326 -> 161326 bytes .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- .../pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml | 4 ++-- test/ref/DCP/dcp_test7/audio.mxf | Bin 881326 -> 881326 bytes .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- .../pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml | 4 ++-- test/ref/DCP/encryption_test/audio.mxf | Bin 165454 -> 165454 bytes .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 16 ++++++++-------- .../pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml | 18 +++++++++--------- test/verify_test.cc | 4 ++-- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/test/ref/DCP/dcp_test1/audio.mxf b/test/ref/DCP/dcp_test1/audio.mxf index bd5dc126..f095f00a 100644 Binary files a/test/ref/DCP/dcp_test1/audio.mxf and b/test/ref/DCP/dcp_test1/audio.mxf differ diff --git a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index f58cfe0c..ae0f23be 100644 --- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -52,7 +52,7 @@ 24 0 24 - D9HpNAjKsECGtJEWtwV2/T5ndG8= + Lq7ot/GobgrqUYdlbR8FCD5APqs= urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 diff --git a/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml index 834d22d9..3f285d23 100644 --- a/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml +++ b/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml @@ -9,7 +9,7 @@ urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b 81fb54df-e1bf-4647-8788-ea7ba154375b - z/y4fI+ocWzVB7cr8pVt2OYpOHA= + c1DRq6GaSzV2brF0YnSNed46nqk= 8762 text/xml @@ -23,7 +23,7 @@ urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 8b92bcee-62fc-4a33-a51a-816e9611ce85 - D9HpNAjKsECGtJEWtwV2/T5ndG8= + Lq7ot/GobgrqUYdlbR8FCD5APqs= 881326 application/mxf diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf index 4de81fc4..9fc24355 100644 Binary files a/test/ref/DCP/dcp_test2/audio.mxf and b/test/ref/DCP/dcp_test2/audio.mxf differ diff --git a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index 4672c426..6e5fab73 100644 --- a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -23,7 +23,7 @@ 24 0 24 - WQ8QgAkPH1Qaxw+V8USyCwRZU2w= + 79TC6lDP5q0zzHZRm1wOnrObdYQ= urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 diff --git a/test/ref/DCP/dcp_test2/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/dcp_test2/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml index f6b91cc0..a37a062a 100644 --- a/test/ref/DCP/dcp_test2/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml +++ b/test/ref/DCP/dcp_test2/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml @@ -9,7 +9,7 @@ urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b 81fb54df-e1bf-4647-8788-ea7ba154375b - /b2BKdaNVERTSU97c6Xn9MX4tFw= + Q9GRM2MtKZAg5FEIEkRsL28rNeQ= 1774 text/xml @@ -23,7 +23,7 @@ urn:uuid:77e1fb48-ce0c-4d29-bf88-8c3bfec8013a 77e1fb48-ce0c-4d29-bf88-8c3bfec8013a - WQ8QgAkPH1Qaxw+V8USyCwRZU2w= + 79TC6lDP5q0zzHZRm1wOnrObdYQ= 161326 application/mxf diff --git a/test/ref/DCP/dcp_test5/audio.mxf b/test/ref/DCP/dcp_test5/audio.mxf index 668ab05a..5e9faba5 100644 Binary files a/test/ref/DCP/dcp_test5/audio.mxf and b/test/ref/DCP/dcp_test5/audio.mxf differ diff --git a/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index 8f87318b..a7a1441e 100644 --- a/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -34,7 +34,7 @@ 24 0 24 - ZONON+FxuDpU4nLiPCOiT4c/6qM= + UwaCvlFLCOKQhQB12hdVceJudgc= urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd diff --git a/test/ref/DCP/dcp_test5/pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml b/test/ref/DCP/dcp_test5/pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml index 8c2f33bc..6f7974a4 100644 --- a/test/ref/DCP/dcp_test5/pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml +++ b/test/ref/DCP/dcp_test5/pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml @@ -9,7 +9,7 @@ urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b 81fb54df-e1bf-4647-8788-ea7ba154375b - uOUbYOtA4IJk4zB7Sw+24NHOziA= + kvvGY8+ZNsyJyWk6i5Ha1dRpFQU= 2156 text/xml @@ -23,7 +23,7 @@ urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 8b92bcee-62fc-4a33-a51a-816e9611ce85 - ZONON+FxuDpU4nLiPCOiT4c/6qM= + UwaCvlFLCOKQhQB12hdVceJudgc= 161326 application/mxf diff --git a/test/ref/DCP/dcp_test7/audio.mxf b/test/ref/DCP/dcp_test7/audio.mxf index bd5dc126..f095f00a 100644 Binary files a/test/ref/DCP/dcp_test7/audio.mxf and b/test/ref/DCP/dcp_test7/audio.mxf differ diff --git a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index 60097460..d3589fc5 100644 --- a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -52,7 +52,7 @@ 24 0 24 - D9HpNAjKsECGtJEWtwV2/T5ndG8= + Lq7ot/GobgrqUYdlbR8FCD5APqs= diff --git a/test/ref/DCP/dcp_test7/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/dcp_test7/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml index 6adcb528..a2c83a0e 100644 --- a/test/ref/DCP/dcp_test7/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml +++ b/test/ref/DCP/dcp_test7/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml @@ -9,7 +9,7 @@ urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b 81fb54df-e1bf-4647-8788-ea7ba154375b - dGYmYkr7TY5ydDyXAVtAkqVsKIA= + LE8AZqXvZYb8W6QjVZiN7zB8Tro= 2168 text/xml;asdcpKind=CPL @@ -23,7 +23,7 @@ urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 8b92bcee-62fc-4a33-a51a-816e9611ce85 - D9HpNAjKsECGtJEWtwV2/T5ndG8= + Lq7ot/GobgrqUYdlbR8FCD5APqs= 881326 application/x-smpte-mxf;asdcpKind=Sound diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf index 4dcfee04..1b6eb33c 100644 Binary files a/test/ref/DCP/encryption_test/audio.mxf and b/test/ref/DCP/encryption_test/audio.mxf differ diff --git a/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index be36e538..598444b4 100644 --- a/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -36,7 +36,7 @@ 0 24 urn:uuid:a4f49b5e-622f-45f3-8ba7-63ce1fd40e78 - 3j42sogTj7BBc/q3fTPI+vZQLYk= + MSuGS6IIIQKGHR626+XAUbJj1zY= @@ -59,15 +59,15 @@ - 6erKjijSOorr+dnUY94RE8Xnhhs= + G/4l/FrHjANRjHMvx1wwtojaqXY= - WKJIsIJlvmgVujCBRgP9gflsreKBV+3MH2jdevS/fG4QGM4YQj3XbI9uNCJm1P/Y -aU43fi/ZCJuazhFeF6l+JerE+mQvl+HEeaBskgwDJTP7+/OsWPy/X+jIZt+D/vzO -xNtN1qnr/y86qNoQQAYcQSdosdGNk74BZj80aGgt4uXJoN6o47A9Cw09lTjasrJw -NBE12eKlZhwiY5QyJ4aFu4p0FjUEP9X/6RapW8SCY7m7MKjvO9h+W6hhKWKuoRmn -+qL1YFAW9eehvxGCNyaTGetiKkZtYG5nWNYEXPSQZ5si9hQmMxoxoR4QEsIBEWwl -d+esn4JlxufMc3yXDgVtXw== + tLWdo5wkG1aseboTfSONMMYLEnd89Wqcjw0Gwhw71wX/lEKEGYiCluUchInurc6J ++Lq7rgNz+SPg7XIgh1N58EHqEarwH6oFTf2ZFMtoEzmX1nXcjKR7MRYomMtCBb/V +g+LOpPuOY+36bQ/8XBYiH8t1w6ayNSLI0LGTuAfJDz+/L6wAGRSLosQgVThjz3bE +nnl9V96ufU3vMPcrq2YpT99Rb61gX3ItBKW60FiTX+NB5vBwQ1lq4vJ6qno4aviE +HEebN6byReZtqm+X6/olVvVHJBAyOG1ZKOb9Oj6I2Iw4hx0OYB70Tg7Qkx+f8zsl +HHXyc9gA+KzKStrrm390oA== diff --git a/test/ref/DCP/encryption_test/pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml b/test/ref/DCP/encryption_test/pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml index f72f8288..ecacaac5 100644 --- a/test/ref/DCP/encryption_test/pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml +++ b/test/ref/DCP/encryption_test/pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml @@ -9,7 +9,7 @@ urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b 81fb54df-e1bf-4647-8788-ea7ba154375b - gQoMyxEZ882Ny7Le9LlXtP/tMq8= + iBE1dh+gKFCi7R93mx2AoJ1eaek= 9314 text/xml @@ -23,7 +23,7 @@ urn:uuid:11471a77-7cd8-4de6-8c11-beaa198c015f 11471a77-7cd8-4de6-8c11-beaa198c015f - 3j42sogTj7BBc/q3fTPI+vZQLYk= + MSuGS6IIIQKGHR626+XAUbJj1zY= 165454 application/mxf @@ -46,15 +46,15 @@ - AvEsZ1g+lLvVQgNOJe4bU3BZWWo= + iFEJZ3tiVaiuJMzVY/ju8qx+KV0= - wq/gI+1StkeaJJA135Jbcp6s45ekTj5njHGrUcqudRR2Ny4NOZQ0hE3IkRJTS1Ya -QSVeEkTlvwc/81umHuc5jDrQk+R6kJ9AQD9n5j2MsE+8BgGMeefch5kqtsLNHCLA -O4qAAQrPh4dQvjC5tJTmyVZj8jGYuU1WmQ1VFBDJmDGUxjWocNsrSU5mjw45NqhB -mn/f5OYCYm+XN5OReruTaA5mi4C9F2AG5tPKOQ15qoHmlcw/KmbBADOIvZyEWzIL -SZ+bj0Tn8WPAm91fKym42gXlvnvRM6m7vKc4XPR1Ii7QtxlAXONqfVQ5jRpl/4rj -lFVyUBIMZc0SvABatKPoxw== + GKFnAkzVuhXi391uAz5kRTmKaJKMKd3iAe1XtYsUoRfhVxtQCv/hha/W8xpVsP2J +g/duTyASL/T4vdaQsrR8K3JUwP/r/gWlN3UfcFIORHkKeJ9OOBSIdauthODZpAJw +V+ZfgTu5S8aTh4XqkWWeVDQSsBWJhgHWFM4vrPrsWxae4l3SGj2DpcXUPhLOe55+ +Xh/sVJVH8CpEcNGKNDZnaJShUI6Ige45ElUePZNsYRNLBDWDcYw+nR0DAUovEuCh +CFqB2H9FKwufxAIWqbEYSca4liHlgFYL7TuHgaDbzdjTlQ8oL3kCPGbtVX5oWiEu +ZksAYCwT9sDxSxeThmFZOQ== diff --git a/test/verify_test.cc b/test/verify_test.cc index a77a20aa..30199900 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -372,9 +372,9 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes) { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) }, { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") }, { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") }, - { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xD9HpNAjKsECGtJEWtwV2/T5ndG8=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 }, + { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xLq7ot/GobgrqUYdlbR8FCD5APqs=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 }, { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xgVKhC9IkWyzQbgzpFcJ1bpqbtwk=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 }, - { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xz/y4fI+ocWzVB7cr8pVt2OYpOHA=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 } + { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xc1DRq6GaSzV2brF0YnSNed46nqk=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 } }); } -- cgit v1.2.3