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

diff --git a/source/tests/xestiacalendar_caldav.h b/source/tests/xestiacalendar_caldav.h
index e8932b8..fbb8968 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
@@ -135,11 +135,11 @@ TEST(CalDAV, BasicTests){
 	CalDAV CalDAVPlain;
 	CalDAVPlain.SetupConnectionData(&ConnPlain);
 	
-	CalDAVStatus CalDAVPlainStatus = CalDAVPlain.GetConnectionData();
-	
 	// Verify that the settings match with the CalDAVConnectionData
 	// passed.
 	
+	CalDAVStatus CalDAVPlainStatus = CalDAVPlain.GetConnectionData();
+	
 	ASSERT_EQ(CalDAVPlainStatus.Hostname, ConnPlain.Hostname);
 	ASSERT_EQ(CalDAVPlainStatus.Username, ConnPlain.Username);
 	ASSERT_EQ(CalDAVPlainStatus.Port, ConnPlain.Port);
@@ -183,7 +183,21 @@ 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).