Clarifying test files that are used and added some more. The errors i am still thinking about and need to figure out how i might want to handle them.

Author: LinuxDevon

src/exceptions/error.hpp

@@ -1,3 +1,4 @@
+#include <sstream>
 
 namespace libdbc {
 
@@ -9,8 +10,25 @@ namespace libdbc {
 
 	class validity_error : public exception {
 		const char * what() const throw() {
-			return "invalid file issue";
+			return "Invalid DBC file...";
 		}
 	};
 
+	class header_error : public validity_error {
+		header_error(const char* line, const char* expected, const char * file) :
+			line(line), expected(expected), file(file) {}
+
+		const char * what() const throw() {
+			std::ostringstream os;
+			os << "Issue with the header line ( " << line << " ) in file ( ";
+			os << file << " ). Expected to find: " << expected;
+			return os.str().c_str();
+		}
+
+	private:
+		const char * line;
+		const char * expected;
+		const char * file;
+	};
+
 } // libdbc

test/dbcs/Sample1.dbc renamed to test/dbcs/Complex.dbc

@@ -0,0 +1,36 @@
+VERSION "1.0.0"
+
+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_
+
+BU_: DBG DRIVER IO MOTOR SENSOR
+
+BO_ 500 IO_DEBUG: 4 IO
+ SG_ IO_DEBUG_test_unsigned : 0|8@1+ (1,0) [0|0] "" DBG

test/dbcs/MissingBitTiming.dbc

@@ -0,0 +1,29 @@
+VERSION "1.0.0"
+
+NS_ :
+	BA_
+	BA_DEF_
+	BA_DEF_DEF_
+	BA_DEF_REL_
+	BA_SGTYPE_
+	BU_SG_REL_
+	CAT_
+	CAT_DEF_
+	CM_
+	ENVVAR_DATA_
+	EV_DATA_
+	FILTER
+	SGTYPE_
+	SG_MUL_VAL_
+	SIGTYPE_VALTYPE_
+	SIG_GROUP_
+	SIG_TYPE_REF_
+	VAL_
+	VAL_TABLE_
+
+BS_:
+
+BU_: DBG DRIVER IO MOTOR SENSOR
+
+BO_ 500 IO_DEBUG: 4 IO
+ SG_ IO_DEBUG_test_unsigned : 0|8@1+ (1,0) [0|0] "" DBG

test/dbcs/MissingNewSymbols.dbc

@@ -0,0 +1,36 @@
+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_ 500 IO_DEBUG: 4 IO
+ SG_ IO_DEBUG_test_unsigned : 0|8@1+ (1,0) [0|0] "" DBG

test/dbcs/MissingVersion.dbc

@@ -1,5 +1,11 @@
 #include <string>
 
-static const std::string TEXT_FILE = "./dbcs/TextFile.txt";
-static const std::string DBC_FILE_1 = "./dbcs/Sample1.dbc";
-static const std::string DBC_FILE_2 = "./dbcs/Sample2.dbc";
+// Correctly formated files
+static const std::string COMPLEX_DBC_FILE 	= "./dbcs/Complex.dbc";
+static const std::string SIMPLE_DBC_FILE	= "./dbcs/Simple.dbc";
+
+// Files with Errors
+static const std::string MISSING_NEW_SYMBOLS_DBC_FILE	= "./dbcs/MissingNewSymbols.dbc";
+static const std::string MISSING_VERSION_DBC_FILE		= "./dbcs/MissingVersion.dbc";
+static const std::string MISSING_BIT_TIMING_DBC_FILE	= "./dbcs/MissingBitTiming.dbc";
+static const std::string TEXT_FILE 						= "./dbcs/TextFile.txt";

test/dbcs/Sample2.dbc renamed to test/dbcs/Simple.dbc

@@ -9,10 +9,15 @@ TEST_CASE("Testing dbc file loading", "[fileio]") {
 		REQUIRE_THROWS_AS(parser->parse_file(TEXT_FILE), libdbc::validity_error);
 	}
 
+	// Undecided on the type of error yet. Need to think about this.
+	// SECTION("Loading a dbc with bad headers throws an error", "[error]") {
+	// 	REQUIRE_THROWS_AS(parser->parse_file(MISSING_VERSION_DBC_FILE), libdbc::header_error);
+	// }
+
 	SECTION("Loading a single simple dbc file", "[dbc]") {
 		std::vector<libdbc::Message> messages;
 
-		parser->parse_file(DBC_FILE_2);
+		parser->parse_file(SIMPLE_DBC_FILE);
 
 		REQUIRE(parser->get_version() == "1.0.0");
 	}