X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_caldav.h;h=e07fe2a59849e55c0693053360be070b7453bc58;hb=3c82d9b1245400208b2d167683a82a39cdbc2689;hp=53e482d50ef4d931da960a9e5764f7a21e16c220;hpb=3511800e4e2c6630a24a4a4945f252f976da75c8;p=xestiacalendar%2F.git

diff --git a/source/tests/xestiacalendar_caldav.h b/source/tests/xestiacalendar_caldav.h
index 53e482d..e07fe2a 100644
--- a/source/tests/xestiacalendar_caldav.h
+++ b/source/tests/xestiacalendar_caldav.h
@@ -22,6 +22,7 @@
 #include <map>
 
 using namespace std;
+string EntryCalendarHREFProcessing = "";
 
 TEST(CalDAV, BasicTests){
 
@@ -796,8 +797,6 @@ TEST(CalDAV, DeleteCalendar){
 	
 	string CalendarEditHREF = CalendarList.HREF[ItemSeek];
 	
-	cout << CalendarEditHREF << endl;
-	
 	ConnResult = ServerConnection.DeleteCalendar(&CalendarEditHREF);
 	
 	EXPECT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
@@ -917,6 +916,148 @@ TEST(CalDAV, AddEntry){
 	ASSERT_EQ(201, ConnResult.HTTPCode);
 	ASSERT_EQ(CURLE_OK, ConnResult.Code);
 	
+	// Set the EntryCalendarHREFProcessing for later on.
+	
+	EntryCalendarHREFProcessing = EntryAddHREF;
 	
 }
+
+TEST(CalDAV, GetEntryETag){
+	
+	CalDAVConnectionData ConnNormal;
+	string CurrentUserPrincipal;
+
+	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();
+	
+	EXPECT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
+	ASSERT_EQ(200, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OK, ConnResult.Code);
+	
+	// Check that the server supports CalDAV.
+	
+	CalDAVServerSupport ConnSupport = ServerConnection.GetServerSupport();
+	ConnResult = ServerConnection.GetServerResult();
+	
+	EXPECT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
+	ASSERT_EQ(200, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OK, ConnResult.Code);
+	ASSERT_EQ(true, ConnSupport.BasicSupport);
+	
+	// Get the list of calendars.
+	
+	CalDAVCalendarList CalendarList = ServerConnection.GetCalendars();
+	
+	// Check the response result from the server.
+	
+	ConnResult = ServerConnection.GetServerResult();
+	
+	EXPECT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
+	ASSERT_EQ(207, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OK, ConnResult.Code);
+	
+	string ETagValue;
+	
+	ConnResult = ServerConnection.GetEntryETag(&EntryCalendarHREFProcessing, &ETagValue);
+	
+	EXPECT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
+	ASSERT_EQ(207, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OK, ConnResult.Code);
+	
+}
+	
+}
+
+TEST(CalDAV, DeleteEntry){
+
+	// Check that EntryCalendarHREFProcessing is not blank.	
+	
+	ASSERT_NE("", EntryCalendarHREFProcessing);
+	
+	CalDAVConnectionData ConnNormal;
+	string CurrentUserPrincipal;
+
+	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();
+	
+	EXPECT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
+	ASSERT_EQ(200, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OK, ConnResult.Code);
+	
+	// Check that the server supports CalDAV.
+	
+	CalDAVServerSupport ConnSupport = ServerConnection.GetServerSupport();
+	ConnResult = ServerConnection.GetServerResult();
+	
+	EXPECT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
+	ASSERT_EQ(200, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OK, ConnResult.Code);
+	ASSERT_EQ(true, ConnSupport.BasicSupport);
+	
+	// Delete the calendar entry.
+	
+	ConnResult = ServerConnection.DeleteCalendar(&EntryCalendarHREFProcessing);
+	
+	// Check the response result from the server.
+	
+	EXPECT_EQ(CALDAVQUERYRESULT_OK, ConnResult.Result);
+	ASSERT_EQ(204, ConnResult.HTTPCode);
+	ASSERT_EQ(CURLE_OK, ConnResult.Code);
+	
 }
\ No newline at end of file