Fixed #16 saveToFile/saveToString will be has &sError parameter

Author: sea5kg

src/main.cpp

@@ -22,8 +22,8 @@ int main(int argc, char* argv[]) {
         return -1;
     }
 
-    if (!yaml.saveToFile(sFilePath)) {
-        WsjcppLog::err(TAG, "Could not save data to file");
+    if (!yaml.saveToFile(sFilePath, sError)) {
+        WsjcppLog::err(TAG, "Could not save data to file: " + sError);
         return -1;
     }
 

src/wsjcpp_yaml.cpp

@@ -1246,9 +1246,10 @@ bool WsjcppYaml::loadFromFile(const std::string &sFileName, std::string &sError)
 
 // ---------------------------------------------------------------------
 
-bool WsjcppYaml::saveToFile(const std::string &sFileName) {
+bool WsjcppYaml::saveToFile(const std::string &sFileName, std::string &sError) {
     std::string sBuffer = m_pRoot->toString();
     if (!WsjcppCore::writeFile(sFileName, sBuffer)) {
+        sError = "Could not save to file";
         return false;    
     }
     return true;
@@ -1262,7 +1263,7 @@ bool WsjcppYaml::loadFromString(const std::string &sBufferName, const std::strin
 
 // ---------------------------------------------------------------------
 
-bool WsjcppYaml::saveToString(std::string &sBuffer) {
+bool WsjcppYaml::saveToString(std::string &sBuffer, std::string &sError) {
     sBuffer = m_pRoot->toString();
     return true;
 }

src/wsjcpp_yaml.h

@@ -255,9 +255,9 @@ class WsjcppYaml {
         ~WsjcppYaml();
         void clear();
         bool loadFromFile(const std::string &sFileName, std::string &sError);
-        bool saveToFile(const std::string &sFileName);
+        bool saveToFile(const std::string &sFileName, std::string &sError);
         bool loadFromString(const std::string &sBufferName, const std::string &sBuffer, std::string &sError);
-        bool saveToString(std::string &sBuffer);
+        bool saveToString(std::string &sBuffer, std::string &sError);
         WsjcppYamlNode *getRoot();
 
         WsjcppYamlCursor getCursor() const;

unit-tests.wsjcpp/src/unit_test_cursor.cpp

@@ -104,7 +104,7 @@ void UnitTestCursor::executeTest() {
 
     compare("map use as array", yaml["map1"][0].isNull(), true);
     compare("array use as map", yaml["arr1"]["0"].isNull(), true);
-    compare("array use as map", yaml["arr1"][0].isNull(), false);
+    compare("array use as array", yaml["arr1"][0].isNull(), false);
 
     compare("array size", yaml["arr1"].comment(), "some comment array 1");
     compare("array size", yaml["arr1"].size(), 6);

unit-tests.wsjcpp/src/unit_test_read_write_file.cpp

@@ -46,7 +46,7 @@ void UnitTestReadWriteFile::executeTest() {
 
     compare("version-value", yaml.getRoot()->getElement("version")->getValue(), "3");
 
-    if (!compare("Error parsing", yaml.saveToFile(sFilepathOutput), true)) {
+    if (!compare("Error parsing", yaml.saveToFile(sFilepathOutput, sError), true)) {
         WsjcppLog::err(TAG, sError);
         return;
     }

unit-tests.wsjcpp/src/unit_test_yaml_parser_all.cpp

@@ -66,7 +66,7 @@ void UnitTestYamlParserAll::executeTest() {
     }
 
     std::string sSaved1 = "";
-    if (!compare("Error saving", yaml.saveToString(sSaved1), true)) {
+    if (!compare("Error saving", yaml.saveToString(sSaved1, sError), true)) {
         compare("yaml_saved 2-test", sSaved1, sTestYaml);
         return;
     }
@@ -98,7 +98,7 @@ void UnitTestYamlParserAll::executeTest() {
     compare("test80_comment", pItem->getValue(), "opa2");
 
     std::string sSaved2 = "";
-    if (compare("saving yaml", yaml.saveToString(sSaved2), true)) {
+    if (compare("saving yaml", yaml.saveToString(sSaved2, sError), true)) {
         compare("yaml_saved 1-2", sSaved1, sSaved2);
     }
 }

unit-tests.wsjcpp/src/unit_test_yaml_parser_array_included_map.cpp

@@ -90,7 +90,7 @@ void UnitTestYamlParserArrayIncludedMap::executeTest() {
     compare("param2-value", yaml.getRoot()->getElement("param2")->getValue(), "v2");
 
     std::string sSaved = "";
-    if (compare("save yaml", yaml.saveToString(sSaved), true)) {
+    if (compare("save yaml", yaml.saveToString(sSaved, sError), true)) {
         compare("yaml_save", sSaved, 
             "# test array included map\n" // expected
             "param1: none value1 # it's value for something # olala\n"

unit-tests.wsjcpp/src/unit_test_yaml_parser_comments.cpp

@@ -85,7 +85,7 @@ void UnitTestYamlParserComments::executeTest() {
     // compare("param2", yaml.getRoot()->getElement("param2")->getComment(), "some comment 2");
 
     std::string sSaved = "";
-    compare("save yaml", yaml.saveToString(sSaved), true);
+    compare("save yaml", yaml.saveToString(sSaved, sError), true);
     compare("yaml_save", sSaved,
         "# Some comment 1\n"
         "param1: value1 # comment 2 # comment\n"

unit-tests.wsjcpp/src/unit_test_yaml_parser_hierarchical_map.cpp

@@ -88,7 +88,7 @@ void UnitTestYamlParserHierarchicalMap::executeTest() {
     compare("param2", yaml.getRoot()->getElement("param2")->getComment(), "some comment 2");
 
     std::string sSaved = "";
-    bool bResult = yaml.saveToString(sSaved);
+    bool bResult = yaml.saveToString(sSaved, sError);
     if (compare("save yaml", bResult, true)) {
         compare("yaml_save", sSaved,
             "# Some comment 1\n"

unit-tests.wsjcpp/src/unit_test_yaml_parser_quotes.cpp

@@ -76,7 +76,7 @@ void UnitTestYamlParserQuotes::executeTest() {
     compare("array-element0-value", yaml.getRoot()->getElement("array")->getElement(0)->getValue(), "https://github.com/wsjcpp/wsjcpp-core:v0.0.1");
 
     std::string sSaved = "";
-    compare("save yaml", yaml.saveToString(sSaved), true);
+    compare("save yaml", yaml.saveToString(sSaved, sError), true);
     compare("yaml_save", sSaved,
         "# Some comment 1\n"
         "param1: \"value1\" # v1\n"