From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Tue, 7 Nov 2017 23:19:29 +0000 (+0000)
Subject: ContactLoad Unit Tests: Corrected compile errors
X-Git-Tag: release-0.21~1
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=c589c412a6b1f4fd6caf0da9afcc0aedbb1cadd5;hp=7f33f83780a10b4f4083f5950412f1924f3639a6

ContactLoad Unit Tests: Corrected compile errors
---

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index 9239d5e..6467816 100644
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -29,7 +29,7 @@ TEST(ContactLoad, GivenContactDataObjectWhenLoadFileIsCalledWithMissingFileThenR
 	// When
 
 	ContactLoadStatus testFileLoadStatus = CONTACTLOAD_UNITTESTFAIL;
-	testFile.LoadFile("MissingFile.vcf");
+	testFileLoadStatus = testFile.LoadFile("MissingFile.vcf");
 	
 	// Then
 
@@ -122,7 +122,7 @@ TEST(ContactLoad, GivenLoadedContactDataObjectWhenContactKindIsCheckedThenContac
 		
 	// When
 	
-	ContactKindType testFileContactKindStatus = TestFile.ContactKind;
+	ContactKindType testFileContactKindStatus = testFile.ContactKind;
 	
 	// Then
 	// Check that the kind status has been set. (KIND).
@@ -187,6 +187,7 @@ TEST(ContactLoad, GivenContactDataObjectWhenFindIsCalledOnGroupsListPIDForFirstG
 
 	std::map<int,wxString>::iterator testFileIter;
 	std::map<int,int>::iterator testFileIntIter;
+	ContactDataObject testFile;
 
 	// Given
 	
@@ -270,7 +271,7 @@ TEST(ContactLoad, GivenContactDataObjectWhenFindIsCalledOnGroupsListExtraTokensF
 	
 	// When
 	
-	TestFileIter = testFile.GroupsListTokens.find(0);
+	testFileIter = testFile.GroupsListTokens.find(0);
 	
 	// Then
 
@@ -502,7 +503,7 @@ TEST(ContactLoad, GivenContactDataObjectWhenNameAltIDIsRetrievedThenValueforName
 	
 	// When
 
-	wxString nameAltID = TestFile.NameAltID;
+	wxString nameAltID = testFile.NameAltID;
 	
 	// Then
 	
@@ -510,7 +511,7 @@ TEST(ContactLoad, GivenContactDataObjectWhenNameAltIDIsRetrievedThenValueforName
 
 }
 
-TEST(ContactLoad, GivenContactDataObjectWhenNameAltIDIsRetrievedThenValueforNameAltIDIsReturned)
+TEST(ContactLoad, GivenContactDataObjectWhenNameLanguageIsRetrievedThenValueforNameLanguageIsReturned)
 {
 
 	// Check the LANGUAGE parameter for N.
@@ -526,7 +527,7 @@ TEST(ContactLoad, GivenContactDataObjectWhenNameAltIDIsRetrievedThenValueforName
 	
 	// When
 	
-	wxString nameLanguage = TestFile.NameLanguage;
+	wxString nameLanguage = testFile.NameLanguage;
 	
 	// Then
 	
@@ -550,7 +551,7 @@ TEST(ContactLoad, GivenContactDataObjectWhenNameDisplayAsIsRetrievedThenValuefor
 	
 	// When
 	
-	wxString nameDisplayAs = TestFile.NameDisplayAs;
+	wxString nameDisplayAs = testFile.NameDisplayAs;
 	
 	// Then