projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use period when adding text subs, like we do with image ones.
[dcpomatic.git]
/
test
/
create_cli_test.cc
diff --git
a/test/create_cli_test.cc
b/test/create_cli_test.cc
index 5425969b6d8f1c4acd745772b4a4b9dfec1f465f..9010dae21e6b190ba44da41edddacb79d8b38229 100644
(file)
--- a/
test/create_cli_test.cc
+++ b/
test/create_cli_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2019
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-21,6
+21,7
@@
#include "lib/create_cli.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
#include "lib/create_cli.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
+#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string/predicate.hpp>
@@
-98,7
+99,11
@@
BOOST_AUTO_TEST_CASE (create_cli_test)
cc = run ("dcpomatic2_create x --standard SMPTE");
BOOST_CHECK (!cc.error);
cc = run ("dcpomatic2_create x --standard SMPTE");
BOOST_CHECK (!cc.error);
- BOOST_CHECK_EQUAL (cc.standard, dcp::SMPTE);
+ BOOST_CHECK_EQUAL (cc.standard, dcp::Standard::SMPTE);
+
+ cc = run ("dcpomatic2_create x --standard interop");
+ BOOST_CHECK (!cc.error);
+ BOOST_CHECK_EQUAL (cc.standard, dcp::Standard::INTEROP);
cc = run ("dcpomatic2_create x --standard SMPTEX");
BOOST_CHECK (cc.error);
cc = run ("dcpomatic2_create x --standard SMPTEX");
BOOST_CHECK (cc.error);
@@
-123,30
+128,30
@@
BOOST_AUTO_TEST_CASE (create_cli_test)
BOOST_CHECK_EQUAL (cc.still_length, 42);
BOOST_REQUIRE (cc.output_dir);
BOOST_CHECK_EQUAL (*cc.output_dir, "flaps");
BOOST_CHECK_EQUAL (cc.still_length, 42);
BOOST_REQUIRE (cc.output_dir);
BOOST_CHECK_EQUAL (*cc.output_dir, "flaps");
- BOOST_REQUIRE_EQUAL (cc.content.size(), 3);
+ BOOST_REQUIRE_EQUAL (cc.content.size(), 3
U
);
BOOST_CHECK_EQUAL (cc.content[0].path, "fred");
BOOST_CHECK_EQUAL (cc.content[0].path, "fred");
- BOOST_CHECK_EQUAL (cc.content[0].frame_type, V
IDEO_FRAME_TYPE_2
D);
+ BOOST_CHECK_EQUAL (cc.content[0].frame_type, V
ideoFrameType::TWO_
D);
BOOST_CHECK_EQUAL (cc.content[1].path, "jim");
BOOST_CHECK_EQUAL (cc.content[1].path, "jim");
- BOOST_CHECK_EQUAL (cc.content[1].frame_type, V
IDEO_FRAME_TYPE_2
D);
+ BOOST_CHECK_EQUAL (cc.content[1].frame_type, V
ideoFrameType::TWO_
D);
BOOST_CHECK_EQUAL (cc.content[2].path, "sheila");
BOOST_CHECK_EQUAL (cc.content[2].path, "sheila");
- BOOST_CHECK_EQUAL (cc.content[2].frame_type, V
IDEO_FRAME_TYPE_2
D);
+ BOOST_CHECK_EQUAL (cc.content[2].frame_type, V
ideoFrameType::TWO_
D);
cc = run ("dcpomatic2_create --left-eye left.mp4 --right-eye right.mp4");
cc = run ("dcpomatic2_create --left-eye left.mp4 --right-eye right.mp4");
- BOOST_REQUIRE_EQUAL (cc.content.size(), 2);
+ BOOST_REQUIRE_EQUAL (cc.content.size(), 2
U
);
BOOST_CHECK_EQUAL (cc.content[0].path, "left.mp4");
BOOST_CHECK_EQUAL (cc.content[0].path, "left.mp4");
- BOOST_CHECK_EQUAL (cc.content[0].frame_type, V
IDEO_FRAME_TYPE_3
D_LEFT);
+ BOOST_CHECK_EQUAL (cc.content[0].frame_type, V
ideoFrameType::THREE_
D_LEFT);
BOOST_CHECK_EQUAL (cc.content[1].path, "right.mp4");
BOOST_CHECK_EQUAL (cc.content[1].path, "right.mp4");
- BOOST_CHECK_EQUAL (cc.content[1].frame_type, V
IDEO_FRAME_TYPE_3
D_RIGHT);
+ BOOST_CHECK_EQUAL (cc.content[1].frame_type, V
ideoFrameType::THREE_
D_RIGHT);
BOOST_CHECK_EQUAL (cc.fourk, false);
cc = run ("dcpomatic2_create --fourk foo.mp4");
BOOST_CHECK_EQUAL (cc.fourk, false);
cc = run ("dcpomatic2_create --fourk foo.mp4");
- BOOST_REQUIRE_EQUAL (cc.content.size(), 1);
+ BOOST_REQUIRE_EQUAL (cc.content.size(), 1
U
);
BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
BOOST_CHECK_EQUAL (cc.fourk, true);
BOOST_CHECK (!cc.error);
cc = run ("dcpomatic2_create --j2k-bandwidth 120 foo.mp4");
BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
BOOST_CHECK_EQUAL (cc.fourk, true);
BOOST_CHECK (!cc.error);
cc = run ("dcpomatic2_create --j2k-bandwidth 120 foo.mp4");
- BOOST_REQUIRE_EQUAL (cc.content.size(), 1);
+ BOOST_REQUIRE_EQUAL (cc.content.size(), 1
U
);
BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
BOOST_REQUIRE (cc.j2k_bandwidth);
BOOST_CHECK_EQUAL (*cc.j2k_bandwidth, 120000000);
BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
BOOST_REQUIRE (cc.j2k_bandwidth);
BOOST_CHECK_EQUAL (*cc.j2k_bandwidth, 120000000);