GNOME.org
 

[gnome-keyring/dbus-api] Refactor test directory function calls.

commit a9f72e0c12acdc8a38a08aac938bb521825696db
Author: Stef Walter <stef memberwebs com>
Date:   Sun Nov 8 00:17:50 2009 +0000

    Refactor test directory function calls.
    
    Make test_data_*() and test_scratch_*() function calls.

 daemon/keyrings/tests/unit-test-keyring-file.c     |    6 +++---
 egg/tests/unit-test-asn1.c                         |    2 +-
 egg/tests/unit-test-dh.c                           |    4 ++--
 egg/tests/unit-test-openssl.c                      |    2 +-
 egg/tests/unit-test-spawn.c                        |   12 ++++++------
 gcr/tests/unit-test-certificate.c                  |    2 +-
 gcr/tests/unit-test-parser.c                       |    4 ++--
 pkcs11/gck/tests/test-module.c                     |    2 +-
 pkcs11/gck/tests/unit-test-data-asn1.c             |    2 +-
 pkcs11/gck/tests/unit-test-data-der.c              |   10 +++++-----
 pkcs11/gck/tests/unit-test-data-file.c             |    6 +++---
 pkcs11/gck/tests/unit-test-object.c                |    2 +-
 pkcs11/gck/tests/unit-test-transaction.c           |   12 ++++++------
 .../secret-store/tests/unit-test-secret-binary.c   |   10 +++++-----
 .../tests/unit-test-secret-collection.c            |   14 ++++++++------
 .../secret-store/tests/unit-test-secret-textual.c  |    8 ++++----
 pkcs11/ssh-store/tests/unit-test-private-key.c     |    8 ++++----
 pkcs11/ssh-store/tests/unit-test-ssh-openssh.c     |    6 +++---
 tests/gtest-helpers.c                              |   20 ++++++++++++++++----
 tests/gtest-helpers.h                              |    8 +++++---
 20 files changed, 78 insertions(+), 62 deletions(-)
---
diff --git a/daemon/keyrings/tests/unit-test-keyring-file.c b/daemon/keyrings/tests/unit-test-keyring-file.c
index 4453c80..7d36da8 100644
--- a/daemon/keyrings/tests/unit-test-keyring-file.c
+++ b/daemon/keyrings/tests/unit-test-keyring-file.c
@@ -42,7 +42,7 @@ location_for_test_data (const gchar *filename)
 	GQuark quark;
 	gchar *path;
 	
-	path = g_build_filename (test_dir_testdata (), filename, NULL);
+	path = test_data_filename (filename);
 	quark = gkr_location_from_path (path);
 	g_free (path);
 	
@@ -130,7 +130,7 @@ DEFINE_TEST(keyring_parse_encrypted)
 	encrypted->password = "my-keyring-password";
 	plain = gkr_keyring_new ("plain", 0);
 	
-	data = test_read_testdata ("encrypted.keyring", &n_data);
+	data = test_data_read ("encrypted.keyring", &n_data);
 
 	/* Parse it */
 	egg_buffer_init_allocated (&buffer, data, n_data, NULL);
@@ -181,7 +181,7 @@ DEFINE_TEST(keyring_parse_plain)
 	
 	keyring = gkr_keyring_new ("plain", 0);
 	
-	data = test_read_testdata ("plain.keyring", &n_data);
+	data = test_data_read ("plain.keyring", &n_data);
 		
 	/* Parse it */
 	egg_buffer_init_static (&buffer, (guchar*)data, n_data);
diff --git a/egg/tests/unit-test-asn1.c b/egg/tests/unit-test-asn1.c
index bcd44d0..b0e20b2 100644
--- a/egg/tests/unit-test-asn1.c
+++ b/egg/tests/unit-test-asn1.c
@@ -55,7 +55,7 @@ DEFINE_SETUP(asn1_tree)
 
 	/* -------- */
 	
