Partial tidy-up of KDM classes.

[libdcp.git] / test / encryption_test.cc

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index a4e8688bbf87bd55ccf43a104faf3a2b39595533..8fe34ddda15b77e62aa4dab6734fc72eb16b8070 100644 (file)
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -26,6 +26,7 @@
 #include "cpl.h"
 #include "mono_picture_mxf.h"
 #include "picture_mxf_writer.h"
+#include "sound_mxf_writer.h"
 #include "sound_mxf.h"
 #include "reel.h"
 #include "test.h"
@@ -34,6 +35,7 @@
 #include "subtitle_content.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
+#include <sndfile.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/shared_ptr.hpp>
 
@@ -64,15 +66,16 @@ BOOST_AUTO_TEST_CASE (encryption_test)
        boost::filesystem::create_directories ("build/test/DCP/bar");
        dcp::DCP d ("build/test/DCP/bar");
 
+       /* Use test/ref/crypt so this test is repeatable */
        dcp::CertificateChain chain;
-       chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("build/test/signer/ca.self-signed.pem"))));
-       chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("build/test/signer/intermediate.signed.pem"))));
-       chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("build/test/signer/leaf.signed.pem"))));
+       chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("test/ref/crypt/ca.self-signed.pem"))));
+       chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("test/ref/crypt/intermediate.signed.pem"))));
+       chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("test/ref/crypt/leaf.signed.pem"))));
 
        shared_ptr<dcp::Signer> signer (
                new dcp::Signer (
                        chain,
-                       "build/test/signer/leaf.key"
+                       "test/ref/crypt/leaf.key"
                        )
                );
 
@@ -81,7 +84,6 @@ BOOST_AUTO_TEST_CASE (encryption_test)
        dcp::Key key;
        
        shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
-       mp->set_progress (&d.Progress);
        mp->set_metadata (mxf_metadata);
        mp->set_key (key);
 
@@ -92,9 +94,30 @@ BOOST_AUTO_TEST_CASE (encryption_test)
        }
        writer->finalize ();
 
+       shared_ptr<dcp::SoundMXF> ms (new dcp::SoundMXF (dcp::Fraction (24, 1), 48000, 1));
+       ms->set_key (key);
+       shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/DCP/bar/audio.mxf", dcp::SMPTE);
+       
+       SF_INFO info;
+       info.format = 0;
+       SNDFILE* sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info);
+       BOOST_CHECK (sndfile);
+       float buffer[4096*6];
+       float* channels[1];
+       channels[0] = buffer;
+       while (1) {
+               sf_count_t N = sf_readf_float (sndfile, buffer, 4096);
+               sound_writer->write (channels, N);
+               if (N < 4096) {
+                       break;
+               }
+       }
+       
+       sound_writer->finalize ();      
+
        cpl->add (shared_ptr<dcp::Reel> (new dcp::Reel (
                                                 shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)),
-                                                shared_ptr<dcp::ReelSoundAsset> (),
+                                                shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0)),
                                                 shared_ptr<dcp::ReelSubtitleAsset> ()
                                                 )));
        d.add (cpl);
@@ -105,18 +128,35 @@ BOOST_AUTO_TEST_CASE (encryption_test)
                signer,
                signer->certificates().leaf(),
                boost::posix_time::time_from_string ("2013-01-01 00:00:00"),
-               boost::posix_time::time_from_string ("2013-01-08 00:00:00"),
+               boost::posix_time::time_from_string ("2017-01-08 00:00:00"),
                "libdcp",
                "2012-07-17T04:45:18+00:00"
                );
 
        kdm.as_xml ("build/test/bar.kdm.xml");
-       system ("xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/bar.kdm.xml");
-       system ("xmlsec1 verify "
-               "--pubkey-cert-pem build/test/signer/leaf.signed.pem "
-               "--trusted-pem build/test/signer/intermediate.signed.pem "
-               "--trusted-pem build/test/signer/ca.self-signed.pem "
+       
+       int r = system (
+               "xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/bar.kdm.xml "
+               "> build/test/xmllint.log 2>&1 < /dev/null"
+               );
+
+#ifdef DCPOMATIC_POSIX 
+       BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0);
+#else
+       BOOST_CHECK_EQUAL (r, 0);
+#endif 
+               
+       r = system ("xmlsec1 verify "
+               "--pubkey-cert-pem test/ref/crypt/leaf.signed.pem "
+               "--trusted-pem test/ref/crypt/intermediate.signed.pem "
+               "--trusted-pem test/ref/crypt/ca.self-signed.pem "
                "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPublic "
                "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPrivate "
-               "build/test/bar.kdm.xml");
+                   "build/test/bar.kdm.xml > build/test/xmlsec1.log 2>&1 < /dev/null");
+       
+#ifdef DCPOMATIC_POSIX 
+       BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0);
+#else
+       BOOST_CHECK_EQUAL (r, 0);
+#endif 
 }