Rename test DCP from foo to dcp_test1.

diff --git a/run/tests b/run/tests
index a9b57ad8d15c58b7fcd94d0a9460a8352d81924e..e1beb731ea3e5c79abcc55475d7e991d07df572a 100755 (executable)
--- a/run/tests
+++ b/run/tests
@@ -31,7 +31,7 @@ if [ "$?" != "0" ]; then
 fi
 
 # Check the first DCP written by the unit tests
-diff -ur test/ref/DCP/foo $work/DCP/foo
+diff -ur test/ref/DCP/dcp_test1 $work/DCP/dcp_test1
 if [ "$?" != "0" ]; then
     echo "FAIL: files differ"
     exit 1

diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc
index 59a91c84b2676ec5ee6b6637b3de4e734091d31c..bce57f587b3c9e35817331085bcf21d0e8bed038 100644 (file)
--- a/test/cpl_sar_test.cc
+++ b/test/cpl_sar_test.cc
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE (cpl_sar)
 {
        shared_ptr<dcp::ReelMonoPictureAsset> pa (
                new dcp::ReelMonoPictureAsset (
-                       shared_ptr<dcp::MonoPictureMXF> (new dcp::MonoPictureMXF ("test/ref/DCP/foo/video.mxf")),
+                       shared_ptr<dcp::MonoPictureMXF> (new dcp::MonoPictureMXF ("test/ref/DCP/dcp_test1/video.mxf")),
                        0
                        )
                );

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index b4ffc1d1e1c52c0cd207b9214b3e04ce4b5a14c3..675931874eb4f0fe5321bef26b8dc5cd17bd4496 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -37,7 +37,7 @@
 using std::string;
 using boost::shared_ptr;
 
-/** Test creation of a DCP from very simple inputs */
+/** Test creation of a 2D DCP from very simple inputs */
 BOOST_AUTO_TEST_CASE (dcp_test1)
 {
        Kumu::libdcp_test = true;
@@ -52,10 +52,10 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
        mxf_meta.product_name = "OpenDCP";
        mxf_meta.product_version = "0.0.25";
 
-       /* We're making build/test/foo */
-       boost::filesystem::remove_all ("build/test/DCP/foo");
-       boost::filesystem::create_directories ("build/test/DCP/foo");
-       dcp::DCP d ("build/test/DCP/foo");
+       /* We're making build/test/DCP/dcp_test1 */
+       boost::filesystem::remove_all ("build/test/DCP/dcp_test1");
+       boost::filesystem::create_directories ("build/test/DCP/dcp_test1");
+       dcp::DCP d ("build/test/DCP/dcp_test1");
        shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
        cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
        cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 
        shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
        mp->set_metadata (mxf_meta);
-       shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/DCP/foo/video.mxf", dcp::SMPTE, false);
+       shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test1/video.mxf", dcp::SMPTE, false);
        dcp::File j2c ("test/data/32x32_red_square.j2c");
        for (int i = 0; i < 24; ++i) {
                picture_writer->write (j2c.data (), j2c.size ());
@@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 
        shared_ptr<dcp::SoundMXF> ms (new dcp::SoundMXF (dcp::Fraction (24, 1), 48000, 1));
        ms->set_metadata (mxf_meta);
-       shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/DCP/foo/audio.mxf", dcp::SMPTE);
+       shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::SMPTE);
 
        SF_INFO info;
        info.format = 0;
@@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 
        d.write_xml (dcp::SMPTE, xml_meta);
 
-       /* build/test/DCP/foo is checked against test/ref/DCP/foo by run-tests.sh */
+       /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run-tests.sh */
 }
 
 static void
@@ -117,9 +117,9 @@ note (dcp::NoteType, string s)
 /** Test comparison of a DCP with itself */
 BOOST_AUTO_TEST_CASE (dcp_test2)
 {
-       dcp::DCP A ("test/ref/DCP/foo");
+       dcp::DCP A ("test/ref/DCP/dcp_test1");
        A.read ();
-       dcp::DCP B ("test/ref/DCP/foo");
+       dcp::DCP B ("test/ref/DCP/dcp_test1");
        B.read ();
        
        BOOST_CHECK (A.equals (B, dcp::EqualityOptions(), boost::bind (&note, _1, _2)));

diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc
index a17b0a01dbcd138125c1aed77615bba99c2edd94..6aed62a4d1d0050e16ef5d8a8de2d14c815bea4d 100644 (file)
--- a/test/read_dcp_test.cc
+++ b/test/read_dcp_test.cc
@@ -27,7 +27,7 @@ using boost::shared_ptr;
 /* Read DCP that is in git and make sure that basic stuff is read in correctly */
 BOOST_AUTO_TEST_CASE (read_dcp)
 {
-       dcp::DCP d ("test/ref/DCP/foo");
+       dcp::DCP d ("test/ref/DCP/dcp_test1");
        d.read ();
 
        list<shared_ptr<dcp::CPL> > cpls = d.cpls ();

diff --git a/test/ref/DCP/dcp_test1/18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml b/test/ref/DCP/dcp_test1/18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml
new file mode 100644 (file)
index 0000000..3e64ae8
--- /dev/null
+++ b/test/ref/DCP/dcp_test1/18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText><Hash>4ZY77QueHCuLXJ2MIgohwjKkuX0=</Hash><Size>1374</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText><Hash>no3HZX+eHqH8ieD5TMjU6ttBXT0=</Hash><Size>26080</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><AnnotationText>9482e87d-292d-4e0e-a98d-c61822b60fe9</AnnotationText><Hash>iabMZ6tQHjrgQ+cXbCH1Y4d7Fjk=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>

diff --git a/test/ref/DCP/dcp_test1/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml b/test/ref/DCP/dcp_test1/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml
new file mode 100644 (file)
index 0000000..2fc53fb
--- /dev/null
+++ b/test/ref/DCP/dcp_test1/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</Id><AssetList><MainPicture><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>no3HZX+eHqH8ieD5TMjU6ttBXT0=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>iabMZ6tQHjrgQ+cXbCH1Y4d7Fjk=</Hash></MainSound></AssetList></Reel></ReelList></CompositionPlaylist>

diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml
new file mode 100644 (file)
index 0000000..58e60c2
--- /dev/null
+++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><ChunkList><Chunk><Path>81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1374</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>

diff --git a/test/ref/DCP/dcp_test1/VOLINDEX.xml b/test/ref/DCP/dcp_test1/VOLINDEX.xml
new file mode 100644 (file)
index 0000000..021685e
--- /dev/null
+++ b/test/ref/DCP/dcp_test1/VOLINDEX.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VolumeIndex xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Index>1</Index></VolumeIndex>

diff --git a/test/ref/DCP/dcp_test1/audio.mxf b/test/ref/DCP/dcp_test1/audio.mxf
new file mode 100644 (file)
index 0000000..0d6ab6b
Binary files /dev/null and b/test/ref/DCP/dcp_test1/audio.mxf differ

diff --git a/test/ref/DCP/dcp_test1/video.mxf b/test/ref/DCP/dcp_test1/video.mxf
new file mode 100644 (file)
index 0000000..dc0afea
Binary files /dev/null and b/test/ref/DCP/dcp_test1/video.mxf differ

diff --git a/test/ref/DCP/foo/18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml b/test/ref/DCP/foo/18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml
deleted file mode 100644 (file)
index 3e64ae8..0000000
--- a/test/ref/DCP/foo/18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText><Hash>4ZY77QueHCuLXJ2MIgohwjKkuX0=</Hash><Size>1374</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText><Hash>no3HZX+eHqH8ieD5TMjU6ttBXT0=</Hash><Size>26080</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><AnnotationText>9482e87d-292d-4e0e-a98d-c61822b60fe9</AnnotationText><Hash>iabMZ6tQHjrgQ+cXbCH1Y4d7Fjk=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>

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
deleted file mode 100644 (file)
index 2fc53fb..0000000
--- a/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</Id><AssetList><MainPicture><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>no3HZX+eHqH8ieD5TMjU6ttBXT0=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>iabMZ6tQHjrgQ+cXbCH1Y4d7Fjk=</Hash></MainSound></AssetList></Reel></ReelList></CompositionPlaylist>

diff --git a/test/ref/DCP/foo/ASSETMAP.xml b/test/ref/DCP/foo/ASSETMAP.xml
deleted file mode 100644 (file)
index 58e60c2..0000000
--- a/test/ref/DCP/foo/ASSETMAP.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><ChunkList><Chunk><Path>81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1374</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>

diff --git a/test/ref/DCP/foo/VOLINDEX.xml b/test/ref/DCP/foo/VOLINDEX.xml
deleted file mode 100644 (file)
index 021685e..0000000
--- a/test/ref/DCP/foo/VOLINDEX.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VolumeIndex xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Index>1</Index></VolumeIndex>

diff --git a/test/ref/DCP/foo/audio.mxf b/test/ref/DCP/foo/audio.mxf
deleted file mode 100644 (file)
index 0d6ab6b..0000000
Binary files a/test/ref/DCP/foo/audio.mxf and /dev/null differ

diff --git a/test/ref/DCP/foo/video.mxf b/test/ref/DCP/foo/video.mxf
deleted file mode 100644 (file)
index dc0afea..0000000
Binary files a/test/ref/DCP/foo/video.mxf and /dev/null differ