summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-02-17 23:43:23 +0000
committerCarl Hetherington <cth@carlh.net>2015-02-17 23:43:23 +0000
commitbd0ddc4da8fa288130dbadd34f84de0ed3368d01 (patch)
treeb549b01ee6f950f1b8ff0ee944e8fd5e68fdb37f /test
parentf2416324fdaef8d75678da751446113fbe19de8a (diff)
Hand-apply 71a4c0f5440688a38a2bb34170a3ccf9b1ea598f from 1.x;
correctly sort image sequences.
Diffstat (limited to 'test')
-rw-r--r--test/image_filename_sorter_test.cc41
-rw-r--r--test/wscript1
2 files changed, 42 insertions, 0 deletions
diff --git a/test/image_filename_sorter_test.cc b/test/image_filename_sorter_test.cc
new file mode 100644
index 000000000..57dd4078f
--- /dev/null
+++ b/test/image_filename_sorter_test.cc
@@ -0,0 +1,41 @@
+/*
+ Copyright (C) 2015 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 "lib/image_filename_sorter.cc"
+
+BOOST_AUTO_TEST_CASE (image_filename_sorter_test)
+{
+ ImageFilenameSorter x;
+ BOOST_ASSERT (x ("abc0000000001", "abc0000000002"));
+ BOOST_ASSERT (x ("1", "2"));
+ BOOST_ASSERT (x ("1", "0002"));
+ BOOST_ASSERT (x ("0001", "2"));
+ BOOST_ASSERT (x ("1", "999"));
+ BOOST_ASSERT (x ("00057.tif", "00166.tif"));
+ BOOST_ASSERT (x ("/my/numeric999/path/00057.tif", "/my/numeric999/path/00166.tif"));
+
+ BOOST_ASSERT (!x ("abc0000000002", "abc0000000001"));
+ BOOST_ASSERT (!x ("2", "1"));
+ BOOST_ASSERT (!x ("0002", "1"));
+ BOOST_ASSERT (!x ("2", "0001"));
+ BOOST_ASSERT (!x ("999", "1"));
+ BOOST_ASSERT (!x ("/my/numeric999/path/00166.tif", "/my/numeric999/path/00057.tif"));
+}
diff --git a/test/wscript b/test/wscript
index 8831b6391..16e84f231 100644
--- a/test/wscript
+++ b/test/wscript
@@ -39,6 +39,7 @@ def build(bld):
file_log_test.cc
film_metadata_test.cc
frame_rate_test.cc
+ image_filename_sorter_test.cc
image_test.cc
import_dcp_test.cc
isdcf_name_test.cc