Skip to content

Commit 4b43b62

Browse files
committed
add possibility to get the name of the message
1 parent 71cac35 commit 4b43b62

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

include/libdbc/message.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ struct Message {
3131
void appendSignal(const Signal& signal);
3232
const std::vector<Signal> getSignals() const;
3333
uint32_t id() const;
34+
const std::string& name() {return m_name;}
3435
void addValueDescription(const std::string& signal_name, const std::vector<Signal::SignalValueDescriptions>&);
3536

3637
virtual bool operator==(const Message& rhs) const;

test/test_dbc.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ TEST_CASE("Testing big endian, little endian") {
8080
parser.parse_file(filename);
8181

8282
REQUIRE(parser.get_messages().size() == 1);
83+
REQUIRE(parser.get_messages().at(0).name() == "MSG1");
8384
REQUIRE(parser.get_messages().at(0).getSignals().size() == 2);
8485
{
8586
const auto signal = parser.get_messages().at(0).getSignals().at(0);
@@ -104,6 +105,7 @@ TEST_CASE("Testing negative values") {
104105
parser.parse_file(filename);
105106

106107
REQUIRE(parser.get_messages().size() == 1);
108+
REQUIRE(parser.get_messages().at(0).name() == "MSG1");
107109
REQUIRE(parser.get_messages().at(0).getSignals().size() == 4);
108110

109111
SECTION("Evaluating first message") {
@@ -146,6 +148,7 @@ TEST_CASE("Special characters in unit") {
146148
parser.parse_file(filename);
147149

148150
REQUIRE(parser.get_messages().size() == 1);
151+
REQUIRE(parser.get_messages().at(0).name() == "MSG1");
149152
REQUIRE(parser.get_messages().at(0).getSignals().size() == 1);
150153
SECTION("Checking that signal with special characters as unit is parsed correctly") {
151154
const auto signal = parser.get_messages().at(0).getSignals().at(0);
@@ -165,6 +168,7 @@ VAL_ 234 State1 123 "Description 1" 0 "Description 2" 90903489 "Big value and sp
165168
parser.parse_file(filename);
166169

167170
REQUIRE(parser.get_messages().size() == 1);
171+
REQUIRE(parser.get_messages().at(0).name() == "MSG1");
168172
REQUIRE(parser.get_messages().at(0).getSignals().size() == 2);
169173

170174
REQUIRE(parser.get_messages().at(0).getSignals().at(0).svDescriptions.size() == 3);
@@ -194,6 +198,7 @@ VAL_ 3221225472 State1 123 "Description 1" 0 "Description 2" 4000000000 "Big val
194198
parser.parse_file(filename);
195199

196200
REQUIRE(parser.get_messages().size() == 1);
201+
REQUIRE(parser.get_messages().at(0).name() == "MSG1");
197202
REQUIRE(parser.get_messages().at(0).getSignals().size() == 2);
198203

199204
REQUIRE(parser.get_messages().at(0).getSignals().at(0).svDescriptions.size() == 3);
@@ -217,7 +222,7 @@ TEST_CASE("Signal Value Multiple VAL_") {
217222
create_tmp_dbc_with(filename, R"(BO_ 3221225472 MSG1: 8 Vector__XXX
218223
SG_ State1 : 0|8@1+ (1,0) [0|200] "Km/h" DEVICE1,DEVICE2,DEVICE3
219224
SG_ State2 : 0|8@1+ (1,0) [0|204] "" DEVICE1,DEVICE2,DEVICE3"
220-
BO_ 123 MSG1: 8 Vector__XXX
225+
BO_ 123 MSG2: 8 Vector__XXX
221226
SG_ State1 : 0|8@1+ (1,0) [0|200] "Km/h" DEVICE1,DEVICE2,DEVICE3
222227
SG_ State2 : 0|8@1+ (1,0) [0|204] "" DEVICE1,DEVICE2,DEVICE3
223228
VAL_ 3221225472 State1 123 "Description 1" 0 "Description 2" ;
@@ -227,6 +232,9 @@ VAL_ 123 State1 123 "Description 3" 0 "Description 4" ;)");
227232
parser.parse_file(filename);
228233

229234
REQUIRE(parser.get_messages().size() == 2);
235+
REQUIRE(parser.get_messages().at(0).name() == "MSG1");
236+
REQUIRE(parser.get_messages().at(1).name() == "MSG2");
237+
230238
REQUIRE(parser.get_messages().at(0).getSignals().size() == 2);
231239

232240
REQUIRE(parser.get_messages().at(0).getSignals().at(0).svDescriptions.size() == 2);

0 commit comments

Comments
 (0)