Added test and code to check if an error occured whilst opening the input file.

diff --git a/source/convert.cpp b/source/convert.cpp
index 8f6d7d1..69926de 100644 (file)
--- a/source/convert.cpp
+++ b/source/convert.cpp
@@ -80,6 +80,16 @@ ConvertResult ConvertContact(wxString InputFormat, wxString OutputFormat,
                
        }
        
+       wxFile InputFile;
+       
+       if (!InputFile.Open(InputFilename, wxFile::read, wxS_DEFAULT)){
+               
+               int InputFileErrNo = InputFile.GetLastError();
+               
+               return CONVERTRESULT_INPUTFILEERROR;
+               
+       }
+       
        return CONVERTRESULT_OK;
        
 }
\ No newline at end of file

diff --git a/source/convert.h b/source/convert.h
index e1e438e..af99f8c 100644 (file)
--- a/source/convert.h
+++ b/source/convert.h
@@ -20,6 +20,7 @@
 #define __CONVERT_H__
 
 #include <wx/wx.h>
+#include <wx/file.h>
 #include <string>
 #include <vector>
 

diff --git a/source/tests/xestiaab_convert.h b/source/tests/xestiaab_convert.h
index 2b185c0..7f3d3a7 100644 (file)
--- a/source/tests/xestiaab_convert.h
+++ b/source/tests/xestiaab_convert.h
@@ -59,6 +59,11 @@ TEST(ConvertCmdLine, ConvertTests){
        ASSERT_EQ(CONVERTRESULT_INPUTFILEMISSING, ConvertContact(wxT("vCard3"), 
                wxT("vCard4"), 
                wxT("InvalidFile.vcf"), 
-               wxT("Temp-LoadCheck-Load1-v3Conv.vcf"))); 
+               wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
+
+       ASSERT_EQ(CONVERTRESULT_INPUTFILEERROR, ConvertContact(wxT("vCard3"), 
+               wxT("vCard4"), 
+               wxT("InvalidPermissions.vcf"), 
+               wxT("Temp-LoadCheck-Load1-v3Conv.vcf")));
 
 }
\ No newline at end of file