X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_filename_sorter_test.cc;h=69f8c9ff13dc261d89534ecb25468605fbf694cf;hb=6bc1976ac8780a4f7aa32d8c13d8bafe7eb537a8;hp=830065f772cd2c551231229e3b1c46490d3c8864;hpb=a8bb830716aa68ace88cdbc560f562efa1bcda18;p=dcpomatic.git

diff --git a/test/image_filename_sorter_test.cc b/test/image_filename_sorter_test.cc
index 830065f77..69f8c9ff1 100644
--- a/test/image_filename_sorter_test.cc
+++ b/test/image_filename_sorter_test.cc
@@ -1,26 +1,26 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+#include "lib/image_filename_sorter.h"
 #include <boost/test/unit_test.hpp>
 
-#include "lib/image_filename_sorter.cc"
-
 BOOST_AUTO_TEST_CASE (image_filename_sorter_test)
 {
 	ImageFilenameSorter x;
@@ -31,6 +31,8 @@ BOOST_AUTO_TEST_CASE (image_filename_sorter_test)
 	BOOST_CHECK (x ("1", "999"));
 	BOOST_CHECK (x ("00057.tif", "00166.tif"));
 	BOOST_CHECK (x ("/my/numeric999/path/00057.tif", "/my/numeric999/path/00166.tif"));
+	BOOST_CHECK (x ("1_01.tif", "1_02.tif"));
+	BOOST_CHECK (x ("EWS_DCP_092815_000000.j2c", "EWS_DCP_092815_000001.j2c"));
 
 	BOOST_CHECK (!x ("abc0000000002", "abc0000000001"));
 	BOOST_CHECK (!x ("2", "1"));
@@ -38,4 +40,7 @@ BOOST_AUTO_TEST_CASE (image_filename_sorter_test)
 	BOOST_CHECK (!x ("2", "0001"));
 	BOOST_CHECK (!x ("999", "1"));
 	BOOST_CHECK (!x ("/my/numeric999/path/00166.tif", "/my/numeric999/path/00057.tif"));
+	BOOST_CHECK (!x ("1_02.tif", "1_01.tif"));
+	BOOST_CHECK (!x ("EWS_DCP_092815_000000.j2c", "EWS_DCP_092815_000000.j2c"));
+	BOOST_CHECK (!x ("EWS_DCP_092815_000100.j2c", "EWS_DCP_092815_000000.j2c"));
 }