X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_caldav.h;h=5fd20c68742733f83011f20c7f65df6b5f3ebe75;hb=fc4e51d8910464a793f9f23bd56b37f314931936;hp=a8e0aee7674975b6da503b3214f046bcfef3aedd;hpb=e7b953987e811975bdae3263f85caacc54619ecc;p=xestiacalendar%2F.git

diff --git a/source/tests/xestiacalendar_caldav.h b/source/tests/xestiacalendar_caldav.h
index a8e0aee..5fd20c6 100644
--- a/source/tests/xestiacalendar_caldav.h
+++ b/source/tests/xestiacalendar_caldav.h
@@ -59,7 +59,7 @@ TEST(CalDAV, BasicTests){
 	
 	// Attempt to read the caldavtest-timeout.auth file.
 	
-	DataFileResult = ProcessConnectionDataFile("caldavtest-fail.auth", &ConnTimeout);
+	DataFileResult = ProcessConnectionDataFile("caldavtest-timeout.auth", &ConnTimeout);
 	if (DataFileResult == PROCESSCONNECTIONDATAFILE_OK){
 		ValidDataTimeout = true;
 	}
@@ -210,12 +210,55 @@ TEST(CalDAV, BasicTests){
 	// (*nix version) Setup an initial connection on a server that
 	// will fail due to having an invalid SSL certificate.
 
+	CalDAV CalDAVInvalidSSL;
+	CalDAVInvalidSSL.SetupConnectionData(&ConnInvalidSSL);
+
+	// Verify that the settings match with the CalDAVConnectionData
+	// passed.
+	
+	CalDAVStatus CalDAVInvalidSSLStatus = CalDAVInvalidSSL.GetConnectionData();
+	
+	ASSERT_EQ(CalDAVInvalidSSLStatus.Hostname, ConnInvalidSSL.Hostname);
+	ASSERT_EQ(CalDAVInvalidSSLStatus.Username, ConnInvalidSSL.Username);
+	ASSERT_EQ(CalDAVInvalidSSLStatus.Port, ConnInvalidSSL.Port);
+	ASSERT_EQ(CalDAVInvalidSSLStatus.Prefix, ConnInvalidSSL.Prefix);
+	ASSERT_EQ(CalDAVInvalidSSLStatus.UseSSL, ConnInvalidSSL.UseSSL);
+	
 	// Verify that the connection had failed. (with an invalid
 	// SSL certificate).
 	
+	ConnResult = CalDAVInvalidSSL.Connect();
+	
+	ASSERT_EQ(CALDAVQUERYRESULT_SERVERERROR, ConnResult.Result);
+	ASSERT_EQ(0, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_SSL_CACERT, ConnResult.Code);
+	
 	// (*nix version) Setup an inital connection on a server where
 	// a timeout occurs.
 	
+	ConnTimeout.Timeout = 5;
+	
+	CalDAV CalDAVTimeout;
+	CalDAVTimeout.SetupConnectionData(&ConnTimeout);
+
+	// Verify that the settings match with the CalDAVConnectionData
+	// passed.
+	
+	CalDAVStatus CalDAVTimeoutStatus = CalDAVTimeout.GetConnectionData();
+	
+	ASSERT_EQ(CalDAVTimeoutStatus.Hostname, ConnTimeout.Hostname);
+	ASSERT_EQ(CalDAVTimeoutStatus.Username, ConnTimeout.Username);
+	ASSERT_EQ(CalDAVTimeoutStatus.Port, ConnTimeout.Port);
+	ASSERT_EQ(CalDAVTimeoutStatus.Prefix, ConnTimeout.Prefix);
+	ASSERT_EQ(CalDAVTimeoutStatus.Timeout, ConnTimeout.Timeout);
+	ASSERT_EQ(CalDAVTimeoutStatus.UseSSL, ConnTimeout.UseSSL);
+	
 	// Verify that the connection had timed out.
 	
+	ConnResult = CalDAVTimeout.Connect();
+	
+	ASSERT_EQ(CALDAVQUERYRESULT_SERVERERROR, ConnResult.Result);
+	ASSERT_EQ(0, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OPERATION_TIMEDOUT, ConnResult.Code);
+	
 }
\ No newline at end of file