[evolution-data-server/openismus-work] test-ecal-get-ldap-attribute: Changing test to check the reported error code.

[Tristan Van Berkom <tvb src gnome org>]

commit c180ed26485e2a5e0765e7d772a87c641a068b61
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Wed Jan 23 17:19:06 2013 +0900

    test-ecal-get-ldap-attribute: Changing test to check the reported error code.
    
    As e_cal_get_ldap_attribute() docs mention that the function has been dropped
    completely, this test (instead of removing) now simply tests for the expected
    error code.
    
    Additionally, the unused function ecal_test_utils_cal_get_ldap_attribute()
    has been removed from in ecal-test-utils.[ch].
    
    Conflicts:
    
    	tests/libecal/test-ecal-get-ldap-attribute.c

 tests/libecal/ecal-test-utils.c              |   15 ---------------
 tests/libecal/ecal-test-utils.h              |    3 ---
 tests/libecal/test-ecal-get-ldap-attribute.c |   18 +++++++++++-------
 3 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/tests/libecal/ecal-test-utils.c b/tests/libecal/ecal-test-utils.c
index edbf267..07a495e 100644
--- a/tests/libecal/ecal-test-utils.c
+++ b/tests/libecal/ecal-test-utils.c
@@ -172,21 +172,6 @@ ecal_test_utils_cal_get_cal_address (ECal *cal)
 	return address;
 }
 
-gchar *
-ecal_test_utils_cal_get_ldap_attribute (ECal *cal)
-{
-	GError *error = NULL;
-	gchar *attr = NULL;
-
-	if (!e_cal_get_ldap_attribute (cal, &attr, &error)) {
-		g_warning ("failed to get ldap attribute; %s\n", error->message);
-		exit (1);
-	}
-	test_print ("successfully got the ldap attribute\n");
-
-	return attr;
-}
-
 static const gchar *
 b2s (gboolean value)
 {
diff --git a/tests/libecal/ecal-test-utils.h b/tests/libecal/ecal-test-utils.h
index f72b1ba..a4a0cc1 100644
--- a/tests/libecal/ecal-test-utils.h
+++ b/tests/libecal/ecal-test-utils.h
@@ -55,9 +55,6 @@ ecal_test_utils_cal_get_alarm_email_address (ECal *cal);
 gchar *
 ecal_test_utils_cal_get_cal_address (ECal *cal);
 
-gchar *
-ecal_test_utils_cal_get_ldap_attribute (ECal *cal);
-
 void
 ecal_test_utils_cal_get_capabilities (ECal *cal);
 
diff --git a/tests/libecal/test-ecal-get-ldap-attribute.c b/tests/libecal/test-ecal-get-ldap-attribute.c
index 570bb1b..5e4ab13 100644
--- a/tests/libecal/test-ecal-get-ldap-attribute.c
+++ b/tests/libecal/test-ecal-get-ldap-attribute.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <libecal/libecal.h>
 
-#include "ecal-test-utils.h"
 #include "e-test-server-utils.h"
 
 static ETestServerClosure cal_closure =
@@ -14,13 +13,17 @@ test_get_ldap_attribute (ETestServerFixture *fixture,
 			 gconstpointer       user_data)
 {
 	ECal *cal;
-	gchar *attr;
+	GError *error = NULL;
+	gchar *attr = NULL;
 
 	cal = E_TEST_SERVER_UTILS_SERVICE (fixture, ECal);
 
-	attr = ecal_test_utils_cal_get_ldap_attribute (cal);
-	test_print ("LDAP attribute: '%s'\n", attr);
-	g_free (attr);
+	if (e_cal_get_ldap_attribute (cal, &attr, &error))
+		g_error ("e_cal_get_ldap_attribute() is dropped but returned TRUE");
+	else if (!g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_NOT_SUPPORTED))
+		g_error ("e_cal_get_ldap_attribute() returned unexpected error code '%d' from "
+			 "domain %s: %s",
+			 error->code, g_quark_to_string (error->domain), error->message);
 }
 
 gint
@@ -32,8 +35,9 @@ main (gint argc,
 #endif
 	g_test_init (&argc, &argv, NULL);
 
-	g_test_add ("/ECal/GetLdapAttribute", ETestServerFixture, &cal_closure,
-		    e_test_server_utils_setup, test_get_ldap_attribute, e_test_server_utils_teardown);
+	g_test_add (
+		"/ECal/GetLdapAttribute/NotSupported", ETestServerFixture, &cal_closure,
+		e_test_server_utils_setup, test_get_ldap_attribute, e_test_server_utils_teardown);
 
 	return e_test_server_utils_run ();
 }