X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Futil_test.cc;h=4f387aaf3716840cc988c0d1a0095b6fdbef3100;hb=b651392d70d7e37ce5a8a20da81d86e5d19aadd8;hp=15f22f57db5806099825661115d4b19c8af2ea92;hpb=bfb33feb40c5b014e9eae3958b1ecb8161f1d090;p=libdcp.git

diff --git a/test/util_test.cc b/test/util_test.cc
index 15f22f57..4f387aaf 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>
@@ -23,11 +23,13 @@
 
 using std::ifstream;
 using std::string;
+using std::list;
 
+/** 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;
@@ -55,6 +57,7 @@ BOOST_AUTO_TEST_CASE (base64_decode_test)
 	}
 }
 
+/** Test dcp::content_kind_from_string */
 BOOST_AUTO_TEST_CASE (content_kind_test)
 {
 	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("feature"), dcp::FEATURE);
@@ -71,16 +74,17 @@ BOOST_AUTO_TEST_CASE (content_kind_test)
 	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"));
@@ -90,21 +94,21 @@ BOOST_AUTO_TEST_CASE (relative_to_root_test)
 		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);
 
@@ -113,3 +117,20 @@ BOOST_AUTO_TEST_CASE (relative_to_root_test)
 		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=");
+}
+
+BOOST_AUTO_TEST_CASE (unique_string_test)
+{
+	list<string> existing;
+	for (int i = 0; i < 16; i++) {
+		string s;
+		BOOST_CHECK_NO_THROW (s = dcp::unique_string(existing, "foo"));
+		BOOST_CHECK (find(existing.begin(), existing.end(), s) == existing.end());
+		existing.push_back (s);
+	}
+}