From 4df57fe9f0992d8c695a6458b5e2ccba3fb0b7e2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 May 2015 23:19:23 +0100 Subject: Tests amnesty. --- test/certificates_test.cc | 12 +++++----- test/data/subs4.xml | 19 +++++++++++++++ test/dcp_time_test.cc | 2 +- .../7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml | 16 ++++++------- test/ref/DCP/bar/ASSETMAP.xml | 2 +- .../a12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml | 16 ++++++------- .../81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml | 2 +- test/ref/DCP/foo/ASSETMAP.xml | 2 +- .../df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml | 2 +- test/subtitle_tests.cc | 28 +++++++++++----------- 10 files changed, 60 insertions(+), 41 deletions(-) create mode 100644 test/data/subs4.xml diff --git a/test/certificates_test.cc b/test/certificates_test.cc index 0a66bc66..0784d0a8 100644 --- a/test/certificates_test.cc +++ b/test/certificates_test.cc @@ -40,12 +40,12 @@ BOOST_AUTO_TEST_CASE (certificates) BOOST_CHECK_EQUAL ( c.leaf()->issuer(), - "dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" + "O=example.org,OU=example.org,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=" ); BOOST_CHECK_EQUAL ( c.leaf()->subject(), - "dnQualifier=d95fGDzERNdxfYPgphvAR8A18L4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" + "O=example.org,OU=example.org,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,dnQualifier=d95fGDzERNdxfYPgphvAR8A18L4=" ); ++i; @@ -53,12 +53,12 @@ BOOST_AUTO_TEST_CASE (certificates) /* Intermediate */ BOOST_CHECK_EQUAL ( (*i)->issuer(), - "dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" + "O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=" ); BOOST_CHECK_EQUAL ( (*i)->subject(), - "dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" + "O=example.org,OU=example.org,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=" ); ++i; @@ -67,14 +67,14 @@ BOOST_AUTO_TEST_CASE (certificates) BOOST_CHECK_EQUAL (*i, c.root ()); BOOST_CHECK_EQUAL ( c.root()->issuer(), - "dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" + "O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=" ); BOOST_CHECK_EQUAL (c.root()->serial(), "5"); BOOST_CHECK_EQUAL ( c.root()->subject(), - "dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" + "O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=" ); /* Check that reconstruction from a string works */ diff --git a/test/data/subs4.xml b/test/data/subs4.xml new file mode 100644 index 00000000..22bf64ff --- /dev/null +++ b/test/data/subs4.xml @@ -0,0 +1,19 @@ + + +urn:uuid:d351291b-a133-88f7-caca-e7ed2ee6cc69 +Test +Test +2014-11-21T18:10:50+01:00 +1 +en +25 1 +25 +00:00:00:00 + + + +Hello there world + + + + diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc index 0ebddb29..a3a3615e 100644 --- a/test/dcp_time_test.cc +++ b/test/dcp_time_test.cc @@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (dcp_time) /* Another arbitrary tcr (30) */ a = libdcp::Time (24, 12, 6, 3, 30); b = libdcp::Time (16, 8, 4, 2, 30); - BOOST_CHECK_CLOSE (a / b, 1.5, 1e-5); + BOOST_CHECK_CLOSE (a / b, 1.5, 1e-3); a = libdcp::Time (3600 * 24, 24, 250); BOOST_CHECK_EQUAL (a.h, 1); diff --git a/test/ref/DCP/bar/7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml b/test/ref/DCP/bar/7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml index 2e3c5b29..f95f7056 100644 --- a/test/ref/DCP/bar/7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml +++ b/test/ref/DCP/bar/7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml @@ -1,10 +1,10 @@ -urn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0cA Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25A Test DCPfeatureurn:uri:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_2012-07-17T04:45:18+00:007b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_2012-07-17T04:45:18+00:00urn:uuid:947716dd-c237-4f31-a6d8-f74990b79c73urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bffvideo.mxf24 124024urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f24 132 32urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1baudio.mxf24 12400urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3afdnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7dnQualifier=d95fGDzERNdxfYPgphvAR8A18L4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.orgnxx0sUeTkcxIK9y7+JATMU5MzGg=NTsZK+pcfddOjpQC9rkBn0eRDG1D5tVkqvwYd9d577AMj17GxXizxsBa+DadQ3mB -GiWeoiJ8/VVW9PQ8N28uOLRkv0er8Jzl6UXdASrki/FbMLLRIGT1IMmxurahUBQN -hXrk7yphM/cGpIIRwQnAyAuG0xO7L3uDUuMhRftDplwGPU52Qa3opEEX1FtxC9TT -7NrOGIs+Ks3WtUFOe5ZbfLt1McmnYzg6FJdnAEOfv3/AWQCBd1vakONNgoWKmCiK -/kmeDIMBK4slHfGrauBcn7KVPpLS8lSFgXI1erifibRe4iyANql10qJ+NiYVgdxm -udPzL8evhgSC8StQOpAy1g==dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh +urn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0cA Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25A Test DCPfeatureurn:uri:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_2012-07-17T04:45:18+00:007b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_2012-07-17T04:45:18+00:00urn:uuid:947716dd-c237-4f31-a6d8-f74990b79c73urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bffvideo.mxf24 124024urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4ftwmVEuhyyqVkEQo6tQbCN/V4MuY=24 132 32urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1baudio.mxf24 12400urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af00dwsDwm9AGtL2ylcUZzm/UH/P8=O=example.org,OU=example.org,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=7O=example.org,OU=example.org,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,dnQualifier=d95fGDzERNdxfYPgphvAR8A18L4=dNIfmLJyaOvqDRRXwKk6Hu26weY=vSf9T+asUKwFr2imXw4WyBV5MqtQDFkHvvuk2/sJxA73CkjuuuE/9sR5Sn3YtEYX +SLY1EBAp30dRltBx2vpB0qdH7NGSlp9xDerF0LmWeTxojK5CwTqi6TPe6CsIeV+s +njiujUbdi1qEC8x/MnWALLEBPfmpYvPYrnilW9FJ4F4Xhpx/aCvdeaDyCZonby8c +32TyJVKZdl1Lbf7hl43wWp5PbEqxDinQ48fulCWJuH6lefmk6NHl05QMZqC8xi/v +LvWUFQhSkzPO6nsDNJy/W6mWxUuIks6g8/D43ntQ60r+xB27cFnhthpxZAHO58MJ +1o3qc9QxexEFhZ/q6cIX/Q==O=example.org,OU=example.org,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc Ym10d1RocTNzcmd4SUFlUk1qWDZCRmhnTER3PTAeFw0xMzA3MDgwOTM5MDBaFw0y @@ -27,7 +27,7 @@ D4MUTnv1UW5d/FdQR87WpGV+17CKblWGJtLTfFmV9LwcGlys6ZzrLRYpBf+81vYq VUhl7rrU7askIiacSlfYx4riv9KH5JLmyLdo7sjX4dhfj5IH/ilan7le1shjEl0P UrEgYX1dt5OOnMpzaIRHU+GWVlkY3M5VDdDfMPstuPJ+MeAP1fH0Ylajhc4O5nmu hWfXc9qa5bxOLzNDBOsXS8hbnTpUS1qpqzea5NSogdxGIiyk/OluU1ZJJPQhf0iK -K6U6e4+TpHKVvqUwQcPUw9TcBGIDkwJTtLF48ZhFI9Gv016SmSwUobgcDA9e97o=dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org6MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh +K6U6e4+TpHKVvqUwQcPUw9TcBGIDkwJTtLF48ZhFI9Gv016SmSwUobgcDA9e97o=O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=6MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU5WhcNMjMwNzA1MDkz @@ -51,7 +51,7 @@ ozKYwxsJx8jSkgwGYX5v8Cn2Sp2/gV5umCcmpZfIExEOZRmjgKzqyr658EyvmrYJ nqrig/N8wUWeS5EzMSiE1sVfyIZmUpKhuqmGQUXnftVMCKSrqAh+Au7ndlR77/dm ZBJzzX79nn4L9XqghdoFCPRt4rx1CMU26MmiuEzNcYJ3uSJc1SSz5tT69JQvp8Fj InhKTMv0wWysEsfE6+aARPtrqAUJBRAG83oP6L0gdJYWJagGFVoZLfjPf+v9JgYZ -Wo+DdnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org5MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh +Wo+DO=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=5MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU4WhcNMjMwNzA2MDkz diff --git a/test/ref/DCP/bar/ASSETMAP.xml b/test/ref/DCP/bar/ASSETMAP.xml index 6b0ae981..c3ea8bed 100644 --- a/test/ref/DCP/bar/ASSETMAP.xml +++ b/test/ref/DCP/bar/ASSETMAP.xml @@ -1,2 +1,2 @@ -urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7fCreated by OpenDCP 0.0.25OpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7truea12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml108019urn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml108531urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1baudio.mxf10308398urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bffvideo.mxf1028840 +urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7fCreated by OpenDCP 0.0.25OpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7truea12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml108019urn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml108613urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1baudio.mxf10308398urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bffvideo.mxf1028840 diff --git a/test/ref/DCP/bar/a12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml b/test/ref/DCP/bar/a12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml index 60bc2042..56df1f42 100644 --- a/test/ref/DCP/bar/a12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml +++ b/test/ref/DCP/bar/a12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml @@ -1,10 +1,10 @@ -urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7A Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1baudio.mxf00dwsDwm9AGtL2ylcUZzm/UH/P8=308398application/mxfurn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bffvideo.mxftwmVEuhyyqVkEQo6tQbCN/V4MuY=28840application/mxfurn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0cmTFgIKBQeWMqD6y+8CanXIJj7pQ=8531text/xmldnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7dnQualifier=d95fGDzERNdxfYPgphvAR8A18L4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org/xGgOim2E6rPVUvuWH97evvZ3E0=X18JIXvv5fWjLTJPJYPg/KliGBtM1mZvEjaS0m+SUaM26WpTMT52nowtT/6PcGDX -Qd0Klm6j2YZpXnXbVapyhY9hXpm8h2dTDRR8S3r2fC6lVc6LAEPz6WRhW7F0ltZ7 -LFYnOraZOm0hegih1lM2bPin9rbsrtSguSEAYMP7z0SNAHViJ/eiY4b/va8n1eVe -bKqmdjN7CrD5OnxobDRSgBLeO9BqtrudPJlk4rCJmXIOxPrzywdRGd18VpoIqdNZ -hOmkgKZZrCk/QDZGKZLd1pnZ6AxxUl3Qwap+rxuTINNW8rDmKVEO8tLe/swHN/TA -zxrk+JtqOI/nDK5QRci2nQ==dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh +urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7A Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1baudio.mxf00dwsDwm9AGtL2ylcUZzm/UH/P8=308398application/mxfurn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bffvideo.mxftwmVEuhyyqVkEQo6tQbCN/V4MuY=28840application/mxfurn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0caYexMB3ArBeT2YmYxbcePxqjmHo=8613text/xmlO=example.org,OU=example.org,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=7O=example.org,OU=example.org,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,dnQualifier=d95fGDzERNdxfYPgphvAR8A18L4=KIdTSEQWNX7r3pZEPRm4LAu6iLk=z8nv9LxzW6aPEKvSW9P8eLsWHeRUx/F5p8bvqG1T2ENfivkgPG384eHGHMdVn4ag +5l1D4FmwpOzB5ek2JwN5n3N9h5I9HNriiC5WEOkKPnScUZiCHQbHYgEX+aWMNHQG +gebwKTDu9ClHyDSfYHNrlp4IEsH2yhoC5Pek8CPcCqCXbzGPBJSY4jR+lNsxU5x3 +Q1o3Bvycz4+UrRz9IPcMMWK+oVmV1Zm7VtkGMbFbH6RAGZIHvsKRpXMvcIpXCPhj +jnAmnMWSaL4BwOtYNrFGPPsoj1CIrwQEBP+a86jemq0P1ToeQ8iY+MpIz5te37WV +ZxiZDCLWlU3Zxp3U+ErMbQ==O=example.org,OU=example.org,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc Ym10d1RocTNzcmd4SUFlUk1qWDZCRmhnTER3PTAeFw0xMzA3MDgwOTM5MDBaFw0y @@ -27,7 +27,7 @@ D4MUTnv1UW5d/FdQR87WpGV+17CKblWGJtLTfFmV9LwcGlys6ZzrLRYpBf+81vYq VUhl7rrU7askIiacSlfYx4riv9KH5JLmyLdo7sjX4dhfj5IH/ilan7le1shjEl0P UrEgYX1dt5OOnMpzaIRHU+GWVlkY3M5VDdDfMPstuPJ+MeAP1fH0Ylajhc4O5nmu hWfXc9qa5bxOLzNDBOsXS8hbnTpUS1qpqzea5NSogdxGIiyk/OluU1ZJJPQhf0iK -K6U6e4+TpHKVvqUwQcPUw9TcBGIDkwJTtLF48ZhFI9Gv016SmSwUobgcDA9e97o=dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org6MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh +K6U6e4+TpHKVvqUwQcPUw9TcBGIDkwJTtLF48ZhFI9Gv016SmSwUobgcDA9e97o=O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=6MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU5WhcNMjMwNzA1MDkz @@ -51,7 +51,7 @@ ozKYwxsJx8jSkgwGYX5v8Cn2Sp2/gV5umCcmpZfIExEOZRmjgKzqyr658EyvmrYJ nqrig/N8wUWeS5EzMSiE1sVfyIZmUpKhuqmGQUXnftVMCKSrqAh+Au7ndlR77/dm ZBJzzX79nn4L9XqghdoFCPRt4rx1CMU26MmiuEzNcYJ3uSJc1SSz5tT69JQvp8Fj InhKTMv0wWysEsfE6+aARPtrqAUJBRAG83oP6L0gdJYWJagGFVoZLfjPf+v9JgYZ -Wo+DdnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org5MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh +Wo+DO=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=5MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU4WhcNMjMwNzA2MDkz diff --git a/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml b/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml index d2d2d5ff..996286d7 100644 --- a/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml +++ b/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml @@ -1,2 +1,2 @@ -urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bA Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25A Test DCPfeatureurn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:0081fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00urn:uuid:379fa64c-ad71-46cf-bef7-b45624006610urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71video.mxf24 12402424 132 32urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7audio.mxf24 124024 +urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bA Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25A Test DCPfeatureurn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:0081fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00urn:uuid:379fa64c-ad71-46cf-bef7-b45624006610urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71video.mxf24 124024E2vhyxdJQhEzSQZdp31w84ZZpfk=24 132 32urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7audio.mxf24 124024+qImGHkt/XouNaJ1V/+7BtcB4VU= diff --git a/test/ref/DCP/foo/ASSETMAP.xml b/test/ref/DCP/foo/ASSETMAP.xml index d7de236a..eaace0ab 100644 --- a/test/ref/DCP/foo/ASSETMAP.xml +++ b/test/ref/DCP/foo/ASSETMAP.xml @@ -1,2 +1,2 @@ -urn:uuid:b135d5cf-d180-43d8-b0b3-7373737b73bfCreated by OpenDCP 0.0.25OpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bbtruedf0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml10899urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml101292urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7audio.mxf10305326urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71video.mxf1026080 +urn:uuid:b135d5cf-d180-43d8-b0b3-7373737b73bfCreated by OpenDCP 0.0.25OpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bbtruedf0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml10899urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml101374urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7audio.mxf10305326urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71video.mxf1026080 diff --git a/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml b/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml index f17c4179..5e5028df 100644 --- a/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml +++ b/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml @@ -1,2 +1,2 @@ -urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bbA Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7audio.mxf+qImGHkt/XouNaJ1V/+7BtcB4VU=305326application/mxfurn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71video.mxfE2vhyxdJQhEzSQZdp31w84ZZpfk=26080application/mxfurn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bfd/4cs9kXW7PyDSmJdXb4NkC2qU=1292text/xml +urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bbA Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7audio.mxf+qImGHkt/XouNaJ1V/+7BtcB4VU=305326application/mxfurn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71video.mxfE2vhyxdJQhEzSQZdp31w84ZZpfk=26080application/mxfurn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bz5jxM25a8Rbf3zmp0bkj7A0ljy0=1374text/xml diff --git a/test/subtitle_tests.cc b/test/subtitle_tests.cc index 8f0b0855..1f53b02e 100644 --- a/test/subtitle_tests.cc +++ b/test/subtitle_tests.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE (subtitles1) 21, libdcp::VERTICAL_BOTTOM, libdcp::HORIZONTAL_CENTER, - "My corset was H.M. The Queen's", + "My corset was H.M. The Queen's", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 1, 250), @@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 89, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "At afternoon tea with John Peel", + "At afternoon tea with John Peel", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 95, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "I enquired if his accent was real", + "I enquired if his accent was real", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 89, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "He said \"out of the house", + "He said \"out of the house", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 95, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "I'm incredibly scouse", + "I'm incredibly scouse", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 89, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "At home it depends how I feel.\"", + "At home it depends how I feel.\"", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -226,7 +226,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 95, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "I spent a long weekend in Brighton", + "I spent a long weekend in Brighton", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -245,7 +245,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 89, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "With the legendary Miss Enid Blyton", + "With the legendary Miss Enid Blyton", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -261,7 +261,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 95, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "She said \"you be Noddy", + "She said \"you be Noddy", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -280,7 +280,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 89, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "That curious creature the Sphinx", + "That curious creature the Sphinx", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -296,7 +296,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 95, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "Is smarter than anyone thinks", + "Is smarter than anyone thinks", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -420,7 +420,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 89, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "HELLO", + "HELLO", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), @@ -436,7 +436,7 @@ BOOST_AUTO_TEST_CASE (subtitles2) 95, libdcp::VERTICAL_TOP, libdcp::HORIZONTAL_CENTER, - "WORLD", + "WORLD", libdcp::BORDER, libdcp::Color (0, 0, 0), libdcp::Time (0, 0, 0, 0, 250), -- cgit v1.2.3