From 3a02a0ffe62a3813b75e061252434de658929b1d Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 28 Aug 2016 09:43:14 +0100 Subject: [PATCH] Removed Entity Tag from DeleteContact in ConnectionObject interface --- source/connobject/ConnectionObject.h | 2 +- source/tests/classes/FakeConnectionObject.cpp | 2 +- source/tests/classes/FakeConnectionObject.h | 2 +- source/tests/xestiaab_carddav.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/connobject/ConnectionObject.h b/source/connobject/ConnectionObject.h index 6685b70..ab479e3 100644 --- a/source/connobject/ConnectionObject.h +++ b/source/connobject/ConnectionObject.h @@ -87,7 +87,7 @@ class ConnectionObject{ virtual COServerResponse GetDefaultPrefix(std::string *ServerPrefix) {}; virtual COServerResponse AddContact(std::string Location, std::string Data) {}; virtual COServerResponse EditContact(std::string Location, std::string Data) {}; - virtual COServerResponse DeleteContact(std::string Location, std::string EntityTag) {}; + virtual COServerResponse DeleteContact(std::string Location) {}; virtual COServerResponse GetServerEntityTagValue(std::string Location) {}; virtual COServerResponse GetContact(std::string Location, std::string *PageData) {}; virtual COContactList GetContactList(std::string SyncToken) {}; diff --git a/source/tests/classes/FakeConnectionObject.cpp b/source/tests/classes/FakeConnectionObject.cpp index 9cb84ad..348956c 100644 --- a/source/tests/classes/FakeConnectionObject.cpp +++ b/source/tests/classes/FakeConnectionObject.cpp @@ -69,7 +69,7 @@ COServerResponse FakeConnectionObject::EditContact(std::string Location, std::st } -COServerResponse FakeConnectionObject::DeleteContact(std::string Location, std::string EntityTag){ +COServerResponse FakeConnectionObject::DeleteContact(std::string Location){ COServerResponse DeleteContactResult; diff --git a/source/tests/classes/FakeConnectionObject.h b/source/tests/classes/FakeConnectionObject.h index 9c6d9c8..9a214a7 100644 --- a/source/tests/classes/FakeConnectionObject.h +++ b/source/tests/classes/FakeConnectionObject.h @@ -44,7 +44,7 @@ class FakeConnectionObject : public ConnectionObject { std::string GetDefaultPrefix(); COServerResponse AddContact(std::string Location, std::string Data); COServerResponse EditContact(std::string Location, std::string Data); - COServerResponse DeleteContact(std::string Location, std::string EntityTag); + COServerResponse DeleteContact(std::string Location); COServerResponse GetServerEntityTagValue(std::string Location); COServerResponse GetContact(std::string Location); COContactList GetContactList(std::string SyncToken); diff --git a/source/tests/xestiaab_carddav.cpp b/source/tests/xestiaab_carddav.cpp index b5e7a6d..02b1fa5 100644 --- a/source/tests/xestiaab_carddav.cpp +++ b/source/tests/xestiaab_carddav.cpp @@ -682,7 +682,7 @@ TEST(CardDAV, Use_Fake_To_Simulate_A_Connection_That_Deletes_A_Server_Contact){ FakeConnection.TestSessionCode = 0; FakeConnection.TestResultMessage = ""; - COServerResponse DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf", "a23124sfadfdvxc1646541bsdfaf"); + COServerResponse DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf"); EXPECT_EQ(COREQUEST_OK, DeleteContactResult.RequestResult); EXPECT_EQ("", DeleteContactResult.EntityTag); @@ -696,7 +696,7 @@ TEST(CardDAV, Use_Fake_To_Simulate_A_Connection_That_Deletes_A_Server_Contact){ FakeConnection.TestSessionCode = 0; FakeConnection.TestResultMessage = ""; - DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf", "asf84sa484saf614as64asvada4s6fas"); + DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf"); EXPECT_EQ(COREQUEST_OK, DeleteContactResult.RequestResult); EXPECT_EQ("", DeleteContactResult.EntityTag); -- 2.39.5