summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-17 21:31:40 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-17 21:31:40 +0000
commitf389d903e967f44a5d6eed60df48bd5a89994bb2 (patch)
tree4f53ee5910cad4a75f342ecf242532a52c558c29 /test
parentbfc511b3e2fae3540db2679bfb4532cf4d1e6d05 (diff)
Remove create-by-files method for sound and picture assets.
Diffstat (limited to 'test')
-rw-r--r--test/error_test.cc47
-rw-r--r--test/wscript5
2 files changed, 2 insertions, 50 deletions
diff --git a/test/error_test.cc b/test/error_test.cc
deleted file mode 100644
index 52d97556..00000000
--- a/test/error_test.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <boost/test/unit_test.hpp>
-#include "dcp.h"
-#include "mono_picture_asset.h"
-#include "sound_asset.h"
-#include "util.h"
-#include "exceptions.h"
-
-using std::vector;
-using std::string;
-
-/* Check that an exception is thrown when trying to create MXFs from non-existant sources */
-BOOST_AUTO_TEST_CASE (error_test)
-{
- /* Create an empty DCP */
- dcp::DCP d ("build/test/fred");
-
- /* Random filename that does not exist */
- vector<boost::filesystem::path> p;
- p.push_back ("frobozz");
-
- /* Trying to create video/audio MXFs using a non-existant file should throw an exception */
- dcp::MonoPictureAsset pa ("build/test/fred", "video.mxf");
- BOOST_CHECK_THROW (pa.create (p), dcp::FileError);
-
- dcp::SoundAsset sa ("build/test/fred", "audio.mxf");
- sa.set_channels (1);
- BOOST_CHECK_THROW (sa.create (p), dcp::FileError);
-}
diff --git a/test/wscript b/test/wscript
index 1235a26d..b2b1b038 100644
--- a/test/wscript
+++ b/test/wscript
@@ -20,15 +20,14 @@ def build(bld):
obj.name = 'tests'
obj.uselib = 'BOOST_TEST OPENJPEG CXML XMLSEC1'
obj.use = 'libdcp'
+# dcp_test.cc
+# encryption_test.cc
obj.source = """
certificates_test.cc
color_test.cc
cpl_sar.cc
- dcp_test.cc
dcp_time_test.cc
decryption_test.cc
- encryption_test.cc
- error_test.cc
frame_info_test.cc
kdm_key_test.cc
kdm_test.cc