X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_caldav.h;h=45da6f78962cdb30f1a4a978e78d2bed92445439;hb=c62ffe9335e1c0480c1e7c1fd20e258a4c40dca1;hp=f3a7c3ef9f5685c5e49854084c696652c133dc58;hpb=19736989bf2de4c5007659958373445ab40b0956;p=xestiacalendar%2F.git

diff --git a/source/tests/xestiacalendar_caldav.h b/source/tests/xestiacalendar_caldav.h
index f3a7c3e..45da6f7 100644
--- a/source/tests/xestiacalendar_caldav.h
+++ b/source/tests/xestiacalendar_caldav.h
@@ -27,13 +27,13 @@ TEST(CalDAV, BasicTests){
 
 	CalDAVConnectionData ConnPlain;
 	CalDAVConnectionData ConnNormal;
-	CalDAVConnectionData ConnFail;
+	CalDAVConnectionData ConnInvalidSSL;
 	CalDAVConnectionData ConnTimeout;
 	ProcessConnectionDataFileResult DataFileResult;
 
 	bool ValidDataPlain = false;
 	bool ValidDataNormal = false;
-	bool ValidDataFail = false;
+	bool ValidDataInvalidSSL = false;
 	bool ValidDataTimeout = false;
 
 	// Attempt to read the caldavtest-plain.auth file.
@@ -52,9 +52,9 @@ TEST(CalDAV, BasicTests){
 	
 	// Attempt to read the caldavtest-fail.auth file.
 	
-	DataFileResult = ProcessConnectionDataFile("caldavtest-fail.auth", &ConnFail);
+	DataFileResult = ProcessConnectionDataFile("caldavtest-fail.auth", &ConnInvalidSSL);
 	if (DataFileResult == PROCESSCONNECTIONDATAFILE_OK){
-		ValidDataFail = true;
+		ValidDataInvalidSSL = true;
 	}
 	
 	// Attempt to read the caldavtest-timeout.auth file.
@@ -94,7 +94,7 @@ TEST(CalDAV, BasicTests){
 		
 	}
 	
-	if (ValidDataFail == false){
+	if (ValidDataInvalidSSL == false){
 	
 		// Cannot read the caldavtest-fail.auth file properly.
 		
@@ -126,7 +126,7 @@ TEST(CalDAV, BasicTests){
 	
 	ASSERT_EQ(true, ValidDataPlain);
 	ASSERT_EQ(true, ValidDataNormal);
-	ASSERT_EQ(true, ValidDataFail);
+	ASSERT_EQ(true, ValidDataInvalidSSL);
 	ASSERT_EQ(true, ValidDataTimeout);
 
 	// (*nix version) Setup an initial connection (just plain
@@ -183,16 +183,56 @@ TEST(CalDAV, BasicTests){
 	
 	// (*nix version) Setup an initial connection (with a valid
 	// SSL certificate).
+
+	CalDAV CalDAVNormal;
+	CalDAVNormal.SetupConnectionData(&ConnNormal);
+
+	// Verify that the settings match with the CalDAVConnectionData
+	// passed.
+	
+	CalDAVStatus CalDAVNormalStatus = CalDAVNormal.GetConnectionData();
 	
+	ASSERT_EQ(CalDAVNormalStatus.Hostname, ConnNormal.Hostname);
+	ASSERT_EQ(CalDAVNormalStatus.Username, ConnNormal.Username);
+	ASSERT_EQ(CalDAVNormalStatus.Port, ConnNormal.Port);
+	ASSERT_EQ(CalDAVNormalStatus.Prefix, ConnNormal.Prefix);
+	ASSERT_EQ(CalDAVNormalStatus.UseSSL, ConnNormal.UseSSL);
+
 	// 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.