Got a base file input test going. I am checking the safe getline function

Author: LinuxDevon

CMakeLists.txt

@@ -12,5 +12,6 @@ set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
 
 # add where to find the source files
 include_directories(src)
+include_directories(test)
 add_subdirectory(test)
 

src/dbc.hpp

@@ -0,0 +1,36 @@
+
+#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;
+}
+
+}
+

test/CMakeLists.txt

@@ -1 +1 @@
-add_executable(dbc_test main.cpp)
+add_executable(dbc_test main.cpp file_loading.cpp)

test/dbcs/Sample1.dbc

@@ -0,0 +1,93 @@
+VERSION ""
+
+NS_ :
+	BA_
+	BA_DEF_
+	BA_DEF_DEF_
+	BA_DEF_DEF_REL_
+	BA_DEF_REL_
+	BA_DEF_SGTYPE_
+	BA_REL_
+	BA_SGTYPE_
+	BO_TX_BU_
+	BU_BO_REL_
+	BU_EV_REL_
+	BU_SG_REL_
+	CAT_
+	CAT_DEF_
+	CM_
+	ENVVAR_DATA_
+	EV_DATA_
+	FILTER
+	NS_DESC_
+	SGTYPE_
+	SGTYPE_VAL_
+	SG_MUL_VAL_
+	SIGTYPE_VALTYPE_
+	SIG_GROUP_
+	SIG_TYPE_REF_
+	SIG_VALTYPE_
+	VAL_
+	VAL_TABLE_
+
+BS_:
+
+BU_: DBG DRIVER IO MOTOR SENSOR
+
+
+BO_ 100 DRIVER_HEARTBEAT: 1 DRIVER
+ SG_ DRIVER_HEARTBEAT_cmd : 0|8@1+ (1,0) [0|0] "" SENSOR,MOTOR
+
+BO_ 500 IO_DEBUG: 4 IO
+ SG_ IO_DEBUG_test_unsigned : 0|8@1+ (1,0) [0|0] "" DBG
+ SG_ IO_DEBUG_test_enum : 8|8@1+ (1,0) [0|0] "" DBG
+ SG_ IO_DEBUG_test_signed : 16|8@1- (1,0) [0|0] "" DBG
+ SG_ IO_DEBUG_test_float : 24|8@1+ (0.5,0) [0|0] "" DBG
+
+BO_ 101 MOTOR_CMD: 1 DRIVER
+ SG_ MOTOR_CMD_steer : 0|4@1- (1,-5) [-5|5] "" MOTOR
+ SG_ MOTOR_CMD_drive : 4|4@1+ (1,0) [0|9] "" MOTOR
+
+BO_ 400 MOTOR_STATUS: 3 MOTOR
+ SG_ MOTOR_STATUS_wheel_error : 0|1@1+ (1,0) [0|0] "" DRIVER,IO
+ SG_ MOTOR_STATUS_speed_kph : 8|16@1+ (0.001,0) [0|0] "kph" DRIVER,IO
+
+BO_ 200 SENSOR_SONARS: 8 SENSOR
+ SG_ SENSOR_SONARS_mux M : 0|4@1+ (1,0) [0|0] "" DRIVER,IO
+ SG_ SENSOR_SONARS_err_count : 4|12@1+ (1,0) [0|0] "" DRIVER,IO
+ SG_ SENSOR_SONARS_left m0 : 16|12@1+ (0.1,0) [0|0] "" DRIVER,IO
+ SG_ SENSOR_SONARS_middle m0 : 28|12@1+ (0.1,0) [0|0] "" DRIVER,IO
+ SG_ SENSOR_SONARS_right m0 : 40|12@1+ (0.1,0) [0|0] "" DRIVER,IO
+ SG_ SENSOR_SONARS_rear m0 : 52|12@1+ (0.1,0) [0|0] "" DRIVER,IO
+ SG_ SENSOR_SONARS_no_filt_left m1 : 16|12@1+ (0.1,0) [0|0] "" DBG
+ SG_ SENSOR_SONARS_no_filt_middle m1 : 28|12@1+ (0.1,0) [0|0] "" DBG
+ SG_ SENSOR_SONARS_no_filt_right m1 : 40|12@1+ (0.1,0) [0|0] "" DBG
+ SG_ SENSOR_SONARS_no_filt_rear m1 : 52|12@1+ (0.1,0) [0|0] "" DBG
+
+
+
+
+CM_ BU_ DRIVER "The driver controller driving the car";
+CM_ BU_ MOTOR "The motor controller of the car";
+CM_ BU_ SENSOR "The sensor controller of the car";
+CM_ BO_ 100 "Sync message used to synchronize the controllers";
+
+BA_DEF_ "BusType" STRING ;
+BA_DEF_ BO_ "GenMsgCycleTime" INT 0 0;
+BA_DEF_ SG_ "FieldType" STRING ;
+
+BA_DEF_DEF_ "BusType" "CAN";
+BA_DEF_DEF_ "FieldType" "";
+BA_DEF_DEF_ "GenMsgCycleTime" 0;
+
+BA_ "GenMsgCycleTime" BO_ 100 1000;
+BA_ "GenMsgCycleTime" BO_ 500 100;
+BA_ "GenMsgCycleTime" BO_ 101 100;
+BA_ "GenMsgCycleTime" BO_ 400 100;
+BA_ "GenMsgCycleTime" BO_ 200 100;
+BA_ "FieldType" SG_ 100 DRIVER_HEARTBEAT_cmd "DRIVER_HEARTBEAT_cmd";
+BA_ "FieldType" SG_ 500 IO_DEBUG_test_enum "IO_DEBUG_test_enum";
+
+
+VAL_ 100 DRIVER_HEARTBEAT_cmd 2 "DRIVER_HEARTBEAT_cmd_REBOOT" 1 "DRIVER_HEARTBEAT_cmd_SYNC" 0 "DRIVER_HEARTBEAT_cmd_NOOP" ;
+VAL_ 500 IO_DEBUG_test_enum 2 "IO_DEBUG_test2_enum_two" 1 "IO_DEBUG_test2_enum_one" ;

test/dbcs/TextFile.txt

@@ -0,0 +1,4 @@
+This is a non dbc formatted file.
+
+Make sure things pass with this
+Who knows 	what might happen.

test/defines.hpp

@@ -0,0 +1,3 @@
+#include <string>
+
+static const std::string TEXT_FILE = "./dbcs/TextFile.txt";

test/file_loading.cpp

@@ -0,0 +1,27 @@
+#include "catch.hpp"
+#include "defines.hpp"
+#include "dbc.hpp"
+
+TEST_CASE("Basic file input with safe getline", "") {
+
+	SECTION("Verify line inputs") {
+		std::ifstream TextFile;
+		std::string test;
+
+		TextFile.open(TEXT_FILE, std::ios::in);
+		CHECK(TextFile.is_open());
+
+		if(TextFile.is_open()) {
+			SafeStr::getline(TextFile, test);
+			REQUIRE(test == "This is a non dbc formatted file.");
+			SafeStr::getline(TextFile, test);
+			REQUIRE(test == "");
+			SafeStr::getline(TextFile, test);
+			REQUIRE(test == "Make sure things pass with this");
+			SafeStr::getline(TextFile, test);
+			REQUIRE(test == "Who knows 	what might happen.");
+
+			TextFile.close();
+		}
+	}
+}

test/main.cpp

@@ -1,3 +1,2 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include "catch.hpp"
-#include "dbc.hpp"