projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d28648
)
Fix test.
author
Carl Hetherington
<cth@carlh.net>
Tue, 3 Nov 2015 10:54:45 +0000
(10:54 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 3 Nov 2015 10:54:45 +0000
(10:54 +0000)
test/vf_test.cc
patch
|
blob
|
history
diff --git
a/test/vf_test.cc
b/test/vf_test.cc
index 904f1d559ca9c692d73ab75505110aa73acd3b9f..124a9061abc95616f8ddbff0166de06e5dad736d 100644
(file)
--- a/
test/vf_test.cc
+++ b/
test/vf_test.cc
@@
-22,6
+22,7
@@
#include "lib/ffmpeg_content.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
#include "lib/ffmpeg_content.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
+#include <boost/foreach.hpp>
using std::list;
using std::string;
using std::list;
using std::string;
@@
-46,7
+47,8
@@
BOOST_AUTO_TEST_CASE (vf_test1)
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
BOOST_CHECK (dcp->can_reference_video(why_not));
BOOST_CHECK (dcp->can_reference_audio(why_not));
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
BOOST_CHECK (dcp->can_reference_video(why_not));
BOOST_CHECK (dcp->can_reference_audio(why_not));
- BOOST_CHECK (dcp->can_reference_subtitle(why_not));
+ /* (but reels_test2 has no subtitles to reference) */
+ BOOST_CHECK (!dcp->can_reference_subtitle(why_not));
shared_ptr<FFmpegContent> other (new FFmpegContent (film, "test/data/test.mp4"));
film->examine_and_add_content (other);
shared_ptr<FFmpegContent> other (new FFmpegContent (film, "test/data/test.mp4"));
film->examine_and_add_content (other);
@@
-62,5
+64,6
@@
BOOST_AUTO_TEST_CASE (vf_test1)
other->set_position (dcp->end ());
BOOST_CHECK (dcp->can_reference_video(why_not));
BOOST_CHECK (dcp->can_reference_audio(why_not));
other->set_position (dcp->end ());
BOOST_CHECK (dcp->can_reference_video(why_not));
BOOST_CHECK (dcp->can_reference_audio(why_not));
- BOOST_CHECK (dcp->can_reference_subtitle(why_not));
+ /* (reels_test2 has no subtitles to reference) */
+ BOOST_CHECK (!dcp->can_reference_subtitle(why_not));
}
}