diff options
Diffstat (limited to 'test/create_cli_test.cc')
| -rw-r--r-- | test/create_cli_test.cc | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/test/create_cli_test.cc b/test/create_cli_test.cc index aae5fb6de..7006fa6a0 100644 --- a/test/create_cli_test.cc +++ b/test/create_cli_test.cc @@ -179,11 +179,11 @@ BOOST_AUTO_TEST_CASE (create_cli_test) BOOST_CHECK_EQUAL(cc._fourk, true); BOOST_CHECK (!cc.error); - cc = run ("dcpomatic2_create --j2k-bandwidth 120 foo.mp4"); + cc = run ("dcpomatic2_create --video-bit-rate 120 foo.mp4"); BOOST_REQUIRE_EQUAL (cc.content.size(), 1U); BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4"); - BOOST_REQUIRE(cc._j2k_bandwidth); - BOOST_CHECK_EQUAL(*cc._j2k_bandwidth, 120000000); + BOOST_REQUIRE(cc._video_bit_rate); + BOOST_CHECK_EQUAL(*cc._video_bit_rate, 120000000); BOOST_CHECK (!cc.error); cc = run ("dcpomatic2_create --channel L fred.wav --channel R jim.wav sheila.wav"); @@ -224,9 +224,7 @@ BOOST_AUTO_TEST_CASE (create_cli_test) BOOST_AUTO_TEST_CASE(create_cli_template_test) { - ConfigRestorer cr; - - Config::override_path = "test/data"; + ConfigRestorer cr("test/data"); auto cc = run("dcpomatic2_create test/data/flat_red.png"); auto film = cc.make_film(); @@ -288,25 +286,3 @@ BOOST_AUTO_TEST_CASE(create_cli_template_test) film = cc.make_film(); BOOST_CHECK(film->interop()); } - - -BOOST_AUTO_TEST_CASE(create_cli_defaults_test) -{ - ConfigRestorer cr; - - /* I think on balance dcpomatic2_create should not use the defaults from Config; - * it seems a bit surprising that settings from a GUI tool can change the behaviour of - * a CLI tool, and at some point we're probably going to remove all the default config - * options from the main DoM anyway (in favour of a default template). - */ - Config::instance()->set_default_interop(true); - auto cc = run("dcpomatic2_create test/data/flat_red.png"); - auto film = cc.make_film(); - BOOST_CHECK(!film->interop()); - - Config::instance()->set_default_dcp_content_type(DCPContentType::from_isdcf_name("FT")); - cc = run("dcpomatic2_create test/data/flat_red.png"); - film = cc.make_film(); - BOOST_CHECK_EQUAL(film->dcp_content_type()->isdcf_name(), "TST"); -} - |