Modernize the remainder of the tests.

 * Bring up to date with gtester running and individual binaries.
 * Make the tests run in make distcheck

1 files changed, 482 insertions, 0 deletions

diff --git a/pkcs11/secret-store/tests/test-secret-item.c b/pkcs11/secret-store/tests/test-secret-item.c
new file mode 100644
index 00000000..2198cf2e
--- /dev/null
+++ b/pkcs11/secret-store/tests/test-secret-item.c
@@ -0,0 +1,482 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* unit-test-secret-item.c: Test secret item
+
+   Copyright (C) 2009 Stefan Walter
+
+   The Gnome Keyring Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Keyring Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Author: Stef Walter <stef@memberwebs.com>
+*/
+
+#include "config.h"
+
+#include "mock-secret-module.h"
+
+#include "secret-store/gkm-secret-collection.h"
+#include "secret-store/gkm-secret-fields.h"
+#include "secret-store/gkm-secret-item.h"
+
+#include "gkm/gkm-credential.h"
+#include "gkm/gkm-session.h"
+#include "gkm/gkm-transaction.h"
+
+#include "pkcs11/pkcs11i.h"
+
+#include <glib.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+typedef struct {
+	GkmModule *module;
+	GkmSession *session;
+	GkmSecretCollection *collection;
+} Test;
+
+static void
+setup (Test *test, gconstpointer unused)
+{
+	test->module = test_secret_module_initialize_and_enter ();
+	test->session = test_secret_module_open_session (TRUE);
+
+	test->collection = g_object_new (GKM_TYPE_SECRET_COLLECTION,
+	                           "module", test->module,
+	                           "identifier", "test",
+	                           NULL);
+}
+
+static void
+teardown (Test *test, gconstpointer unused)
+{
+	if (test->collection)
+		g_object_unref (test->collection);
+	test_secret_module_leave_and_finalize ();
+}
+
+static void
+unlock_collection (Test *test)
+{
+	GkmCredential *cred;
+	GkmObject *object;
+	CK_RV rv;
+
+	/* Create credential, which unlocks test->collection */
+	object = GKM_OBJECT (test->collection);
+	rv = gkm_credential_create (gkm_object_get_module (object),
+	                            gkm_session_get_manager (test->session),
+	                            object, NULL, 0, &cred);
+	g_assert (rv == CKR_OK);
+
+	gkm_session_add_session_object (test->session, NULL, GKM_OBJECT (cred));
+	g_object_unref (cred);
+}
+
+static void
+test_new (Test *test, gconstpointer unused)
+{
+	GkmSecretItem *item;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	g_assert (GKM_IS_SECRET_ITEM (item));
+	g_assert_cmpstr (gkm_secret_object_get_identifier (GKM_SECRET_OBJECT (item)), ==, "the-identifier");
+}
+
+static void
+test_create (Test *test, gconstpointer unused)
+{
+	GkmTransaction *transaction;
+	GkmSecretItem *item;
+
+	transaction = gkm_transaction_new ();
+	item = gkm_secret_collection_create_item (test->collection, transaction);
+	g_assert (GKM_IS_SECRET_ITEM (item));
+	g_object_ref (item);
+	g_assert (gkm_secret_collection_has_item (test->collection, item));
+
+	gkm_transaction_complete (transaction);
+	g_object_unref (transaction);
+
+	/* Should still be there */
+	g_assert (gkm_secret_collection_has_item (test->collection, item));
+	g_object_unref (item);
+}
+
+static void
+test_create_failed (Test *test, gconstpointer unused)
+{
+	GkmTransaction *transaction;
+	GkmSecretItem *item;
+
+	transaction = gkm_transaction_new ();
+	item = gkm_secret_collection_create_item (test->collection, transaction);
+	g_assert (GKM_IS_SECRET_ITEM (item));
+	g_object_ref (item);
+	g_assert (gkm_secret_collection_has_item (test->collection, item));
+
+	gkm_transaction_fail (transaction, CKR_GENERAL_ERROR);
+	gkm_transaction_complete (transaction);
+	g_object_unref (transaction);
+
+	/* Should no longer be there */
+	g_assert (!gkm_secret_collection_has_item (test->collection, item));
+	g_object_unref (item);
+}
+
+static void
+test_destroy (Test *test, gconstpointer unused)
+{
+	GkmTransaction *transaction;
+	GkmSecretItem *item;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	g_assert (gkm_secret_collection_has_item (test->collection, item));
+	g_object_ref (item);
+
+	transaction = gkm_transaction_new ();
+	gkm_secret_collection_destroy_item (test->collection, transaction, item);
+	g_assert (!gkm_secret_collection_has_item (test->collection, item));
+
+	gkm_transaction_complete (transaction);
+	g_object_unref (transaction);
+
+	/* Should not be there */
+	g_assert (!gkm_secret_collection_has_item (test->collection, item));
+	g_object_unref (item);
+}
+
+static void
+test_destroy_failed (Test *test, gconstpointer unused)
+{
+	GkmTransaction *transaction;
+	GkmSecretItem *item;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	g_assert (gkm_secret_collection_has_item (test->collection, item));
+	g_object_ref (item);
+
+	transaction = gkm_transaction_new ();
+	gkm_secret_collection_destroy_item (test->collection, transaction, item);
+	g_assert (!gkm_secret_collection_has_item (test->collection, item));
+
+	gkm_transaction_fail (transaction, CKR_GENERAL_ERROR);
+	gkm_transaction_complete (transaction);
+	g_object_unref (transaction);
+
+	/* Should be there */
+	g_assert (gkm_secret_collection_has_item (test->collection, item));
+	g_object_unref (item);
+}
+
+static void
+test_collection_get (Test *test, gconstpointer unused)
+{
+	GkmSecretItem *item, *check;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	g_assert (GKM_IS_SECRET_ITEM (item));
+
+	check = gkm_secret_collection_get_item (test->collection, "the-identifier");
+	g_assert (item == check);
+}
+
+static void
+test_collection_items (Test *test, gconstpointer unused)
+{
+	GList *l, *items;
+	const gchar *identifier;
+
+	gkm_secret_collection_new_item (test->collection, "one-identifier");
+	gkm_secret_collection_new_item (test->collection, "two-identifier");
+	gkm_secret_collection_new_item (test->collection, "three-identifier");
+
+	items = gkm_secret_collection_get_items (test->collection);
+	g_assert_cmpuint (g_list_length (items), ==, 3);
+	for (l = items; l; l = g_list_next (l)) {
+		identifier = gkm_secret_object_get_identifier (l->data);
+		if (!g_str_equal (identifier, "one-identifier") &&
+		    !g_str_equal (identifier, "two-identifier") &&
+		    !g_str_equal (identifier, "three-identifier"))
+			g_assert_not_reached ();
+	}
+
+	g_list_free (items);
+}
+
+static void
+test_collection_remove (Test *test, gconstpointer unused)
+{
+	GkmSecretItem *item;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	g_assert (gkm_secret_collection_get_item (test->collection, "the-identifier") == item);
+
+	gkm_secret_collection_remove_item (test->collection, item);
+	g_assert (gkm_secret_collection_get_item (test->collection, "the-identifier") == NULL);
+}
+
+static void
+test_is_locked (Test *test, gconstpointer unused)
+{
+	GkmSecretItem *item;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	g_assert (gkm_secret_object_is_locked (GKM_SECRET_OBJECT (item), test->session) ==
+	          gkm_secret_object_is_locked (GKM_SECRET_OBJECT (test->collection), test->session));
+
+	unlock_collection (test);
+
+	g_assert (gkm_secret_object_is_locked (GKM_SECRET_OBJECT (item), test->session) == FALSE);
+}
+
+static void
+test_get_collection (Test *test, gconstpointer unused)
+{
+	GkmSecretItem *item;
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	g_assert (gkm_secret_item_get_collection (item) == test->collection);
+}
+
+static void
+test_tracks_collection (Test *test, gconstpointer unused)
+{
+	GkmSecretItem *item;
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	g_object_ref (item);
+
+	unlock_collection (test);
+
+	/* At this point the item should be 'unlocked' */
+	g_assert (gkm_secret_object_is_locked (GKM_SECRET_OBJECT (item), test->session) == FALSE);
+
+	g_object_unref (test->collection);
+	test->collection = NULL;
+
+	/* Collection went away */
+	g_assert (gkm_secret_item_get_collection (item) == NULL);
+	g_assert (gkm_secret_object_is_locked (GKM_SECRET_OBJECT (item), test->session) == TRUE);
+
+	g_object_unref (item);
+}
+
+static void
+test_get_set_fields (Test *test, gconstpointer unused)
+{
+	GHashTable *fields = gkm_secret_fields_new ();
+	GHashTable *check;
+	GkmSecretItem *item;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	gkm_secret_item_set_fields (item, fields);
+	gkm_secret_item_set_fields (item, fields);
+
+	check = gkm_secret_item_get_fields (item);
+	g_assert (check == fields);
+
+	g_hash_table_unref (fields);
+}
+
+static void
+test_collection_attr (Test *test, gconstpointer unused)
+{
+	gchar buffer[32];
+	CK_ATTRIBUTE check = { CKA_G_COLLECTION, buffer, 32 };
+	GkmSecretItem *item;
+	CK_RV rv;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	rv = gkm_object_get_attribute (GKM_OBJECT (item), test->session, &check);
+	g_assert (rv == CKR_OK);
+	g_assert (check.ulValueLen == 4);
+	g_assert (memcmp (buffer, "test", 4) == 0);
+}
+
+static void
+test_secret_attr (Test *test, gconstpointer unused)
+{
+	GkmTransaction *transaction = gkm_transaction_new ();
+	CK_ATTRIBUTE attr = { CKA_VALUE, "hello", 5 };
+	gchar buffer[32];
+	CK_ATTRIBUTE check = { CKA_VALUE, buffer, 32 };
+	GkmSecretItem *item;
+	CK_RV rv;
+
+	unlock_collection (test);
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	gkm_object_set_attribute (GKM_OBJECT (item), test->session, transaction, &attr);
+	g_assert (gkm_transaction_get_failed (transaction) == FALSE);
+	gkm_transaction_complete (transaction);
+	g_assert (gkm_transaction_get_result (transaction) == CKR_OK);
+
+	g_object_unref (transaction);
+
+	rv = gkm_object_get_attribute (GKM_OBJECT (item), test->session, &check);
+	g_assert (rv == CKR_OK);
+	g_assert (check.ulValueLen == 5);
+	g_assert (memcmp (buffer, "hello", 5) == 0);
+}
+
+static void
+test_secret_attr_locked (Test *test, gconstpointer unused)
+{
+	GkmTransaction *transaction = gkm_transaction_new ();
+	CK_ATTRIBUTE attr = { CKA_VALUE, "hello", 5 };
+	gchar buffer[32];
+	CK_ATTRIBUTE check = { CKA_VALUE, buffer, 32 };
+	GkmSecretItem *item;
+	CK_RV rv;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	gkm_object_set_attribute (GKM_OBJECT (item), test->session, transaction, &attr);
+	g_assert (gkm_transaction_get_failed (transaction) == TRUE);
+	gkm_transaction_complete (transaction);
+	g_assert (gkm_transaction_get_result (transaction) == CKR_USER_NOT_LOGGED_IN);
+
+	g_object_unref (transaction);
+
+	rv = gkm_object_get_attribute (GKM_OBJECT (item), test->session, &check);
+	g_assert (rv == CKR_USER_NOT_LOGGED_IN);
+}
+
+static void
+test_fields_attr (Test *test, gconstpointer unused)
+{
+	GkmTransaction *transaction = gkm_transaction_new ();
+	CK_ATTRIBUTE attr = { CKA_G_FIELDS, "name1\0value1\0name2\0value2", 26 };
+	gchar buffer[32];
+	CK_ATTRIBUTE check = { CKA_G_FIELDS, buffer, 32 };
+	GkmSecretItem *item;
+	GHashTable *fields;
+	const gchar *value;
+	CK_RV rv;
+
+	unlock_collection (test);
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	gkm_object_set_attribute (GKM_OBJECT (item), test->session, transaction, &attr);
+	g_assert (gkm_transaction_get_failed (transaction) == FALSE);
+	gkm_transaction_complete (transaction);
+	g_assert (gkm_transaction_get_result (transaction) == CKR_OK);
+
+	g_object_unref (transaction);
+
+	rv = gkm_object_get_attribute (GKM_OBJECT (item), test->session, &check);
+	g_assert (rv == CKR_OK);
+	g_assert (check.ulValueLen == 26);
+	g_assert (memcmp (buffer, "name1\0value1\0name2\0value2", 26) == 0);
+
+	fields = gkm_secret_item_get_fields (item);
+	g_assert (fields);
+	value = gkm_secret_fields_get (fields, "name1");
+	g_assert_cmpstr (value, ==, "value1");
+	value = gkm_secret_fields_get (fields, "name2");
+	g_assert_cmpstr (value, ==, "value2");
+}
+
+static void
+test_fields_attr_locked (Test *test, gconstpointer unused)
+{
+	GkmTransaction *transaction = gkm_transaction_new ();
+	CK_ATTRIBUTE attr = { CKA_G_FIELDS, "name1\0value1\0name2\0value2", 26 };
+	GkmSecretItem *item;
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+	gkm_object_set_attribute (GKM_OBJECT (item), test->session, transaction, &attr);
+	g_assert (gkm_transaction_get_failed (transaction) == TRUE);
+	gkm_transaction_complete (transaction);
+	g_assert (gkm_transaction_get_result (transaction) == CKR_USER_NOT_LOGGED_IN);
+
+	g_object_unref (transaction);
+}
+
+static void
+test_fields_attr_reverts (Test *test, gconstpointer unused)
+{
+	GkmTransaction *transaction = gkm_transaction_new ();
+	CK_ATTRIBUTE attr = { CKA_G_FIELDS, "new\0value\0", 10 };
+	gchar buffer[32];
+	CK_ATTRIBUTE check = { CKA_G_FIELDS, buffer, 32 };
+	GkmSecretItem *item;
+	GHashTable *fields;
+	CK_RV rv;
+
+	unlock_collection (test);
+
+	item = gkm_secret_collection_new_item (test->collection, "the-identifier");
+
+	/* Set the old value like so */
+	fields = gkm_secret_fields_new ();
+	gkm_secret_fields_add (fields, "old", "value");
+	gkm_secret_item_set_fields (item, fields);
+	g_hash_table_unref (fields);
+
+	/* Should show old value */
+	rv = gkm_object_get_attribute (GKM_OBJECT (item), test->session, &check);
+	g_assert (rv == CKR_OK);
+	g_assert (check.ulValueLen == 10);
+	g_assert (memcmp (buffer, "old\0value\0", 10) == 0);
+
+	/* Set the new values */
+	gkm_object_set_attribute (GKM_OBJECT (item), test->session, transaction, &attr);
+	g_assert (gkm_transaction_get_failed (transaction) == FALSE);
+
+	/* Should have the new value */
+	rv = gkm_object_get_attribute (GKM_OBJECT (item), test->session, &check);
+	g_assert (rv == CKR_OK);
+	g_assert (check.ulValueLen == 10);
+	g_assert (memcmp (buffer, "new\0value\0", 10) == 0);
+
+	/* Fail the transaction */
+	gkm_transaction_fail (transaction, CKR_CANCEL);
+	gkm_transaction_complete (transaction);
+
+	/* Should show the old value */
+	rv = gkm_object_get_attribute (GKM_OBJECT (item), test->session, &check);
+	g_assert (rv == CKR_OK);
+	g_assert (check.ulValueLen == 10);
+	g_assert (memcmp (buffer, "old\0value\0", 10) == 0);
+
+	g_object_unref (transaction);
+}
+
+int
+main (int argc, char **argv)
+{
+	g_type_init ();
+	g_test_init (&argc, &argv, NULL);
+
+	g_test_add ("/secret-store/item/new", Test, NULL, setup, test_new, teardown);
+	g_test_add ("/secret-store/item/create", Test, NULL, setup, test_create, teardown);
+	g_test_add ("/secret-store/item/create_failed", Test, NULL, setup, test_create_failed, teardown);
+	g_test_add ("/secret-store/item/destroy", Test, NULL, setup, test_destroy, teardown);
+	g_test_add ("/secret-store/item/destroy_failed", Test, NULL, setup, test_destroy_failed, teardown);
+	g_test_add ("/secret-store/item/collection_get", Test, NULL, setup, test_collection_get, teardown);
+	g_test_add ("/secret-store/item/collection_items", Test, NULL, setup, test_collection_items, teardown);
+	g_test_add ("/secret-store/item/collection_remove", Test, NULL, setup, test_collection_remove, teardown);
+	g_test_add ("/secret-store/item/is_locked", Test, NULL, setup, test_is_locked, teardown);
+	g_test_add ("/secret-store/item/get_collection", Test, NULL, setup, test_get_collection, teardown);
+	g_test_add ("/secret-store/item/tracks_collection", Test, NULL, setup, test_tracks_collection, teardown);
+	g_test_add ("/secret-store/item/get_set_fields", Test, NULL, setup, test_get_set_fields, teardown);
+	g_test_add ("/secret-store/item/collection_attr", Test, NULL, setup, test_collection_attr, teardown);
+	g_test_add ("/secret-store/item/secret_attr", Test, NULL, setup, test_secret_attr, teardown);
+	g_test_add ("/secret-store/item/secret_attr_locked", Test, NULL, setup, test_secret_attr_locked, teardown);
+	g_test_add ("/secret-store/item/fields_attr", Test, NULL, setup, test_fields_attr, teardown);
+	g_test_add ("/secret-store/item/fields_attr_locked", Test, NULL, setup, test_fields_attr_locked, teardown);
+	g_test_add ("/secret-store/item/fields_attr_reverts", Test, NULL, setup, test_fields_attr_reverts, teardown);
+
+	return g_test_run ();
+}