X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=f95001b4a46f3839840679ad7100ec49230ac9f9;hb=23f98da47e29bda194297630909dd1cad3d83a62;hp=2ed5e46a4187e3b89155ffb09b19f7e0029ff195;hpb=43465aa4037cec6d351a842a6624a50685d6c127;p=libdcp.git

diff --git a/test/util_test.cc b/test/util_test.cc
index 2ed5e46a..f95001b4 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013 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/>.
 */
 
 #include <fstream>
@@ -24,10 +24,11 @@
 using std::ifstream;
 using std::string;
 
-BOOST_AUTO_TEST_CASE (bsae64_decode_test)
+/** Test dcp::base64_decode */
+BOOST_AUTO_TEST_CASE (base64_decode_test)
 {
 	int const N = 256;
-	
+
 	ifstream f ("test/data/base64_test");
 	BOOST_CHECK (f.good ());
 	string s;
@@ -47,10 +48,77 @@ BOOST_AUTO_TEST_CASE (bsae64_decode_test)
 	}
 
 	unsigned char decoded[N];
-	int const r = libdcp::base64_decode (s, decoded, N);
+	int const r = dcp::base64_decode (s, decoded, N);
 	BOOST_CHECK_EQUAL (r, N);
 
 	for (int i = 0; i < N; ++i) {
 		BOOST_CHECK_EQUAL (decoded[i], ref_decoded[i]);
 	}
 }
+
+/** Test dcp::content_kind_from_string */
+BOOST_AUTO_TEST_CASE (content_kind_test)
+{
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("feature"), dcp::FEATURE);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Feature"), dcp::FEATURE);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("FeaturE"), dcp::FEATURE);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Short"), dcp::SHORT);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("trailer"), dcp::TRAILER);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("test"), dcp::TEST);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("transitional"), dcp::TRANSITIONAL);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("rating"), dcp::RATING);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("teaser"), dcp::TEASER);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("policy"), dcp::POLICY);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("psa"), dcp::PUBLIC_SERVICE_ANNOUNCEMENT);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("advertisement"), dcp::ADVERTISEMENT);
+}
+
+/** Test dcp::relative_to_root */
+BOOST_AUTO_TEST_CASE (relative_to_root_test)
+{
+	{
+		boost::filesystem::path root = "a";
+		root /= "b";
+
+		boost::filesystem::path file = "a";
+		file /= "b";
+		file /= "c";
+
+		boost::optional<boost::filesystem::path> rel = dcp::relative_to_root (root, file);
+		BOOST_CHECK (rel);
+		BOOST_CHECK_EQUAL (rel.get(), boost::filesystem::path ("c"));
+	}
+
+	{
+		boost::filesystem::path root = "a";
+		root /= "b";
+		root /= "c";
+
+		boost::filesystem::path file = "a";
+		file /= "b";
+
+		boost::optional<boost::filesystem::path> rel = dcp::relative_to_root (root, file);
+		BOOST_CHECK (!rel);
+	}
+
+	{
+		boost::filesystem::path root = "a";
+
+		boost::filesystem::path file = "a";
+		file /= "b";
+		file /= "c";
+
+		boost::optional<boost::filesystem::path> rel = dcp::relative_to_root (root, file);
+		BOOST_CHECK (rel);
+
+		boost::filesystem::path check = "b";
+		check /= "c";
+		BOOST_CHECK_EQUAL (rel.get(), check);
+	}
+}
+
+/** Test private_key_fingerprint() */
+BOOST_AUTO_TEST_CASE (private_key_fingerprint_test)
+{
+	BOOST_CHECK_EQUAL (dcp::private_key_fingerprint (dcp::file_to_string ("test/data/private.key")), "Jdz1bFpCcKI7R16Ccx9JHYytag0=");
+}