X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_convert.h;h=4077998cd4cbc2004a0a2982fd000ab1c28e874f;hb=6e5b70888b9a1bc4bb1c1d443402f9e7987e31d1;hp=7108715a591bcfbd5ae5e78a20e5172f917e6718;hpb=0e3dcfcd57de79eac7dfce743447d81b5379e358;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_convert.h b/source/tests/xestiaab_convert.h
index 7108715..4077998 100644
--- a/source/tests/xestiaab_convert.h
+++ b/source/tests/xestiaab_convert.h
@@ -29,7 +29,7 @@ TEST(ConvertCmdLine, ConvertTests){
 		wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
 	ASSERT_EQ(CONVERTRESULT_OK, ConvertContact(wxT("vCard3"), 
 		wxT("vCard4"), 
-		wxT("LoadCheck-Load1.vcf"), 
+		wxT("LoadCheck-Load1-v3.vcf"), 
 		wxT("Temp-LoadCheck-Load1-v4Conv.vcf")));
 		
 	// Test that a matching input and output formats return
@@ -46,12 +46,12 @@ TEST(ConvertCmdLine, ConvertTests){
 		wxT("vCard3"), 
 		wxT("LoadCheck-Load1.vcf"), 
 		wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
-		
-	// Test that an invalid output format return an error.
+
+	// Test that an empty input filename was given.
 	
-	ASSERT_EQ(CONVERTRESULT_INVALIDOUTPUTFORMAT, ConvertContact(wxT("vCard3"), 
-		wxT("vCardNope"), 
-		wxT("LoadCheck-Load1.vcf"), 
+	ASSERT_EQ(CONVERTRESULT_INPUTFILEEMPTY, ConvertContact(wxT("vCard3"), 
+		wxT("vCard4"), 
+		wxT(""), 
 		wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
 
 	// Check that the input file given exists.
@@ -73,6 +73,19 @@ TEST(ConvertCmdLine, ConvertTests){
 	ASSERT_EQ(CONVERTRESULT_OUTPUTFILEERROR, ConvertContact(wxT("vCard3"), 
 		wxT("vCard4"), 
 		wxT("LoadCheck-Load1.vcf"), 
-		wxT("InvalidPermissions.vcf")));	
+		wxT("InvalidPermissions.vcf")));
+		
+	// Check that the input file has the correct format.
+	// Tests for: vCard 4.0, vCard 3.0.
+	
+	ASSERT_EQ(CONVERTRESULT_INPUTFILEINVALIDFORMAT, ConvertContact(wxT("vCard4"), 
+		wxT("vCard3"), 
+		wxT("LoadCheck-Load1-v3.vcf"), 
+		wxT("Temp-LoadCheck-Load1.vcf")));
+
+	ASSERT_EQ(CONVERTRESULT_INPUTFILEINVALIDFORMAT, ConvertContact(wxT("vCard3"), 
+		wxT("vCard4"), 
+		wxT("LoadCheck-Load1.vcf"), 
+		wxT("Temp-LoadCheck-Load1.vcf")));
 
 }
\ No newline at end of file