Merge branch 'testing-integration'

# Conflicts:
#	src/dbc.hpp

Author: LinuxDevon

.gitignore

@@ -1,3 +1,6 @@
 # Build folders
 bin/
 build/
+
+# -- Git -- #
+*.bak

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "third_party/Catch2"]
+	path = third_party/Catch2
+	url = https://github.com/catchorg/Catch2.git

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(DBC_Tests)
+project(DBC)
 
 # specify the C++ standard
 set(CMAKE_CXX_STANDARD 11)
@@ -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,44 +1,8 @@
 
-#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 +1,14 @@
-add_executable(dbc_test main.cpp file_loading.cpp)
+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 ${TEST_SOURCES} ${SOURCE})
+
+add_custom_target(test
+					COMMAND ${PROJECT_NAME}
+					WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+					DEPENDS ${PROJECT_NAME})