X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_caldav.h;h=3dff68ba15aea34c4cb364b33be730187a769b9a;hb=f3908f3b7bf98079d82fde9d2180c337f565d8c6;hp=fbb89686789c8a2336554ebad8ca2ba2020e96ae;hpb=e17036396036c465c9253a63a2c73b52ae0e280f;p=xestiacalendar%2F.git

diff --git a/source/tests/xestiacalendar_caldav.h b/source/tests/xestiacalendar_caldav.h
index fbb8968..3dff68b 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;
 	}
@@ -201,15 +201,105 @@ TEST(CalDAV, BasicTests){
 	// Verify that the connection was successful (with a valid
 	// SSL certificate).
 	
+	ConnResult = CalDAVNormal.Connect();
+	
+	ASSERT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
+	ASSERT_EQ(200, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OK, ConnResult.Code);
+	
 	// (*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);
+	
+}
+
+TEST(CalDAV, ListCalendars){
+	
+	CalDAVConnectionData ConnNormal;	
+
+	bool ValidDataNormal = false;
+	
+	// Attempt to read the caldavtest.auth file.
+
+	ProcessConnectionDataFileResult	DataFileResult = ProcessConnectionDataFile("caldavtest.auth", &ConnNormal);
+	if (DataFileResult == PROCESSCONNECTIONDATAFILE_OK){
+		ValidDataNormal = true;
+	}
+
+	ASSERT_EQ(true, ValidDataNormal);
+	
+	// Setup the connection.
+	
+	CalDAV ServerConnection;
+	
+	ServerConnection.SetupConnectionData(&ConnNormal);
+	
+	// Verify the connection settings.
+	
+	CalDAVStatus CalDAVStatus = ServerConnection.GetConnectionData();
+	
+	ASSERT_EQ(CalDAVStatus.Hostname, ConnNormal.Hostname);
+	ASSERT_EQ(CalDAVStatus.Username, ConnNormal.Username);
+	ASSERT_EQ(CalDAVStatus.Port, ConnNormal.Port);
+	ASSERT_EQ(CalDAVStatus.Prefix, ConnNormal.Prefix);
+	ASSERT_EQ(CalDAVStatus.UseSSL, ConnNormal.UseSSL);
+	
+	// Connect to the server.
+	
+	CalDAVServerResult ConnResult = ServerConnection.Connect();
+	
+	ASSERT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
+	ASSERT_EQ(200, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OK, ConnResult.Code);
+	
 }
\ No newline at end of file