From 8eb096bc6fed65dcfc5f1440f3141408004d10fb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jun 2015 15:55:43 +0100 Subject: Update tests for previous change. --- test/certificates_test.cc | 12 ++++++------ .../DCP/bar/cpl_7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c.xml | 16 ++++++++-------- .../DCP/bar/pkl_a12d2c1f-0daa-4a30-a4cd-c4266ac172a7.xml | 16 ++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/certificates_test.cc b/test/certificates_test.cc index 0784d0a8..0a66bc66 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(), - "O=example.org,OU=example.org,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=" + "dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" ); BOOST_CHECK_EQUAL ( c.leaf()->subject(), - "O=example.org,OU=example.org,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,dnQualifier=d95fGDzERNdxfYPgphvAR8A18L4=" + "dnQualifier=d95fGDzERNdxfYPgphvAR8A18L4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" ); ++i; @@ -53,12 +53,12 @@ BOOST_AUTO_TEST_CASE (certificates) /* Intermediate */ BOOST_CHECK_EQUAL ( (*i)->issuer(), - "O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=" + "dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" ); BOOST_CHECK_EQUAL ( (*i)->subject(), - "O=example.org,OU=example.org,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=" + "dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" ); ++i; @@ -67,14 +67,14 @@ BOOST_AUTO_TEST_CASE (certificates) BOOST_CHECK_EQUAL (*i, c.root ()); BOOST_CHECK_EQUAL ( c.root()->issuer(), - "O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=" + "dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" ); BOOST_CHECK_EQUAL (c.root()->serial(), "5"); BOOST_CHECK_EQUAL ( c.root()->subject(), - "O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=" + "dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org" ); /* Check that reconstruction from a string works */ diff --git a/test/ref/DCP/bar/cpl_7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c.xml b/test/ref/DCP/bar/cpl_7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c.xml index f95f7056..fab39a09 100644 --- a/test/ref/DCP/bar/cpl_7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c.xml +++ b/test/ref/DCP/bar/cpl_7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c.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-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 +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=dnQualifier=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.orgFyE7zbrS5r1v2DcFG3JOYyxEcpE=HIXjsIlrjZQoh95+MBKekPJt9K5TTkNI6WhnAU7KuxCsA+ivkbK6UevwhOIkoPe1 +bf7Inkt0vgOAR+2Fh+llJlwjq3nhcy23yTASU2AlMCZnSJ3Kai6BkjE22p+yqHCl +CUi5ggpS/jR2vYgjF1VuAv6IkcQut6iXJMtEbOYgpoas8TatjB+ClqK5FNP7h9s3 +bZX7lbkMO3ZY+pTtLUw5B1VypUZ0C9C3iDVqzlwQvSl4TKSVQUPGqNhGznYAHsY1 +t3m/lRkE5di6yI9uIyiRGiBjvBOrdxpOp1O3SnUyWMCkgjA0M1HZ6JETI9sr+TwP +ln+5UR0W67CRSC9QRs7ubw==dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc Ym10d1RocTNzcmd4SUFlUk1qWDZCRmhnTER3PTAeFw0xMzA3MDgwOTM5MDBaFw0y @@ -27,7 +27,7 @@ D4MUTnv1UW5d/FdQR87WpGV+17CKblWGJtLTfFmV9LwcGlys6ZzrLRYpBf+81vYq VUhl7rrU7askIiacSlfYx4riv9KH5JLmyLdo7sjX4dhfj5IH/ilan7le1shjEl0P UrEgYX1dt5OOnMpzaIRHU+GWVlkY3M5VDdDfMPstuPJ+MeAP1fH0Ylajhc4O5nmu hWfXc9qa5bxOLzNDBOsXS8hbnTpUS1qpqzea5NSogdxGIiyk/OluU1ZJJPQhf0iK -K6U6e4+TpHKVvqUwQcPUw9TcBGIDkwJTtLF48ZhFI9Gv016SmSwUobgcDA9e97o=O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=6MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh +K6U6e4+TpHKVvqUwQcPUw9TcBGIDkwJTtLF48ZhFI9Gv016SmSwUobgcDA9e97o=dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org6MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU5WhcNMjMwNzA1MDkz @@ -51,7 +51,7 @@ ozKYwxsJx8jSkgwGYX5v8Cn2Sp2/gV5umCcmpZfIExEOZRmjgKzqyr658EyvmrYJ nqrig/N8wUWeS5EzMSiE1sVfyIZmUpKhuqmGQUXnftVMCKSrqAh+Au7ndlR77/dm ZBJzzX79nn4L9XqghdoFCPRt4rx1CMU26MmiuEzNcYJ3uSJc1SSz5tT69JQvp8Fj InhKTMv0wWysEsfE6+aARPtrqAUJBRAG83oP6L0gdJYWJagGFVoZLfjPf+v9JgYZ -Wo+DO=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=5MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh +Wo+DdnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org5MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU4WhcNMjMwNzA2MDkz diff --git a/test/ref/DCP/bar/pkl_a12d2c1f-0daa-4a30-a4cd-c4266ac172a7.xml b/test/ref/DCP/bar/pkl_a12d2c1f-0daa-4a30-a4cd-c4266ac172a7.xml index 56df1f42..80bae6e2 100644 --- a/test/ref/DCP/bar/pkl_a12d2c1f-0daa-4a30-a4cd-c4266ac172a7.xml +++ b/test/ref/DCP/bar/pkl_a12d2c1f-0daa-4a30-a4cd-c4266ac172a7.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-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 +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-4f3f71ac6e0ckwhnWoS9vct0keZattTq4BNd5/0=8613text/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.orgZiM8f0Al7b4dPu8fB7j1oiEl6mE=b4pNm2+KSO/mXLLHQN8YEYIhugT9h0eNEv0VaGux5IAMi+B9JSGDl1pguaZkhKhB +VEPMZ/vwgnaiQmelz8IrsXcon093nGvGHZXNDj1eBg2ZLUW8gHMkAVbcB/fDsq2t +8ircSFQD7N9VHej06vE2XXA69ALbEzUS1AnexmgqwaO/OVTaOuYQ8Wf5gskTnF3L +1pMGm9mMTS5CU2Q3mtGlT0rlrzkS8DkiSB5CocuD9mwvYx6yKcIovOpSfnKv0RE8 +1CHGqpBprHRoGM9FF5laPuM/u8WFMwTNcdw1Fpqrg1dkRAOv1UpYYtFPLXmCX3kL +9XZN1xzFCDTKdUIVGHlgzA==dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc Ym10d1RocTNzcmd4SUFlUk1qWDZCRmhnTER3PTAeFw0xMzA3MDgwOTM5MDBaFw0y @@ -27,7 +27,7 @@ D4MUTnv1UW5d/FdQR87WpGV+17CKblWGJtLTfFmV9LwcGlys6ZzrLRYpBf+81vYq VUhl7rrU7askIiacSlfYx4riv9KH5JLmyLdo7sjX4dhfj5IH/ilan7le1shjEl0P UrEgYX1dt5OOnMpzaIRHU+GWVlkY3M5VDdDfMPstuPJ+MeAP1fH0Ylajhc4O5nmu hWfXc9qa5bxOLzNDBOsXS8hbnTpUS1qpqzea5NSogdxGIiyk/OluU1ZJJPQhf0iK -K6U6e4+TpHKVvqUwQcPUw9TcBGIDkwJTtLF48ZhFI9Gv016SmSwUobgcDA9e97o=O=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=6MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh +K6U6e4+TpHKVvqUwQcPUw9TcBGIDkwJTtLF48ZhFI9Gv016SmSwUobgcDA9e97o=dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org6MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU5WhcNMjMwNzA1MDkz @@ -51,7 +51,7 @@ ozKYwxsJx8jSkgwGYX5v8Cn2Sp2/gV5umCcmpZfIExEOZRmjgKzqyr658EyvmrYJ nqrig/N8wUWeS5EzMSiE1sVfyIZmUpKhuqmGQUXnftVMCKSrqAh+Au7ndlR77/dm ZBJzzX79nn4L9XqghdoFCPRt4rx1CMU26MmiuEzNcYJ3uSJc1SSz5tT69JQvp8Fj InhKTMv0wWysEsfE6+aARPtrqAUJBRAG83oP6L0gdJYWJagGFVoZLfjPf+v9JgYZ -Wo+DO=example.org,OU=example.org,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,dnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=5MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh +Wo+DdnQualifier=ndND9A/cODo2rTdrbLVmfQnoaSc=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org5MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU4WhcNMjMwNzA2MDkz -- cgit v1.2.3