Move INSTALL, LICENSE, README, THANKS and TODO into root directory

[xestiaab/.git] / source / tests / xestiaab_convert.h

diff --git a/source/tests/xestiaab_convert.h b/source/tests/xestiaab_convert.h
index 7108715..29e753c 100644 (file)
--- 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,31 @@ 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")));
+               
+       // 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