gnome-keyring r1576 - in trunk: . gcr/tests

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Feb 14 03:44:55 2009
New Revision: 1576
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1576&view=rev

Log:
Allow loading any DER certificate file.

Modified:
   trunk/ChangeLog
   trunk/gcr/tests/ui-test-details.c

Modified: trunk/gcr/tests/ui-test-details.c
==============================================================================
--- trunk/gcr/tests/ui-test-details.c	(original)
+++ trunk/gcr/tests/ui-test-details.c	Sat Feb 14 03:44:55 2009
@@ -32,7 +32,7 @@
 }
 
 static void
-test_details (void)
+test_details (const gchar *path)
 {
 	GcrCertificateDetailsWidget *details;
 	GcrCertificate *certificate;
@@ -40,8 +40,8 @@
 	guchar *data;
 	gsize n_data;
 	
-	if (!g_file_get_contents ("test-data/der-certificate.crt", (gchar**)&data, &n_data, NULL))
-		g_assert_not_reached ();
+	if (!g_file_get_contents (path, (gchar**)&data, &n_data, NULL))
+		g_error ("couldn't read file: %s", path);
 	
 	certificate = gcr_simple_certificate_new (data, n_data);
 	g_assert (certificate);
@@ -65,8 +65,14 @@
 int
 main(int argc, char *argv[])
 {
-	chdir_base_dir (argv[0]);
 	gtk_init (&argc, &argv);
-	test_details ();
+	
+	if (argc > 1) {
+		test_details (argv[1]);
+	} else {
+		chdir_base_dir (argv[0]);
+		test_details ("test-data/der-certificate.crt");
+	}
+	
 	return 0;
 }