File tree Expand file tree Collapse file tree 9 files changed +36
-36
lines changed Expand file tree Collapse file tree 9 files changed +36
-36
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ add_executable(dbcParserTests
29
29
test_dbc.cpp
30
30
test_utils.cpp
31
31
test_parse_message.cpp
32
- common.cpp
32
+ testing_utils/ common.cpp
33
33
)
34
34
35
35
target_compile_definitions (dbcParserTests PRIVATE TESTDBCFILES_PATH= "${CMAKE_CURRENT_SOURCE_DIR} /dbcs" )
@@ -43,7 +43,7 @@ catch_discover_tests(dbcParserTests)
43
43
if (DBC_TEST_LOCALE_INDEPENDENCE )
44
44
add_executable (dbcLocaleTests
45
45
locale_testing/test_locale_main.cpp
46
- common.cpp
46
+ testing_utils/ common.cpp
47
47
)
48
48
49
49
target_compile_definitions (dbcLocaleTests PRIVATE TESTDBCFILES_PATH= "${CMAKE_CURRENT_SOURCE_DIR} /dbcs" )
@@ -60,7 +60,7 @@ endif()
60
60
if (DBC_GENERATE_SINGLE_HEADER )
61
61
add_executable (dbcSingleHeaderTest
62
62
single_header_testing/test_single_header.cpp
63
- common.cpp
63
+ testing_utils/ common.cpp
64
64
)
65
65
66
66
target_compile_definitions (dbcSingleHeaderTest PRIVATE TESTDBCFILES_PATH= "${CMAKE_CURRENT_SOURCE_DIR} /dbcs" )
Original file line number Diff line number Diff line change 1
- #include " common.hpp"
2
- #include " defines.hpp"
1
+ #include " testing_utils/ common.hpp"
2
+ #include " testing_utils/ defines.hpp"
3
3
#include < libdbc/dbc.hpp>
4
4
#include < libdbc/utils/utils.hpp>
5
5
Original file line number Diff line number Diff line change 1
- #include " common.hpp"
2
- #include " defines.hpp"
1
+ #include " testing_utils/ common.hpp"
2
+ #include " testing_utils/ defines.hpp"
3
3
#include < libdbc/libdbc.hpp>
4
4
5
5
#include < catch2/catch_approx.hpp>
Original file line number Diff line number Diff line change 1
- #include " common.hpp"
2
- #include " defines.hpp"
1
+ #include " testing_utils/ common.hpp"
2
+ #include " testing_utils/ defines.hpp"
3
3
#include < catch2/catch_approx.hpp>
4
4
#include < catch2/catch_test_macros.hpp>
5
5
#include < catch2/matchers/catch_matchers.hpp>
Original file line number Diff line number Diff line change 4
4
5
5
#include < libdbc/dbc.hpp>
6
6
7
- #include " common.hpp"
8
- #include " defines.hpp"
7
+ #include " testing_utils/ common.hpp"
8
+ #include " testing_utils/ defines.hpp"
9
9
10
10
// Testing of parsing messages
11
11
Original file line number Diff line number Diff line change 1
- #include " defines.hpp"
1
+ #include " testing_utils/ defines.hpp"
2
2
#include < catch2/catch_test_macros.hpp>
3
3
#include < libdbc/utils/utils.hpp>
4
4
Original file line number Diff line number Diff line change 1
- #include " common.hpp"
2
- #include " defines.hpp"
1
+ #include " testing_utils/ common.hpp"
2
+ #include " testing_utils/ defines.hpp"
3
3
#include < chrono>
4
4
#include < filesystem>
5
5
#include < fstream>
File renamed without changes.
Original file line number Diff line number Diff line change 1
- #include < string>
2
-
3
- // Correctly formated files
4
- static const std::string COMPLEX_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /Complex.dbc" ;
5
- static const std::string SIMPLE_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /Simple.dbc" ;
6
-
7
- // Files with Errors
8
- static const std::string MISSING_NEW_SYMBOLS_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /MissingNewSymbols.dbc" ;
9
- static const std::string MISSING_VERSION_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /MissingVersion.dbc" ;
10
- static const std::string MISSING_BIT_TIMING_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /MissingBitTiming.dbc" ;
11
- static const std::string TEXT_FILE = std::string(TESTDBCFILES_PATH) + " /TextFile.txt" ;
12
-
13
- static const std::string PRIMITIVE_DBC =
14
- R"( VERSION "1.0.0"
15
-
16
- NS_ :
17
-
18
- BS_:
19
-
20
- BU_: DBG DRIVER IO MOTOR SENSOR
21
-
22
- )" ;
1
+ #include < string>
2
+
3
+ // Correctly formated files
4
+ static const std::string COMPLEX_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /Complex.dbc" ;
5
+ static const std::string SIMPLE_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /Simple.dbc" ;
6
+
7
+ // Files with Errors
8
+ static const std::string MISSING_NEW_SYMBOLS_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /MissingNewSymbols.dbc" ;
9
+ static const std::string MISSING_VERSION_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /MissingVersion.dbc" ;
10
+ static const std::string MISSING_BIT_TIMING_DBC_FILE = std::string(TESTDBCFILES_PATH) + " /MissingBitTiming.dbc" ;
11
+ static const std::string TEXT_FILE = std::string(TESTDBCFILES_PATH) + " /TextFile.txt" ;
12
+
13
+ static const std::string PRIMITIVE_DBC =
14
+ R"( VERSION "1.0.0"
15
+
16
+ NS_ :
17
+
18
+ BS_:
19
+
20
+ BU_: DBG DRIVER IO MOTOR SENSOR
21
+
22
+ )" ;
You can’t perform that action at this time.
0 commit comments