tests refactor

tests/CMakeLists.txt

@@ -5,7 +5,9 @@ find_package (Threads)
 set(LIBS ${LIBS} gtest pthread rozitm)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 add_executable(test-main
-  test-main.cpp
+        Common.hxx
+        test-main.cpp
+        test-result.cpp
   )
 target_link_libraries(test-main ${LIBS})
 add_test(test-main ${CMAKE_CURRENT_BINARY_DIR}/test-main)

tests/Common.h

@@ -0,0 +1,19 @@
+//
+// Created by robin on 5/10/16.
+//
+
+#ifndef ROZITM_COMMON_H
+#define ROZITM_COMMON_H
+
+#include <string>
+
+class Common
+{
+public:
+    template <class T>
+    static void testStream(const T& data, const std::string& ref);
+};
+
+#include "Common.hxx"
+
+#endif //ROZITM_COMMON_H

tests/Common.hxx

@@ -0,0 +1,15 @@
+//
+// Created by robin on 5/10/16.
+//
+
+#include <sstream>
+#include <string>
+#include <gtest/gtest.h>
+#include "Common.h"
+
+template <class T>
+void Common::testStream(const T& data, const std::string& ref) {
+    std::ostringstream stream;
+    stream << data;
+    ASSERT_EQ(stream.str(), ref);
+}

tests/test-main.cpp

@@ -1,47 +1,7 @@
-#include <iostream>
-#include <string.h>
 #include <gtest/gtest.h>
-#include "DBO/Result.h"
-
-template <class T>
-void testStream(const T& data, const std::string& ref) {
-    std::ostringstream stream;
-    stream << data;
-    ASSERT_EQ(stream.str(), ref);
-}
-
-TEST(Result, ok)
-{
-    testStream(ResultInt::ok(42), "Success: 42");
-    testStream(ResultInt::ok(0), "Success: 0");
-    testStream(ResultBool::ok(true), "Success: 1");
-    testStream(ResultBool::ok(false), "Success: 0");
-    testStream(ResultDouble::ok(0.42), "Success: 0.42");
-    testStream(ResultDouble::ok(-0.42), "Success: -0.42");
-}
-
-TEST(Result, error)
-{
-    testStream(ResultInt::error("My error label"), "Error: My error label");
-    testStream(ResultInt::error(""), "Error: Unknown error");
-}
-
-TEST(Result, strerror)
-{
-    errno = 0;
-    testStream(ResultInt::strerror(), "Error: Success");
-    errno = EACCES;
-    testStream(ResultInt::strerror(), "Error: Permission denied");
-    errno = 0;
-}
 
 int main(int argc, char* argv[])
 {
-//    std::cout << IResult::ok(42) << std::endl;
-//    std::cout << IResult::error("Test. error") << std::endl;
-//    errno = EACCES;
-//    std::cout << IResult::strerror() << std::endl;
-//    errno = 0;
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

tests/test-result.cpp

@@ -0,0 +1,32 @@
+//
+// Created by robin on 5/10/16.
+//
+
+#include <gtest/gtest.h>
+#include "DBO/Result.h"
+#include "Common.h"
+
+TEST(Result, ok)
+{
+    Common::testStream(ResultInt::ok(42), "Success: 42");
+    Common::testStream(ResultInt::ok(0), "Success: 0");
+    Common::testStream(ResultBool::ok(true), "Success: 1");
+    Common::testStream(ResultBool::ok(false), "Success: 0");
+    Common::testStream(ResultDouble::ok(0.42), "Success: 0.42");
+    Common::testStream(ResultDouble::ok(-0.42), "Success: -0.42");
+}
+
+TEST(Result, error)
+{
+    Common::testStream(ResultInt::error("My error label"), "Error: My error label");
+    Common::testStream(ResultInt::error(""), "Error: Unknown error");
+}
+
+TEST(Result, strerror)
+{
+    errno = 0;
+    Common::testStream(ResultInt::strerror(), "Error: Success");
+    errno = EACCES;
+    Common::testStream(ResultInt::strerror(), "Error: Permission denied");
+    errno = 0;
+}