-	data_cert = test_read_testdata ("test-certificate-1.der", &n_data_cert);
+	data_cert = test_data_read ("test-certificate-1.der", &n_data_cert);
 
 	/* We'll be catching this error later */
 	pkix = egg_asn1_get_pkix_asn1type ();
diff --git a/egg/tests/unit-test-dh.c b/egg/tests/unit-test-dh.c
index e400cbc..7166760 100644
--- a/egg/tests/unit-test-dh.c
+++ b/egg/tests/unit-test-dh.c
@@ -38,7 +38,7 @@ DEFINE_TEST(dh_parse_pkcs3)
 	gsize n_data;
 	gboolean ret;
 
-	data = test_read_testdata ("dh-params.pem", &n_data);
+	data = test_data_read ("dh-params.pem", &n_data);
 	ret = egg_dh_parse_pkcs3 (data, n_data, &p, &g);
 	g_assert (ret == TRUE);
 	g_assert (gcry_mpi_get_nbits (p) == 1024);
@@ -67,7 +67,7 @@ DEFINE_TEST(dh_perform)
 	gboolean ret;
 
 	/* Load up the parameters */
-	data = test_read_testdata ("dh-params.pem", &n_data);
+	data = test_data_read ("dh-params.pem", &n_data);
 	if (!egg_dh_parse_pkcs3 (data, n_data, &p, &g))
 		g_assert_not_reached ();
 	g_free (data);
diff --git a/egg/tests/unit-test-openssl.c b/egg/tests/unit-test-openssl.c
index 3e2572d..f7dbed7 100644
--- a/egg/tests/unit-test-openssl.c
+++ b/egg/tests/unit-test-openssl.c
@@ -76,7 +76,7 @@ DEFINE_TEST(parse_reference)
 	gsize n_input;
 	guint num;
 	
-	input = test_read_testdata ("pem-rsa-enc.key", &n_input);
+	input = test_data_read ("pem-rsa-enc.key", &n_input);
 
 	num = egg_openssl_pem_parse (input, n_input, parse_reference, NULL);
 	g_assert ("couldn't PEM block in reference data" && num == 1);
diff --git a/egg/tests/unit-test-spawn.c b/egg/tests/unit-test-spawn.c
index 6b38d9b..f61798b 100644
--- a/egg/tests/unit-test-spawn.c
+++ b/egg/tests/unit-test-spawn.c
@@ -172,14 +172,14 @@ DEFINE_TEST(test_spawn_sync)
 	data.parent_pid = getpid();
 	data.index = 80;
 
