projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better information when check_audio_file fails.
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index bdd17e6a1dc5d66442808754295b792122136e38..791154077f21585a3f3fa63980cde82fedb14a1d 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-21,12
+21,6
@@
* @brief Overall test stuff and useful methods for tests.
*/
* @brief Overall test stuff and useful methods for tests.
*/
-#include <vector>
-#include <list>
-#include <Magick++.h>
-#include <sndfile.h>
-#include <libxml++/libxml++.h>
-#include <dcp/dcp.h>
#include "lib/config.h"
#include "lib/util.h"
#include "lib/signal_manager.h"
#include "lib/config.h"
#include "lib/util.h"
#include "lib/signal_manager.h"
@@
-34,11
+28,20
@@
#include "lib/job_manager.h"
#include "lib/job.h"
#include "lib/cross.h"
#include "lib/job_manager.h"
#include "lib/job.h"
#include "lib/cross.h"
-#include "lib/server_finder.h"
+#include "lib/
encode_
server_finder.h"
#include "lib/image.h"
#include "lib/image.h"
+#include "lib/ratio.h"
+#include "lib/log_entry.h"
+#include <dcp/dcp.h>
+#include <sndfile.h>
+#include <libxml++/libxml++.h>
+#include <Magick++.h>
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE dcpomatic_test
#include <boost/test/unit_test.hpp>
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE dcpomatic_test
#include <boost/test/unit_test.hpp>
+#include <list>
+#include <vector>
+#include <iostream>
using std::string;
using std::vector;
using std::string;
using std::vector;
@@
-75,8
+78,9
@@
struct TestConfig
Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
Config::instance()->set_default_audio_delay (0);
Config::instance()->set_default_j2k_bandwidth (100000000);
Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
Config::instance()->set_default_audio_delay (0);
Config::instance()->set_default_j2k_bandwidth (100000000);
+ Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
- ServerFinder::instance()->disable ();
+
Encode
ServerFinder::instance()->disable ();
signal_manager = new TestSignalManager ();
}
signal_manager = new TestSignalManager ();
}
@@
-106,7
+110,7
@@
new_test_film (string name)
if (boost::filesystem::exists (p)) {
boost::filesystem::remove_all (p);
}
if (boost::filesystem::exists (p)) {
boost::filesystem::remove_all (p);
}
-
+
shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
film->write_metadata ();
return film;
shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
film->write_metadata ();
return film;
@@
-119,7
+123,7
@@
check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
ref_info.format = 0;
SNDFILE* ref_file = sf_open (ref.string().c_str(), SFM_READ, &ref_info);
BOOST_CHECK (ref_file);
ref_info.format = 0;
SNDFILE* ref_file = sf_open (ref.string().c_str(), SFM_READ, &ref_info);
BOOST_CHECK (ref_file);
-
+
SF_INFO check_info;
check_info.format = 0;
SNDFILE* check_file = sf_open (check.string().c_str(), SFM_READ, &check_info);
SF_INFO check_info;
check_info.format = 0;
SNDFILE* check_file = sf_open (check.string().c_str(), SFM_READ, &check_info);
@@
-134,7
+138,7
@@
check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
sf_count_t const buffer_size = 65536 * ref_info.channels;
scoped_array<int32_t> ref_buffer (new int32_t[buffer_size]);
scoped_array<int32_t> check_buffer (new int32_t[buffer_size]);
sf_count_t const buffer_size = 65536 * ref_info.channels;
scoped_array<int32_t> ref_buffer (new int32_t[buffer_size]);
scoped_array<int32_t> check_buffer (new int32_t[buffer_size]);
-
+
sf_count_t N = ref_info.frames;
while (N) {
sf_count_t this_time = min (buffer_size, N);
sf_count_t N = ref_info.frames;
while (N) {
sf_count_t this_time = min (buffer_size, N);
@@
-144,7
+148,11
@@
check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
BOOST_CHECK_EQUAL (r, this_time);
for (sf_count_t i = 0; i < this_time; ++i) {
BOOST_CHECK_EQUAL (r, this_time);
for (sf_count_t i = 0; i < this_time; ++i) {
- BOOST_REQUIRE (abs (ref_buffer[i] - check_buffer[i]) <= 65536);
+ BOOST_REQUIRE_MESSAGE (
+ abs (ref_buffer[i] - check_buffer[i]) <= 65536,
+ ref << " differs from " << check << " at " << (ref_info.frames - N + i) << " of " << ref_info.frames
+ << "(" << ref_buffer[i] << " vs " << check_buffer[i] << ")"
+ );
}
N -= this_time;
}
N -= this_time;
@@
-160,14
+168,14
@@
check_file (boost::filesystem::path ref, boost::filesystem::path check)
BOOST_CHECK (ref_file);
FILE* check_file = fopen_boost (check, "rb");
BOOST_CHECK (check_file);
BOOST_CHECK (ref_file);
FILE* check_file = fopen_boost (check, "rb");
BOOST_CHECK (check_file);
-
+
int const buffer_size = 65536;
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
SafeStringStream error;
error << "File " << check.string() << " differs from reference " << ref.string();
int const buffer_size = 65536;
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
SafeStringStream error;
error << "File " << check.string() << " differs from reference " << ref.string();
-
+
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
size_t r = fread (ref_buffer, 1, this_time, ref_file);
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
size_t r = fread (ref_buffer, 1, this_time, ref_file);
@@
-179,7
+187,7
@@
check_file (boost::filesystem::path ref, boost::filesystem::path check)
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}
-
+
N -= this_time;
}
N -= this_time;
}
@@
-214,7
+222,7
@@
check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
options.reel_annotation_texts_can_differ = true;
options.reel_hashes_can_differ = true;
options.issue_dates_can_differ = true;
options.reel_annotation_texts_can_differ = true;
options.reel_hashes_can_differ = true;
options.issue_dates_can_differ = true;
-
+
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
}
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
}
@@
-287,11
+295,10
@@
wait_for_jobs ()
{
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {
{
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {
- signal_manager->ui_idle ();
+ while (signal_manager->ui_idle ()) {}
+ dcpomatic_sleep (1);
}
}
- cout << "Waiting for jobs: all finished; errors=" << jm->errors() << ".\n";
-
if (jm->errors ()) {
int N = 0;
for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
if (jm->errors ()) {
int N = 0;
for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
@@
-310,13
+317,10
@@
wait_for_jobs ()
}
}
}
}
- signal_manager->ui_idle ();
+ while (signal_manager->ui_idle ()) {}
if (jm->errors ()) {
if (jm->errors ()) {
- cout << "Dropping JobManager\n";
JobManager::drop ();
JobManager::drop ();
- } else {
- cout << "Not dropping JobManager\n";
}
}
}
}
@@
-327,7
+331,7
@@
write_image (shared_ptr<const Image> image, boost::filesystem::path file)
using namespace MagickCore;
#else
using namespace MagickLib;
using namespace MagickCore;
#else
using namespace MagickLib;
-#endif
+#endif
Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
m.write (file.string ());
Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
m.write (file.string ());