X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_convert.h;h=29e753cb83cbeb799de04880ea56b71fef2f89dc;hb=a45c3a46e4e37da415a8b8da2aaabe6a4abc4551;hp=7f3d3a7908f6b1b602ef51149258678ec1264a67;hpb=2934c09b149efeb7f0dd7b5f2e8c12a578b05da4;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_convert.h b/source/tests/xestiaab_convert.h
index 7f3d3a7..29e753c 100644
--- a/source/tests/xestiaab_convert.h
+++ b/source/tests/xestiaab_convert.h
@@ -26,11 +26,11 @@ TEST(ConvertCmdLine, ConvertTests){
 	ASSERT_EQ(CONVERTRESULT_OK, ConvertContact(wxT("vCard4"), 
 		wxT("vCard3"), 
 		wxT("LoadCheck-Load1.vcf"), 
-		wxT("LoadCheck-Load1-v3Conv.vcf")));
+		wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
 	ASSERT_EQ(CONVERTRESULT_OK, ConvertContact(wxT("vCard3"), 
 		wxT("vCard4"), 
-		wxT("LoadCheck-Load1.vcf"), 
-		wxT("LoadCheck-Load1-v3Conv.vcf")));
+		wxT("LoadCheck-Load1-v3.vcf"), 
+		wxT("Temp-LoadCheck-Load1-v4Conv.vcf")));
 		
 	// Test that a matching input and output formats return
 	// an error.
@@ -38,32 +38,66 @@ TEST(ConvertCmdLine, ConvertTests){
 	ASSERT_EQ(CONVERTRESULT_FORMATSSAME, ConvertContact(wxT("vCard3"), 
 		wxT("vCard3"), 
 		wxT("LoadCheck-Load1.vcf"), 
-		wxT("LoadCheck-Load1-v3Conv.vcf")));
+		wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
 		
 	// Test that an invalid input format returns an error.
 		
 	ASSERT_EQ(CONVERTRESULT_INVALIDINPUTFORMAT, ConvertContact(wxT("vCardNope"), 
 		wxT("vCard3"), 
 		wxT("LoadCheck-Load1.vcf"), 
-		wxT("LoadCheck-Load1-v3Conv.vcf")));
-		
-	// Test that an invalid output format return an error.
+		wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
+
+	// Test that an empty input filename was given.
 	
-	ASSERT_EQ(CONVERTRESULT_INVALIDOUTPUTFORMAT, ConvertContact(wxT("vCard3"), 
-		wxT("vCardNope"), 
-		wxT("LoadCheck-Load1.vcf"), 
-		wxT("LoadCheck-Load1-v3Conv.vcf")));
+	ASSERT_EQ(CONVERTRESULT_INPUTFILEEMPTY, ConvertContact(wxT("vCard3"), 
+		wxT("vCard4"), 
+		wxT(""), 
+		wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
 
-	// Check that the file given exists.
+	// Check that the input file given exists.
 	
 	ASSERT_EQ(CONVERTRESULT_INPUTFILEMISSING, ConvertContact(wxT("vCard3"), 
 		wxT("vCard4"), 
 		wxT("InvalidFile.vcf"), 
 		wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
 
+	// Check that input file can't be opened.
+
 	ASSERT_EQ(CONVERTRESULT_INPUTFILEERROR, ConvertContact(wxT("vCard3"), 
 		wxT("vCard4"), 
 		wxT("InvalidPermissions.vcf"), 
 		wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
+		
+	// Check that the output file can't be opened.
+	
+	ASSERT_EQ(CONVERTRESULT_OUTPUTFILEERROR, ConvertContact(wxT("vCard3"), 
+		wxT("vCard4"), 
+		wxT("LoadCheck-Load1.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")));
+		
+	// Check that that outputting to console (piping) works.
+	
+	ASSERT_EQ(CONVERTRESULT_OK, ConvertContact(wxT("vCard4"), 
+		wxT("vCard3"), 
+		wxT("LoadCheck-Load1.vcf"), 
+		wxT("")));
+
+	ASSERT_EQ(CONVERTRESULT_OK, ConvertContact(wxT("vCard3"), 
+		wxT("vCard4"), 
+		wxT("LoadCheck-Load1-v3.vcf"), 
+		wxT("")));
 
 }
\ No newline at end of file