Moved utility functions to the appropriate folder. setup some folder structure to help split up the project.

Testing is working at the point. I have the basic utility function working as a test. There is not output of any library or single header yet. For now all development will happen in the test folder until first release.

Author: LinuxDevon

CMakeLists.txt

@@ -11,8 +11,11 @@ set(GCC_COVERAGE_COMPILE_FLAGS "-g")
 set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
 
 # add where to find the source files
+list(APPEND SOURCE ${PROJECT_SOURCE_DIR}/src/util/utils.cpp)
+
 include_directories(src)
-include_directories(test)
+include_directories(include)
+
 add_subdirectory(test)
 add_subdirectory(doc)
 

src/dbc.hpp

@@ -1,40 +1,4 @@
 
-#include <string>
-#include <fstream>
-#include <iostream>
-
-namespace SafeStr {
-
-/**
- * This is a safe non line ending specific getline function. This is to help with files
- * carried over from different systems. i.e Unix file comes to Windows with LF endings
- * instead of CRLF.
- *
- * @param  stream [description]
- * @param  line   [description]
- * @return        [description]
- */
-std::istream & getline( std::istream & stream, std::string & line ) {
-	std::string newline;
-
-	std::getline( stream, newline );
-
-	// Windows CRLF (\r\n)
-	if ( newline.size() && newline[newline.size()-1] == '\r' ) {
-		line = newline.substr( 0, newline.size() - 1 );
-	// MacOS LF (\r)
-	} else if (newline.size() && newline[newline.size()] == '\r') {
-		line = newline.replace(newline.size(), 1, "\n");
-	} else {
-		line = newline;
-	}
-
-	return stream;
-}
-
-}
-
-
 namespace dbc {
 
 class parser {

src/util/utils.cpp

@@ -0,0 +1,23 @@
+#include "util/utils.hpp"
+
+namespace Utils {
+
+	std::istream & SafeString::getline( std::istream & stream, std::string & line ) {
+		std::string newline;
+
+		std::getline( stream, newline );
+
+		// Windows CRLF (\r\n)
+		if ( newline.size() && newline[newline.size()-1] == '\r' ) {
+			line = newline.substr( 0, newline.size() - 1 );
+		// MacOS LF (\r)
+		} else if (newline.size() && newline[newline.size()] == '\r') {
+			line = newline.replace(newline.size(), 1, "\n");
+		} else {
+			line = newline;
+		}
+
+		return stream;
+	}
+
+}	// Namespace Utils

src/util/utils.hpp

@@ -0,0 +1,13 @@
+#include <string>
+#include <fstream>
+#include <iostream>
+
+namespace Utils {
+
+	class SafeString {
+	public:
+		static std::istream & getline( std::istream & stream, std::string & line );
+
+	};
+
+}

test/CMakeLists.txt

@@ -1,8 +1,12 @@
 project(tests VERSION 0.1.0)
 
+list(APPEND TEST_SOURCES main.cpp
+			 test_file_loading.cpp
+			 test_utils.cpp)
+
 include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include)
 
-add_executable(tests main.cpp file_loading.cpp)
+add_executable(tests ${TEST_SOURCES} ${SOURCE})
 
 add_custom_target(test
 					COMMAND ${PROJECT_NAME}

test/test_file_loading.cpp

@@ -0,0 +1,7 @@
+#include <catch2/catch.hpp>
+#include "defines.hpp"
+
+TEST_CASE("Loading a basic file", "[fileio]") {
+
+
+}

test/file_loading.cpp renamed to test/test_utils.cpp

@@ -1,10 +1,10 @@
-// #include "catch.hpp"
 #include <catch2/catch.hpp>
 #include "defines.hpp"
-#include "dbc.hpp"
+#include "util/utils.hpp"
 
-TEST_CASE("Basic file input with safe getline", "") {
+using namespace Utils;
 
+TEST_CASE("Basic file input with safe getline", "") {
 	SECTION("Verify line inputs") {
 		std::ifstream TextFile;
 		std::string test;
@@ -13,16 +13,16 @@ TEST_CASE("Basic file input with safe getline", "") {
 		CHECK(TextFile.is_open());
 
 		if(TextFile.is_open()) {
-			SafeStr::getline(TextFile, test);
+			SafeString::getline(TextFile, test);
 			REQUIRE(test == "This is a non dbc formatted file.");
-			SafeStr::getline(TextFile, test);
+			SafeString::getline(TextFile, test);
 			REQUIRE(test == "");
-			SafeStr::getline(TextFile, test);
+			SafeString::getline(TextFile, test);
 			REQUIRE(test == "Make sure things pass with this");
-			SafeStr::getline(TextFile, test);
+			SafeString::getline(TextFile, test);
 			REQUIRE(test == "Who knows 	what might happen.");
 
 			TextFile.close();
 		}
 	}
-}
+}