Allow tests to be run on Windows.

[libdcp.git] / test / asset_test.cc

diff --git a/test/asset_test.cc b/test/asset_test.cc
index c53aca68a18346a0173bb1f9ea956d82219cff30..d6257ebc9939d0683c9a9f472e929e852e5b0e3f 100644 (file)
--- a/test/asset_test.cc
+++ b/test/asset_test.cc
@@ -1,55 +1,71 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
-#include <boost/test/unit_test.hpp>
+
 #include "asset.h"
+#include <boost/bind.hpp>
+#include <boost/test/unit_test.hpp>
+
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
+
 
 class DummyAsset : public dcp::Asset
 {
 protected:
-       std::string pkl_type (dcp::Standard standard) const {
+       std::string pkl_type (dcp::Standard) const override {
                return "none";
        }
 };
 
-static void
-note_handler (dcp::NoteType, string)
-{
-
-}
 
 /** Test a few dusty corners of Asset */
 BOOST_AUTO_TEST_CASE (asset_test)
 {
-       shared_ptr<DummyAsset> a (new DummyAsset);
+       auto a = make_shared<DummyAsset>();
        a->_hash = "abc";
-       shared_ptr<DummyAsset> b (new DummyAsset);
+       auto b = make_shared<DummyAsset>();
        b->_hash = "def";
 
-       BOOST_CHECK (!a->equals (b, dcp::EqualityOptions (), boost::bind (&note_handler, _1, _2)));
+       auto ignore = [](dcp::NoteType, string) {};
+
+       BOOST_CHECK (!a->equals(b, dcp::EqualityOptions(), ignore));
 
        b->_hash = "abc";
-       BOOST_CHECK (a->equals (b, dcp::EqualityOptions (), boost::bind (&note_handler, _1, _2)));
+       BOOST_CHECK (a->equals(b, dcp::EqualityOptions(), ignore));
 
        b->_file = "foo/bar/baz";
-       BOOST_CHECK (a->equals (b, dcp::EqualityOptions (), boost::bind (&note_handler, _1, _2)));
+       BOOST_CHECK (a->equals(b, dcp::EqualityOptions(), ignore));
 }