Some comments in tests.

diff --git a/hacks/start_servers.sh b/hacks/start_servers.sh
index 200824f1ea229981606aaf34d8cdff5f38436883..997181849e70259afe6281f2277eac81a6cb54de 100644 (file)
--- a/hacks/start_servers.sh
+++ b/hacks/start_servers.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#dsh -m cs2-17 -m cs2-18 -m cs2-19 -m cs2-20 \
-#    "screen -dmS dcpomatic bash -c 'cd src/dcpomatic2; LD_LIBRARY_PATH=$HOME/ubuntu/lib run/dcpomatic_server_cli --verbose'"
-dsh -m cs2-5 -m cs2-6 -m cs2-7 -m cs2-8 \
+dsh -m cs2-17 -m cs2-18 -m cs2-19 -m cs2-20 \
     "screen -dmS dcpomatic bash -c 'cd src/dcpomatic2; LD_LIBRARY_PATH=$HOME/ubuntu/lib run/dcpomatic_server_cli --verbose'"
+#dsh -m cs2-5 -m cs2-6 -m cs2-7 -m cs2-8 \
+#    "screen -dmS dcpomatic bash -c 'cd src/dcpomatic2; LD_LIBRARY_PATH=$HOME/ubuntu/lib run/dcpomatic_server_cli --verbose'"

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 80cd9c3df35d200873a8b86907ab11908ae47eb2..3f6f41b55af551a9a4c044282b59bb0b7e50fb37 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -70,5 +70,6 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
        B->make_dcp ();
        wait_for_jobs ();
 
-       check_dcp ("build/test/import_dcp_test2/" + B->dcp_name(), "test/data/import_dcp_test2");
+       /* Should be 1s red, 1s green, 1s blue */
+       check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name());
 }

diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
index 1d19d269e314b2a448ab31dbbfcf73ceea9eaf1c..d836fcbddf4e47e6c7f2c3961d2b2b08e34aee5c 100644 (file)
--- a/test/repeat_frame_test.cc
+++ b/test/repeat_frame_test.cc
@@ -50,6 +50,7 @@ BOOST_AUTO_TEST_CASE (repeat_frame_test)
        film->make_dcp ();
        wait_for_jobs ();
 
+       /* Should be 32 frames of red */
        check_dcp ("test/data/repeat_frame_test", film->dir (film->dcp_name ()));
 }
 

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 105683ad1aea88d802fea9c0449085cb43bb2871..8d9df8977198a353eb1d12de3c85fbd0d2f6c308 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -66,12 +66,18 @@ BOOST_AUTO_TEST_CASE (scaling_test)
        
        imc->set_video_length (1);
 
+       /* F-133: 133 image in a flat container */
        scaling_test_for (film, imc, "133", "185");
+       /* F: flat image in a flat container */
        scaling_test_for (film, imc, "185", "185");
+       /* F-S: scope image in a flat container */
        scaling_test_for (film, imc, "239", "185");
 
+       /* S-133: 133 image in a scope container */
        scaling_test_for (film, imc, "133", "239");
+       /* S-F: flat image in a scope container */
        scaling_test_for (film, imc, "185", "239");
+       /* S: scope image in a scope container */
        scaling_test_for (film, imc, "239", "239");
 }
 

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index dac7b5a25a7aa18ea79c52ec2c36e37d945b2f08..da3997fc7198602b790350129891c7bddc7fb411 100644 (file)
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -51,6 +51,9 @@ BOOST_AUTO_TEST_CASE (skip_frame_test)
        film->make_dcp ();
        wait_for_jobs ();
 
+       /* Should be white numbers on a black background counting up from 2 in steps of 2
+          up to 300.
+       */
        check_dcp ("test/data/skip_frame_test", film->dir (film->dcp_name ()));
 }
 

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index fd9632a31d444b537ab9fe2631158aad3b429460..2279308e1bb446e14cac37eb2f647cd0929fe181 100644 (file)
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -46,6 +46,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
        film->make_dcp ();
        wait_for_jobs ();
 
+       /* Should be blank video with a subtitle MXF */
        check_dcp ("test/data/srt_subtitle_test", film->dir (film->dcp_name ()));
 }
 
@@ -68,6 +69,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
        film->make_dcp ();
        wait_for_jobs ();
 
+       /* Should be blank video with a subtitle MXF */
        check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
 }
 

diff --git a/test/xml_subtitle_test.cc b/test/xml_subtitle_test.cc
index 7c3ca3efe68e45847f44937e47808d35ecb65b4b..8f44fa7229bdb4b060086e820704994ac038fdee 100644 (file)
--- a/test/xml_subtitle_test.cc
+++ b/test/xml_subtitle_test.cc
@@ -46,5 +46,6 @@ BOOST_AUTO_TEST_CASE (xml_subtitle_test)
        film->make_dcp ();
        wait_for_jobs ();
 
+       /* Should be blank video with MXF subtitles */
        check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ()));
 }