Merge remote-tracking branch 'origin/ticket52' into stg-2.409

[stg.git] / tests / test_conffiles.cpp

diff --git a/tests/test_conffiles.cpp b/tests/test_conffiles.cpp
index 897148f5b9224009e9b96eca423aed305b544306..ef63a7a1f947e6dac1226945a79c6129740f0466 100644 (file)
--- a/tests/test_conffiles.cpp
+++ b/tests/test_conffiles.cpp
@@ -3,9 +3,9 @@
 #include <string>
 #include <fstream>
 
 #include <string>
 #include <fstream>
 

-#include <tut/tut.hpp>
+#include "tut/tut.hpp"

 
 

-#include "conffiles.h"
+#include "stg/conffiles.h"

 
 namespace tut
 {
 
 namespace tut
 {


@@ -28,9 +28,11 @@ namespace tut
 
             ensure_equals("Correct construction", cf.Error(), 0);
 
 
             ensure_equals("Correct construction", cf.Error(), 0);
 

-            ensure_equals("Correct writing 'a' string", cf.WriteString("a", "a-string"), 0);
-            ensure_equals("Correct writing 'b' integer (0)", cf.WriteInt("b", 0), 0);
-            ensure_equals("Correct writing 'e' double (2.718281828)", cf.WriteDouble("e", 2.718281828), 0);
+            cf.WriteString("a", "a-string");
+            cf.WriteInt("b", 0);
+            cf.WriteDouble("e", 2.718281828);
+
+            ensure_equals("Correct data flushing", cf.Flush(), 0);

         }
 
         {
         }
 
         {


@@ -60,7 +62,7 @@ namespace tut
         set_test_name("Check empty lines and comments");
 
         {
         set_test_name("Check empty lines and comments");
 
         {

-            ofstream f("/tmp/test.cf");
+            std::ofstream f("/tmp/test.cf");

 
             ensure("Correct construction (part 3)", f);
 
 
             ensure("Correct construction (part 3)", f);