From 5dda5d997e389052b63f422776aa205434789751 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 14 Feb 2017 17:02:38 +0000 Subject: [PATCH] Fix test churn. --- run/tests | 2 +- test/dcp_test.cc | 3 +++ test/encryption_test.cc | 1 + test/ref/DCP/dcp_test1/ASSETMAP.xml | 2 +- .../pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml | 2 +- test/ref/DCP/dcp_test2/ASSETMAP.xml | 2 +- .../pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml | 2 +- test/ref/DCP/dcp_test5/ASSETMAP.xml | 2 +- .../pkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml | 2 +- test/ref/DCP/encryption_test/ASSETMAP.xml | 2 +- .../pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml | 12 ++++++------ 11 files changed, 18 insertions(+), 14 deletions(-) diff --git a/run/tests b/run/tests index 2ea87bed..67b84a88 100755 --- a/run/tests +++ b/run/tests @@ -9,7 +9,7 @@ work=build/test # Path to dcpinfo tool dcpinfo=build/tools/dcpinfo -export LD_LIBRARY_PATH=build/src:build/asdcplib/src:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=build/src:build/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH # Make sure we have the required tools for c in xmlsec1 xmldiff; do diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 0d7cea2d..ffc5fb2a 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -47,6 +47,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1) /* Some known metadata */ dcp::XMLMetadata xml_meta; + xml_meta.annotation_text = "Created by libdcp"; xml_meta.issuer = "OpenDCP 0.0.25"; xml_meta.creator = "OpenDCP 0.0.25"; xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; @@ -115,6 +116,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2) /* Some known metadata */ dcp::XMLMetadata xml_meta; + xml_meta.annotation_text = "Created by libdcp"; xml_meta.issuer = "OpenDCP 0.0.25"; xml_meta.creator = "OpenDCP 0.0.25"; xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; @@ -214,6 +216,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5) /* Some known metadata */ dcp::XMLMetadata xml_meta; + xml_meta.annotation_text = "Created by libdcp"; xml_meta.issuer = "OpenDCP 0.0.25"; xml_meta.creator = "OpenDCP 0.0.25"; xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; diff --git a/test/encryption_test.cc b/test/encryption_test.cc index a817d246..573074b2 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -58,6 +58,7 @@ BOOST_AUTO_TEST_CASE (encryption_test) mxf_metadata.product_version = "0.0.25"; dcp::XMLMetadata xml_metadata; + xml_metadata.annotation_text = "Created by libdcp"; xml_metadata.issuer = "OpenDCP 0.0.25"; xml_metadata.creator = "OpenDCP 0.0.25"; xml_metadata.issue_date = "2012-07-17T04:45:18+00:00"; diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml index 3aa7bb8b..c431ca09 100644 --- a/test/ref/DCP/dcp_test1/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml @@ -1,2 +1,2 @@ -urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42dCreated by libdcp1.4.3develOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55truepkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml101039urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bcpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml101374urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516video.mxf1026080urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85audio.mxf10161326 +urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42dCreated by libdcpOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55truepkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml101029urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bcpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml101374urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516video.mxf1026080urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85audio.mxf10161326 diff --git a/test/ref/DCP/dcp_test1/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml b/test/ref/DCP/dcp_test1/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml index c1e168f8..aa90b40a 100644 --- a/test/ref/DCP/dcp_test1/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml +++ b/test/ref/DCP/dcp_test1/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml @@ -1,2 +1,2 @@ -urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55Created by libdcp1.4.3devel2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b81fb54df-e1bf-4647-8788-ea7ba154375b1/64LdRLarzX5wgiEK/BjuXuSik=1374text/xmlurn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc51646c3eb45-15e5-47d6-8684-d8641e4dc516fppx9bI5WaFQjRcwmeobYY29GNY=26080application/mxfurn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce858b92bcee-62fc-4a33-a51a-816e9611ce85fnl4pJDAQk/xQ54W4R+l6S7PB7E=161326application/mxf +urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55Created by libdcp2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b81fb54df-e1bf-4647-8788-ea7ba154375b1/64LdRLarzX5wgiEK/BjuXuSik=1374text/xmlurn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc51646c3eb45-15e5-47d6-8684-d8641e4dc516fppx9bI5WaFQjRcwmeobYY29GNY=26080application/mxfurn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce858b92bcee-62fc-4a33-a51a-816e9611ce85fnl4pJDAQk/xQ54W4R+l6S7PB7E=161326application/mxf diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml index d447a102..cf150d0e 100644 --- a/test/ref/DCP/dcp_test2/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test2/ASSETMAP.xml @@ -1,2 +1,2 @@ -urn:uuid:fc17a5e4-1127-4eb7-847f-a982d1ad0b34Created by libdcp1.4.3develOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:2afb4e45-f01c-4abc-a354-2ffc0c240a5etruepkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml101039urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40ccpl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml101498urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9video.mxf1035032urn:uuid:58d42406-691b-47e3-be74-e7a7b49c9514audio.mxf10161326 +urn:uuid:fc17a5e4-1127-4eb7-847f-a982d1ad0b34Created by libdcpOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:2afb4e45-f01c-4abc-a354-2ffc0c240a5etruepkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml101029urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40ccpl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml101498urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9video.mxf1035032urn:uuid:58d42406-691b-47e3-be74-e7a7b49c9514audio.mxf10161326 diff --git a/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml b/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml index faa447c9..5df60c82 100644 --- a/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml +++ b/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml @@ -1,2 +1,2 @@ -urn:uuid:2afb4e45-f01c-4abc-a354-2ffc0c240a5eCreated by libdcp1.4.3devel2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40ccd49971e-bf4c-4594-8474-54ebef09a40c9UToAEAcnkP2slky4m9+zpKr1Bw=1498text/xmlurn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f907e9f5a0-83ab-4791-8c6b-7df5d11f76f9M6O1IKSNbWdBQI6zm6AUFOUsrsg=35032application/mxfurn:uuid:58d42406-691b-47e3-be74-e7a7b49c951458d42406-691b-47e3-be74-e7a7b49c9514hNT4mrE0QqE9NgUzqf+Eh3CYGWE=161326application/mxf +urn:uuid:2afb4e45-f01c-4abc-a354-2ffc0c240a5eCreated by libdcp2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40ccd49971e-bf4c-4594-8474-54ebef09a40c9UToAEAcnkP2slky4m9+zpKr1Bw=1498text/xmlurn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f907e9f5a0-83ab-4791-8c6b-7df5d11f76f9M6O1IKSNbWdBQI6zm6AUFOUsrsg=35032application/mxfurn:uuid:58d42406-691b-47e3-be74-e7a7b49c951458d42406-691b-47e3-be74-e7a7b49c9514hNT4mrE0QqE9NgUzqf+Eh3CYGWE=161326application/mxf diff --git a/test/ref/DCP/dcp_test5/ASSETMAP.xml b/test/ref/DCP/dcp_test5/ASSETMAP.xml index 51eab2a5..5c0152ae 100644 --- a/test/ref/DCP/dcp_test5/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test5/ASSETMAP.xml @@ -1,2 +1,2 @@ -urn:uuid:7574c611-f8de-4d20-98c4-2eb7dc87080aCreated by libdcp1.4.3develOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:34acc068-e059-4fb9-90ca-461c57d17daetruepkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml101039urn:uuid:11c45f5d-d465-4c41-b008-5284cf38a037cpl_11c45f5d-d465-4c41-b008-5284cf38a037.xml101817urn:uuid:7f8b3329-371b-4342-b849-a2ee840e8f45video.mxf1026080urn:uuid:5ee06e49-440d-4aba-b83d-c783391e87bcaudio.mxf10161326 +urn:uuid:7574c611-f8de-4d20-98c4-2eb7dc87080aCreated by libdcpOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:34acc068-e059-4fb9-90ca-461c57d17daetruepkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml101029urn:uuid:11c45f5d-d465-4c41-b008-5284cf38a037cpl_11c45f5d-d465-4c41-b008-5284cf38a037.xml101817urn:uuid:7f8b3329-371b-4342-b849-a2ee840e8f45video.mxf1026080urn:uuid:5ee06e49-440d-4aba-b83d-c783391e87bcaudio.mxf10161326 diff --git a/test/ref/DCP/dcp_test5/pkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml b/test/ref/DCP/dcp_test5/pkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml index efb9cb7f..917350f6 100644 --- a/test/ref/DCP/dcp_test5/pkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml +++ b/test/ref/DCP/dcp_test5/pkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml @@ -1,2 +1,2 @@ -urn:uuid:34acc068-e059-4fb9-90ca-461c57d17daeCreated by libdcp1.4.3devel2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:11c45f5d-d465-4c41-b008-5284cf38a03711c45f5d-d465-4c41-b008-5284cf38a0376d2DG9wN0raCQX6c+w1PQEGR8p0=1817text/xmlurn:uuid:7f8b3329-371b-4342-b849-a2ee840e8f457f8b3329-371b-4342-b849-a2ee840e8f45EhBPen6Vp+D3a2wcjeXA64+x4fs=26080application/mxfurn:uuid:5ee06e49-440d-4aba-b83d-c783391e87bc5ee06e49-440d-4aba-b83d-c783391e87bcT7S0u9QjNuhMsig5GMKweK9BBzM=161326application/mxf +urn:uuid:34acc068-e059-4fb9-90ca-461c57d17daeCreated by libdcp2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:11c45f5d-d465-4c41-b008-5284cf38a03711c45f5d-d465-4c41-b008-5284cf38a0376d2DG9wN0raCQX6c+w1PQEGR8p0=1817text/xmlurn:uuid:7f8b3329-371b-4342-b849-a2ee840e8f457f8b3329-371b-4342-b849-a2ee840e8f45EhBPen6Vp+D3a2wcjeXA64+x4fs=26080application/mxfurn:uuid:5ee06e49-440d-4aba-b83d-c783391e87bc5ee06e49-440d-4aba-b83d-c783391e87bcT7S0u9QjNuhMsig5GMKweK9BBzM=161326application/mxf diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml index 8dedb74d..7814c9a4 100644 --- a/test/ref/DCP/encryption_test/ASSETMAP.xml +++ b/test/ref/DCP/encryption_test/ASSETMAP.xml @@ -1,2 +1,2 @@ -urn:uuid:9a5cc86d-e865-4317-ba80-a429f959cdd0Created by libdcp1.4.3develOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:de125b93-db76-41d3-bccd-73deb5b2bb49truepkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml108163urn:uuid:975df3ad-1ace-4c08-aa20-c729ffa5a6b1cpl_975df3ad-1ace-4c08-aa20-c729ffa5a6b1.xml108618urn:uuid:e3146267-6089-4647-87d8-071cda0f9063video.mxf1029896urn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4audio.mxf10165454 +urn:uuid:9a5cc86d-e865-4317-ba80-a429f959cdd0Created by libdcpOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:de125b93-db76-41d3-bccd-73deb5b2bb49truepkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml108153urn:uuid:975df3ad-1ace-4c08-aa20-c729ffa5a6b1cpl_975df3ad-1ace-4c08-aa20-c729ffa5a6b1.xml108618urn:uuid:e3146267-6089-4647-87d8-071cda0f9063video.mxf1029896urn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4audio.mxf10165454 diff --git a/test/ref/DCP/encryption_test/pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml b/test/ref/DCP/encryption_test/pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml index 68f41cf0..57cd12c3 100644 --- a/test/ref/DCP/encryption_test/pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml +++ b/test/ref/DCP/encryption_test/pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml @@ -1,10 +1,10 @@ -urn:uuid:de125b93-db76-41d3-bccd-73deb5b2bb49Created by libdcp1.4.3devel2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:975df3ad-1ace-4c08-aa20-c729ffa5a6b1975df3ad-1ace-4c08-aa20-c729ffa5a6b12aBaofl0cfNVZJw3RcHsHJWn+8M=8618text/xmlurn:uuid:e3146267-6089-4647-87d8-071cda0f9063e3146267-6089-4647-87d8-071cda0f9063aUTqa7a8OuzPa3bLYwh9kFVi1T8=29896application/mxfurn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d49zMCdZLeqvkJOE8Ixobv0GExLw0=165454application/mxfdnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.orgfblo3zclDjy/nuzsRVF8x9hEGiw=lFYFoPdjnJH1yIMuWgdx+1QNkcN8NRaVjSrWIKPkRF19qDramVJQslUlaLCtWSpg -VQcUUsXbm+ecC5Eh+4Ye5ri03c6MWrxl6xIP8/awj8arUbB9qOIuN0GIZE/fRYEj -5y0NT3okJdYEDnWnmgQAqmjDs5pLwHITeasYjNkH+3Jan+J4HDoyLaOf5V/c5+RV -LCRXAW3dPhF/gSygkgy8Bl4AKYmCijg6r6m00SuzLn5NhhAMxvcASqanekvfL0+4 -vlMP994J358ac+2LL3860KSW1ZnotfvrkMswGRvgoEw7QiLS3w38hRO2E0SxRK0h -tfPeFO3LtPcoo45GszqfFw==dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh +urn:uuid:de125b93-db76-41d3-bccd-73deb5b2bb49Created by libdcp2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:975df3ad-1ace-4c08-aa20-c729ffa5a6b1975df3ad-1ace-4c08-aa20-c729ffa5a6b12aBaofl0cfNVZJw3RcHsHJWn+8M=8618text/xmlurn:uuid:e3146267-6089-4647-87d8-071cda0f9063e3146267-6089-4647-87d8-071cda0f9063aUTqa7a8OuzPa3bLYwh9kFVi1T8=29896application/mxfurn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d49zMCdZLeqvkJOE8Ixobv0GExLw0=165454application/mxfdnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.orgtzUACzSZAox5Bl2hA0/X7F2gv8I=gCjlb4yuSk+8Jr9MRT7AuxBt0FSi5spviKZ2RF057HWEZTNAQ7sAOr3bPRyn1W1F +ySCYm0+VM/K5QitCHUfMNE6GlL1BxypKwreqKw0edRwqP0jNG8V8mmhzfBUKs5DD +Sl8buBgRKAosMAfZ6R4ZbiDiTVJa76vx0wmIhvY/7JQjlek6RWFNR5QmGFZJzloy +LlzpHej4sluFLKJkTwAPOH6rlLXYyKkDk4zBeYsmKkNVQzih0OG2OFR4pBwDM3w9 +S8Ugp9JmJd5Xipd8SsnnKO/Uzcb/1iy2BkoM8iHr2L3mutwv9RnxZuLsMDIFKiP7 +FWlve0in0pZcS2TDIdRxEQ==dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y -- 2.30.2