-	ret = egg_spawn_sync_with_callbacks (test_dir_testdata (),
+	ret = egg_spawn_sync_with_callbacks (test_data_directory (),
 	                                     echo_argv, NULL, 0, &pid,
 	                                     &echo_callbacks, &data,
 	                                     &exit_status, &error);
 	g_assert (ret == TRUE);
 	g_assert (pid != 0);
 	g_assert (WIFEXITED (exit_status));
-	g_assert (WEXITSTATUS(exit_status) == 3);
+	g_assert_cmpint (WEXITSTATUS(exit_status), ==, 3);
 	g_assert (error == NULL);
 	g_assert (data.finalized);
 	g_assert (data.completed);
@@ -192,7 +192,7 @@ DEFINE_TEST(test_spawn_sync_error)
 	GError *error = NULL;
 	gboolean ret;
 
-	ret = egg_spawn_sync_with_callbacks (test_dir_testdata (),
+	ret = egg_spawn_sync_with_callbacks (test_data_directory (),
 	                                     error_argv, NULL, 0, NULL,
 	                                     NULL, NULL,
 	                                     NULL, &error);
@@ -214,7 +214,7 @@ DEFINE_TEST(test_spawn_async)
 	data.index = 80;
 	data.is_async = TRUE;
 
-	ret = egg_spawn_async_with_callbacks (test_dir_testdata (),
+	ret = egg_spawn_async_with_callbacks (test_data_directory (),
 	                                     echo_argv, NULL, 0, &pid,
 	                                     &echo_callbacks, &data,
 	                                     NULL, &error);
@@ -242,7 +242,7 @@ DEFINE_TEST(test_spawn_async_none)
 	data.parent_pid = getpid();
 	data.is_async = TRUE;
 
-	ret = egg_spawn_async_with_callbacks (test_dir_testdata (),
+	ret = egg_spawn_async_with_callbacks (test_data_directory (),
 	                                     echo_argv, NULL, 0, NULL,
 	                                     &null_callbacks, &data,
 	                                     NULL, &error);
@@ -264,7 +264,7 @@ DEFINE_TEST(test_spawn_async_error)
 	GError *error = NULL;
 	guint ret;
 
-	ret = egg_spawn_async_with_callbacks (test_dir_testdata (),
+	ret = egg_spawn_async_with_callbacks (test_data_directory (),
 	                                     error_argv, NULL, 0, NULL,
 	                                     NULL, NULL,
 	                                     NULL, &error);
diff --git a/gcr/tests/unit-test-certificate.c b/gcr/tests/unit-test-certificate.c
index 1f16288..387593b 100644
--- a/gcr/tests/unit-test-certificate.c
+++ b/gcr/tests/unit-test-certificate.c
@@ -16,7 +16,7 @@ DEFINE_SETUP(certificate)
 	guchar *contents;
 	gsize n_contents;
 	
-	contents = test_read_testdata ("der-certificate.crt", &n_contents);
+	contents = test_data_read ("der-certificate.crt", &n_contents);
 	certificate = gcr_simple_certificate_new (contents, n_contents);
 	g_assert (certificate);
 	g_free (contents);
diff --git a/gcr/tests/unit-test-parser.c b/gcr/tests/unit-test-parser.c
index d22ede5..252d1db 100644
--- a/gcr/tests/unit-test-parser.c
+++ b/gcr/tests/unit-test-parser.c
@@ -113,7 +113,7 @@ DEFINE_TEST(parse_all)
 	gsize len;
 	GDir *dir;
 	
-	dir = g_dir_open (test_dir_testdata (), 0, NULL);
+	dir = g_dir_open (test_data_directory (), 0, NULL);
 	g_assert (dir);
 
 	for (;;) {
@@ -124,7 +124,7 @@ DEFINE_TEST(parse_all)
 			continue;
 		
 		filedesc = filename;
-		contents = test_read_testdata (filename, &len);
+		contents = test_data_read (filename, &len);
 		
 		result = gcr_parser_parse_data (parser, contents, len, &err);
 		if (!result) { 
diff --git a/pkcs11/gck/tests/test-module.c b/pkcs11/gck/tests/test-module.c
index 7ee9f7d..b3abe7d 100644
--- a/pkcs11/gck/tests/test-module.c
+++ b/pkcs11/gck/tests/test-module.c
@@ -98,7 +98,7 @@ test_module_object_new (GckSession *session)
 	CK_CERTIFICATE_TYPE type = CKC_X_509;
 
 	gsize n_data;
-	guchar *data = test_read_testdata ("test-certificate-1.der", &n_data);
+	guchar *data = test_data_read ("test-certificate-1.der", &n_data);
 
 	CK_ATTRIBUTE attrs[] = {
 		{ CKA_TOKEN, &token, sizeof (token) },
diff --git a/pkcs11/gck/tests/unit-test-data-asn1.c b/pkcs11/gck/tests/unit-test-data-asn1.c
index c98b7ec..f02fe16 100644
--- a/pkcs11/gck/tests/unit-test-data-asn1.c
+++ b/pkcs11/gck/tests/unit-test-data-asn1.c
@@ -54,7 +54,7 @@ DEFINE_SETUP(asn1_tree)
 
 	/* -------- */
 	
-	data_cert = test_read_testdata ("test-certificate-1.der", &n_data_cert);
+	data_cert = test_data_read ("test-certificate-1.der", &n_data_cert);
 
 	/* We'll be catching this error later */
 	pkix = egg_asn1_get_pkix_asn1type ();
diff --git a/pkcs11/gck/tests/unit-test-data-der.c b/pkcs11/gck/tests/unit-test-data-der.c
index d1960c9..b641dd0 100644
--- a/pkcs11/gck/tests/unit-test-data-der.c
+++ b/pkcs11/gck/tests/unit-test-data-der.c
@@ -108,11 +108,11 @@ test_der_public (gcry_sexp_t key)
 
 DEFINE_SETUP(preload)
 {
-	certificate_data = test_read_testdata ("test-certificate-1.der", &n_certificate_data);	
+	certificate_data = test_data_read ("test-certificate-1.der", &n_certificate_data);
 	certificate = egg_asn1_decode ("PKIX1.Certificate", certificate_data, n_certificate_data);
 	g_assert (certificate);
 
-	certificate2_data = test_read_testdata ("test-certificate-2.der", &n_certificate2_data);	
+	certificate2_data = test_data_read ("test-certificate-2.der", &n_certificate2_data);
 	certificate2 = egg_asn1_decode ("PKIX1.Certificate", certificate2_data, n_certificate2_data);
 	g_assert (certificate2);
 }
@@ -370,7 +370,7 @@ DEFINE_TEST(read_all_pkcs8)
 	guchar *data;
 	gsize n_data;
 	
-	dir = g_dir_open (test_dir_testdata (), 0, NULL);
+	dir = g_dir_open (test_data_directory (), 0, NULL);
 	g_assert (dir);
 	
 	for(;;) {
@@ -381,7 +381,7 @@ DEFINE_TEST(read_all_pkcs8)
 		if (!g_pattern_match_simple ("der-pkcs8-*", name))
 			continue;
 		
-		data = test_read_testdata (name, &n_data);
+		data = test_data_read (name, &n_data);
 		res = gck_data_der_read_private_pkcs8 (data, n_data, "booo", 4, &sexp);
 		g_assert (res == GCK_DATA_SUCCESS);
 		
@@ -400,7 +400,7 @@ DEFINE_TEST(read_pkcs8_bad_password)
 	guchar *data;
 	gsize n_data;
 	
-	data = test_read_testdata ("der-pkcs8-encrypted-pkcs5.key", &n_data);
+	data = test_data_read ("der-pkcs8-encrypted-pkcs5.key", &n_data);
 	res = gck_data_der_read_private_pkcs8 (data, n_data, "wrong password", 4, &sexp);
 	g_assert (res == GCK_DATA_LOCKED);
 	
diff --git a/pkcs11/gck/tests/unit-test-data-file.c b/pkcs11/gck/tests/unit-test-data-file.c
index 6112b1d..f1fd723 100644
--- a/pkcs11/gck/tests/unit-test-data-file.c
+++ b/pkcs11/gck/tests/unit-test-data-file.c
@@ -42,9 +42,9 @@ static GckSecret *login = NULL;
 
 DEFINE_SETUP(file_store)
 {
-	public_filename = g_build_filename (test_dir_testdata (), "data-file-public.store", NULL);
-	private_filename = g_build_filename (test_dir_testdata (), "data-file-private.store", NULL);
-	write_filename = test_build_filename ("unit-test-file.store");
+	public_filename = test_data_filename ("data-file-public.store");
+	private_filename = test_data_filename ("data-file-private.store");
+	write_filename = test_scratch_filename ("unit-test-file.store");
 
 	data_file = gck_data_file_new ();
 
diff --git a/pkcs11/gck/tests/unit-test-object.c b/pkcs11/gck/tests/unit-test-object.c
index 54e3f29..ee1dea1 100644
--- a/pkcs11/gck/tests/unit-test-object.c
+++ b/pkcs11/gck/tests/unit-test-object.c
@@ -41,7 +41,7 @@ DEFINE_SETUP(object_setup)
 {
 	module = test_module_initialize_and_enter ();
 	session = test_module_open_session (TRUE);
-	certificate_data = test_read_testdata ("test-certificate-1.der", &certificate_n_data);
+	certificate_data = test_data_read ("test-certificate-1.der", &certificate_n_data);
 }
 
 DEFINE_TEARDOWN(object_teardown)
diff --git a/pkcs11/gck/tests/unit-test-transaction.c b/pkcs11/gck/tests/unit-test-transaction.c
index f3647a0..cb4ccdd 100644
--- a/pkcs11/gck/tests/unit-test-transaction.c
+++ b/pkcs11/gck/tests/unit-test-transaction.c
@@ -190,7 +190,7 @@ DEFINE_TEST(transaction_dispose_completes)
 DEFINE_TEST(remove_file_success)
 {
 	GckTransaction *transaction = gck_transaction_new ();
-	gchar *filename = test_build_filename ("remove-file");
+	gchar *filename = test_scratch_filename ("remove-file");
 	
 	g_assert (g_file_set_contents (filename, "xxx", 3, NULL));
 	g_assert (g_file_test (filename, G_FILE_TEST_IS_REGULAR));
@@ -210,7 +210,7 @@ DEFINE_TEST(remove_file_success)
 DEFINE_TEST(remove_file_abort)
 {
 	GckTransaction *transaction = gck_transaction_new ();
-	gchar *filename = test_build_filename ("remove-file");
+	gchar *filename = test_scratch_filename ("remove-file");
 	gchar *data;
 	gsize n_data;
 	
@@ -242,7 +242,7 @@ DEFINE_TEST(remove_file_abort)
 DEFINE_TEST(remove_file_non_exist)
 {
 	GckTransaction *transaction = gck_transaction_new ();
-	gchar *filename = test_build_filename ("remove-non-existant");
+	gchar *filename = test_scratch_filename ("remove-non-existant");
 
 	g_unlink (filename);
 	
@@ -258,7 +258,7 @@ DEFINE_TEST(remove_file_non_exist)
 DEFINE_TEST(write_file)
 {
 	GckTransaction *transaction = gck_transaction_new ();
-	gchar *filename = test_build_filename ("write-test");
+	gchar *filename = test_scratch_filename ("write-test");
 	gchar *data;
 	gsize n_data;
 	
@@ -284,7 +284,7 @@ DEFINE_TEST(write_file)
 DEFINE_TEST(write_file_abort_gone)
 {
 	GckTransaction *transaction = gck_transaction_new ();
-	gchar *filename = test_build_filename ("write-test");
+	gchar *filename = test_scratch_filename ("write-test");
 	gchar *data;
 	gsize n_data;
 	
@@ -310,7 +310,7 @@ DEFINE_TEST(write_file_abort_gone)
 DEFINE_TEST(write_file_abort_revert)
 {
 	GckTransaction *transaction = gck_transaction_new ();
-	gchar *filename = test_build_filename ("write-test");
+	gchar *filename = test_scratch_filename ("write-test");
 	gchar *data;
 	
 	g_assert (g_file_set_contents (filename, "my original", -1, NULL));
diff --git a/pkcs11/secret-store/tests/unit-test-secret-binary.c b/pkcs11/secret-store/tests/unit-test-secret-binary.c
index 7393037..ceafb02 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-binary.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-binary.c
@@ -90,7 +90,7 @@ DEFINE_TEST(binary_read)
 	guchar *data;
 	gsize n_data;
 
-	data = test_read_testdata ("encrypted.keyring", &n_data);
+	data = test_data_read ("encrypted.keyring", &n_data);
 	res = gck_secret_binary_read (collection, sdata, data, n_data);
 	g_free (data);
 
@@ -105,7 +105,7 @@ DEFINE_TEST(binary_read_wrong_format)
 	guchar *data;
 	gsize n_data;
 
-	data = test_read_testdata ("plain.keyring", &n_data);
+	data = test_data_read ("plain.keyring", &n_data);
 	res = gck_secret_binary_read (collection, sdata, data, n_data);
 	g_free (data);
 
@@ -123,7 +123,7 @@ DEFINE_TEST(binary_read_wrong_master)
 	gck_secret_data_set_master (sdata, master);
 	g_object_unref (master);
 
-	data = test_read_testdata ("encrypted.keyring", &n_data);
+	data = test_data_read ("encrypted.keyring", &n_data);
 	res = gck_secret_binary_read (collection, sdata, data, n_data);
 	g_free (data);
 
@@ -138,7 +138,7 @@ DEFINE_TEST(binary_read_sdata_but_no_master)
 
 	gck_secret_data_set_master (sdata, NULL);
 
-	data = test_read_testdata ("encrypted.keyring", &n_data);
+	data = test_data_read ("encrypted.keyring", &n_data);
 	res = gck_secret_binary_read (collection, sdata, data, n_data);
 	g_free (data);
 
@@ -170,7 +170,7 @@ DEFINE_TEST(binary_remove_unavailable)
 	guchar *data;
 	gsize n_data;
 
-	data = test_read_testdata ("encrypted.keyring", &n_data);
+	data = test_data_read ("encrypted.keyring", &n_data);
 	res = gck_secret_binary_read (collection, sdata, data, n_data);
 	g_assert (res == GCK_DATA_SUCCESS);
 
diff --git a/pkcs11/secret-store/tests/unit-test-secret-collection.c b/pkcs11/secret-store/tests/unit-test-secret-collection.c
index ba6a5a1..854ee90 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-collection.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-collection.c
@@ -32,6 +32,8 @@
 #include "gck/gck-authenticator.h"
 #include "gck/gck-session.h"
 
+#include "pkcs11/pkcs11i.h"
+
 #include <glib.h>
 
 #include <stdlib.h>
@@ -129,7 +131,7 @@ DEFINE_TEST(secret_collection_load_unlock_plain)
 	gchar *filename;
 	CK_RV rv;
 
-	filename = g_build_filename (test_dir_testdata (), "plain.keyring", NULL);
+	filename = test_data_filename ("plain.keyring");
 	gck_secret_collection_set_filename (collection, filename);
 	g_free (filename);
 
@@ -156,7 +158,7 @@ DEFINE_TEST(secret_collection_load_unlock_encrypted)
 	gchar *filename;
 	CK_RV rv;
 
-	filename = g_build_filename (test_dir_testdata (), "encrypted.keyring", NULL);
+	filename = test_data_filename ("encrypted.keyring");
 	gck_secret_collection_set_filename (collection, filename);
 	g_free (filename);
 
@@ -183,7 +185,7 @@ DEFINE_TEST(secret_collection_load_unlock_bad_password)
 	gchar *filename;
 	CK_RV rv;
 
-	filename = g_build_filename (test_dir_testdata (), "encrypted.keyring", NULL);
+	filename = test_data_filename ("encrypted.keyring");
 	gck_secret_collection_set_filename (collection, filename);
 	g_free (filename);
 
@@ -204,7 +206,7 @@ DEFINE_TEST(secret_collection_unlock_without_load)
 	gchar *filename;
 	CK_RV rv;
 
-	filename = g_build_filename (test_dir_testdata (), "encrypted.keyring", NULL);
+	filename = test_data_filename ("encrypted.keyring");
 	gck_secret_collection_set_filename (collection, filename);
 	g_free (filename);
 
@@ -227,7 +229,7 @@ DEFINE_TEST(secret_collection_twice_unlock)
 	gchar *filename;
 	CK_RV rv;
 
-	filename = g_build_filename (test_dir_testdata (), "encrypted.keyring", NULL);
+	filename = test_data_filename ("encrypted.keyring");
 	gck_secret_collection_set_filename (collection, filename);
 	g_free (filename);
 
@@ -257,7 +259,7 @@ DEFINE_TEST(secret_collection_twice_unlock_bad_password)
 	gchar *filename;
 	CK_RV rv;
 
-	filename = g_build_filename (test_dir_testdata (), "encrypted.keyring", NULL);
+	filename = test_data_filename ("encrypted.keyring");
 	gck_secret_collection_set_filename (collection, filename);
 	g_free (filename);
 
diff --git a/pkcs11/secret-store/tests/unit-test-secret-textual.c b/pkcs11/secret-store/tests/unit-test-secret-textual.c
index ba0c0ab..e317199 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-textual.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-textual.c
@@ -85,7 +85,7 @@ DEFINE_TEST(textual_read)
 	guchar *data;
 	gsize n_data;
 
-	data = test_read_testdata ("plain.keyring", &n_data);
+	data = test_data_read ("plain.keyring", &n_data);
 	res = gck_secret_textual_read (collection, sdata, data, n_data);
 	g_free (data);
 
@@ -100,7 +100,7 @@ DEFINE_TEST(textual_read_wrong_format)
 	guchar *data;
 	gsize n_data;
 
-	data = test_read_testdata ("encrypted.keyring", &n_data);
+	data = test_data_read ("encrypted.keyring", &n_data);
 	res = gck_secret_textual_read (collection, sdata, data, n_data);
 	g_free (data);
 
@@ -115,7 +115,7 @@ DEFINE_TEST(textual_read_bad_number)
 	guchar *data;
 	gsize n_data;
 
-	data = test_read_testdata ("plain-bad-number.keyring", &n_data);
+	data = test_data_read ("plain-bad-number.keyring", &n_data);
 	res = gck_secret_textual_read (collection, sdata, data, n_data);
 	g_free (data);
 
@@ -154,7 +154,7 @@ DEFINE_TEST(textual_remove_unavailable)
 	guchar *data;
 	gsize n_data;
 
-	data = test_read_testdata ("plain.keyring", &n_data);
+	data = test_data_read ("plain.keyring", &n_data);
 	res = gck_secret_textual_read (collection, sdata, data, n_data);
 	g_assert (res == GCK_DATA_SUCCESS);
 
diff --git a/pkcs11/ssh-store/tests/unit-test-private-key.c b/pkcs11/ssh-store/tests/unit-test-private-key.c
index b32b28b..9e09997 100644
--- a/pkcs11/ssh-store/tests/unit-test-private-key.c
+++ b/pkcs11/ssh-store/tests/unit-test-private-key.c
@@ -57,8 +57,8 @@ DEFINE_TEST(private_key_parse_plain)
 	key = gck_ssh_private_key_new (module, "my-unique");
 	g_assert (GCK_IS_SSH_PRIVATE_KEY (key));
 
-	pub_path = g_build_filename (test_dir_testdata (), "id_dsa_plain.pub", NULL);
-	priv_path = g_build_filename (test_dir_testdata (), "id_dsa_plain", NULL);
+	pub_path = test_data_filename ("id_dsa_plain.pub");
+	priv_path = test_data_filename ("id_dsa_plain");
 	
 	ret = gck_ssh_private_key_parse (key, pub_path, priv_path, NULL);
 	g_assert (ret == TRUE);
@@ -80,8 +80,8 @@ DEFINE_TEST(private_key_parse_and_unlock)
 	key = gck_ssh_private_key_new (module, "my-unique");
 	g_assert (GCK_IS_SSH_PRIVATE_KEY (key));
 
-	pub_path = g_build_filename (test_dir_testdata (), "id_dsa_encrypted.pub", NULL);
-	priv_path = g_build_filename (test_dir_testdata (), "id_dsa_encrypted", NULL);
+	pub_path = test_data_filename ("id_dsa_encrypted.pub");
+	priv_path = test_data_filename ("id_dsa_encrypted");
 	
 	ret = gck_ssh_private_key_parse (key, pub_path, priv_path, NULL);
 	g_assert (ret == TRUE);
diff --git a/pkcs11/ssh-store/tests/unit-test-ssh-openssh.c b/pkcs11/ssh-store/tests/unit-test-ssh-openssh.c
index 27be831..121245c 100644
--- a/pkcs11/ssh-store/tests/unit-test-ssh-openssh.c
+++ b/pkcs11/ssh-store/tests/unit-test-ssh-openssh.c
@@ -63,7 +63,7 @@ DEFINE_TEST(parse_public)
 	
 	for (i = 0; i < G_N_ELEMENTS (PUBLIC_FILES); ++i) {
 		
-		data = test_read_testdata (PUBLIC_FILES[i], &n_data);
+		data = test_data_read (PUBLIC_FILES[i], &n_data);
 		
 		res = gck_ssh_openssh_parse_public_key (data, n_data, &sexp, &comment);
 		if (res != GCK_DATA_SUCCESS) {
@@ -97,7 +97,7 @@ DEFINE_TEST(parse_private)
 	
 	for (i = 0; i < G_N_ELEMENTS (PRIVATE_FILES); ++i) {
 		
-		data = test_read_testdata (PRIVATE_FILES[i], &n_data);
+		data = test_data_read (PRIVATE_FILES[i], &n_data);
 		
 		res = gck_ssh_openssh_parse_private_key (data, n_data, "password", 8, &sexp);
 		if (res != GCK_DATA_SUCCESS) {
@@ -114,4 +114,4 @@ DEFINE_TEST(parse_private)
 		g_free (data);
 		gcry_sexp_release (sexp);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/gtest-helpers.c b/tests/gtest-helpers.c
index 88ac2c5..ff584af 100644
--- a/tests/gtest-helpers.c
+++ b/tests/gtest-helpers.c
@@ -88,14 +88,26 @@ test_mainloop_get (void)
 	return mainloop;
 }
 
+const gchar*
+test_scratch_directory (void)
+{
+	return test_path;
+}
+
 gchar*
-test_build_filename (const gchar *basename)
+test_scratch_filename (const gchar *basename)
 {
 	return g_build_filename (test_path, basename, NULL);
 }
 
+gchar*
+test_data_filename (const gchar *basename)
+{
+	return g_build_filename (test_data_directory (), basename, NULL);
+}
+
 const gchar*
-test_dir_testdata (void)
+test_data_directory (void)
 {
 	const gchar *dir;
 	gchar *cur, *env;
@@ -118,13 +130,13 @@ test_dir_testdata (void)
 }
 
 guchar* 
-test_read_testdata (const gchar *basename, gsize *n_result)
+test_data_read (const gchar *basename, gsize *n_result)
 {
 	GError *error = NULL;
 	gchar *result;
 	gchar *file;
 
-	file = g_build_filename (test_dir_testdata (), basename, NULL);
+	file = test_data_filename (basename);
 	if (!g_file_get_contents (file, &result, n_result, &error)) {
 		g_warning ("could not read test data file: %s: %s", file,
 		           error && error->message ? error->message : "");
diff --git a/tests/gtest-helpers.h b/tests/gtest-helpers.h
index 417d791..311d215 100644
--- a/tests/gtest-helpers.h
+++ b/tests/gtest-helpers.h
@@ -39,9 +39,11 @@ void test_mainloop_quit (void);
 void test_mainloop_run (int timeout);
 GMainLoop* test_mainloop_get (void);
 
-const gchar* test_dir_testdata (void);
-guchar* test_read_testdata (const gchar *basename, gsize *n_data);
-gchar* test_build_filename (const gchar *basename);
+const gchar* test_data_directory (void);
+const gchar* test_scratch_directory (void);
+guchar* test_data_read (const gchar *basename, gsize *n_data);
+gchar* test_scratch_filename (const gchar *basename);
+gchar* test_data_filename (const gchar *basename);
 
 #define DECLARE_SETUP(x) \
 	void setup_##x(int *v, gconstpointer d)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]