From f030e63e223379c25d049d66f9ddd2c779619cec Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Jun 2015 14:29:25 +0100 Subject: [PATCH] Some comments in tests. --- hacks/start_servers.sh | 6 +++--- test/import_dcp_test.cc | 3 ++- test/repeat_frame_test.cc | 1 + test/scaling_test.cc | 6 ++++++ test/skip_frame_test.cc | 3 +++ test/srt_subtitle_test.cc | 2 ++ test/xml_subtitle_test.cc | 1 + 7 files changed, 18 insertions(+), 4 deletions(-) diff --git a/hacks/start_servers.sh b/hacks/start_servers.sh index 200824f1e..997181849 100644 --- 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 80cd9c3df..3f6f41b55 100644 --- 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 1d19d269e..d836fcbdd 100644 --- 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 105683ad1..8d9df8977 100644 --- 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 dac7b5a25..da3997fc7 100644 --- 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 fd9632a31..2279308e1 100644 --- 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 7c3ca3efe..8f44fa722 100644 --- 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 ())); } -- 2.30.2