[Opensync-commits] r5658 - in branches/opensync-ticket1084/tests: . capabilities-tests

[<svn...@op...>]

Author: dgollub
Date: Sun May 31 23:41:35 2009
New Revision: 5658
URL: http://www.opensync.org/changeset/5658

Log:
Adapted testcase capability_new
Dropped capabilities_sort
 * new OSyncCapabilities object will work on a sorted list
 * list_insert_sorted()

refs #1084

Modified:
   branches/opensync-ticket1084/tests/CMakeLists.txt
   branches/opensync-ticket1084/tests/capabilities-tests/check_capabilities.c

Modified: branches/opensync-ticket1084/tests/CMakeLists.txt
==============================================================================
--- branches/opensync-ticket1084/tests/CMakeLists.txt	Sun May 31 23:39:57 2009	(r5657)
+++ branches/opensync-ticket1084/tests/CMakeLists.txt	Sun May 31 23:41:35 2009	(r5658)
@@ -53,7 +53,6 @@
 OSYNC_TESTCASE(capabilities capabilities_new)
 OSYNC_TESTCASE(capabilities capability_new)
 OSYNC_TESTCASE(capabilities capabilities_parse)
-OSYNC_TESTCASE(capabilities capabilities_sort)
 
 BUILD_CHECK_TEST(client client-tests/check_client.c ${TEST_TARGET_LIBRARIES} )
 OSYNC_TESTCASE(client client_new)

Modified: branches/opensync-ticket1084/tests/capabilities-tests/check_capabilities.c
==============================================================================
--- branches/opensync-ticket1084/tests/capabilities-tests/check_capabilities.c	Sun May 31 23:39:57 2009	(r5657)
+++ branches/opensync-ticket1084/tests/capabilities-tests/check_capabilities.c	Sun May 31 23:41:35 2009	(r5658)
@@ -29,8 +29,12 @@
 	OSyncCapabilities *capabilities = osync_capabilities_new(&error);
 	fail_unless(capabilities != NULL, NULL);
 	fail_unless(error == NULL, NULL);
+
+	OSyncCapabilitiesObjType *capsobjtype = osync_capabilitiesobjtype_new(capabilities, "contact", &error);
+	fail_unless(capsobjtype != NULL, NULL);
+	fail_unless(error == NULL, NULL);
 	
-	OSyncCapability *capability = osync_capability_new(capabilities, "contact", "Name", &error);
+	OSyncCapability *capability = osync_capability_new(capsobjtype, "Name", &error);
 	fail_unless(capability != NULL, NULL);
 	fail_unless(error == NULL, NULL);
 	
@@ -61,33 +65,9 @@
 }
 END_TEST
 
-START_TEST (capabilities_sort)
-{
-	char *testbed = setup_testbed("capabilities");
-	
-	OSyncError *error = NULL;
-	char* buffer;
-	unsigned int size;
-	fail_unless(osync_file_read("capabilities.xml", &buffer, &size, &error), NULL);
-
-	OSyncCapabilities *capabilities = osync_capabilities_parse(buffer, size, &error);
-	fail_unless(capabilities != NULL, NULL);
-	fail_unless(error == NULL, NULL);
-	
-	osync_capabilities_sort(capabilities);
-	
-	osync_capabilities_unref(capabilities);
-
-	g_free(buffer);
-
-	destroy_testbed(testbed);
-}
-END_TEST
-
 OSYNC_TESTCASE_START("capabilities")
 OSYNC_TESTCASE_ADD(capabilities_new)
 OSYNC_TESTCASE_ADD(capability_new)
 OSYNC_TESTCASE_ADD(capabilities_parse)
-OSYNC_TESTCASE_ADD(capabilities_sort)
 OSYNC_TESTCASE_END