X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_filename_sorter_test.cc;h=113c24d108f2736f1a56b1b6912195acd79d3f0f;hb=676751fcd38bee7a687bba027e2fd6eb44446dec;hp=57dd4078f5ab9235931d2b8273a0c2e7cafbd69c;hpb=bd0ddc4da8fa288130dbadd34f84de0ed3368d01;p=dcpomatic.git

diff --git a/test/image_filename_sorter_test.cc b/test/image_filename_sorter_test.cc
index 57dd4078f..113c24d10 100644
--- a/test/image_filename_sorter_test.cc
+++ b/test/image_filename_sorter_test.cc
@@ -1,41 +1,51 @@
 /*
     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 <boost/test/unit_test.hpp>
+/** @file  test/image_filename_sorter_test.cc
+ *  @brief Test ImageFilenameSorter
+ *  @ingroup selfcontained
+ */
 
-#include "lib/image_filename_sorter.cc"
+#include "lib/image_filename_sorter.h"
+#include <boost/test/unit_test.hpp>
 
 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"));
+	BOOST_CHECK (x ("abc0000000001", "abc0000000002"));
+	BOOST_CHECK (x ("1", "2"));
+	BOOST_CHECK (x ("1", "0002"));
+	BOOST_CHECK (x ("0001", "2"));
+	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"));
+	BOOST_CHECK (!x ("0002", "1"));
+	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"));
 }