Skip to content

Commit c4c24f5

Browse files
UightUight
committed
EFeru#72 EFeru#69 EFeru#37 EFeru#14 Redfine all Model classes to be readonly for public access. Use FinishUp method to calc useful properties.
1 parent d269019 commit c4c24f5

27 files changed

+1167
-1099
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.suo
33
*.user
44
*.sln.docstates
5+
.idea
56
.vs
67

78
# Build results

‎DbcParserLib.Tests/DbcBuilderTests.cs

+55-55
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ public void MessageIsAdded()
105105

106106
Assert.IsEmpty(dbc.Nodes);
107107
Assert.AreEqual(1, dbc.Messages.Count());
108-
Assert.AreEqual(1, dbc.Messages.First().ID);
109-
Assert.IsFalse(dbc.Messages.First().IsExtID);
108+
Assert.AreEqual(1, dbc.Messages.First().Value.ID);
109+
Assert.IsFalse(dbc.Messages.First().Value.IsExtID);
110110
}
111111

112112
[Test]
@@ -119,8 +119,8 @@ public void ExtendedMessageIsAdded()
119119

120120
Assert.IsEmpty(dbc.Nodes);
121121
Assert.AreEqual(1, dbc.Messages.Count());
122-
Assert.AreEqual(1, dbc.Messages.First().ID);
123-
Assert.IsTrue(dbc.Messages.First().IsExtID);
122+
Assert.AreEqual(1, dbc.Messages.First().Value.ID);
123+
Assert.IsTrue(dbc.Messages.First().Value.IsExtID);
124124
}
125125

126126
[Test]
@@ -134,8 +134,8 @@ public void CommentIsAddedToMessage()
134134

135135
Assert.IsEmpty(dbc.Nodes);
136136
Assert.AreEqual(1, dbc.Messages.Count());
137-
Assert.AreEqual(234, dbc.Messages.First().ID);
138-
Assert.AreEqual("comment", dbc.Messages.First().Comment);
137+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
138+
Assert.AreEqual("comment", dbc.Messages.First().Value.Comment);
139139
}
140140

141141
[Test]
@@ -149,8 +149,8 @@ public void CommentIsNotAddedToMissingMessage()
149149

150150
Assert.IsEmpty(dbc.Nodes);
151151
Assert.AreEqual(1, dbc.Messages.Count());
152-
Assert.AreEqual(234, dbc.Messages.First().ID);
153-
Assert.IsNull(dbc.Messages.First().Comment);
152+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
153+
Assert.IsNull(dbc.Messages.First().Value.Comment);
154154
}
155155

156156
[Test]
@@ -178,14 +178,14 @@ public void SignalIsAddedToCurrentMessage()
178178
Assert.AreEqual(2, dbc.Messages.Count());
179179

180180
var messagesToArray = dbc.Messages.ToArray();
181-
Assert.AreEqual(234, messagesToArray[0].ID);
182-
Assert.AreEqual(1, messagesToArray[0].Signals.Count());
183-
Assert.AreEqual("name1", messagesToArray[0].Signals.First().Name);
184-
185-
Assert.AreEqual(235, messagesToArray[1].ID);
186-
Assert.AreEqual(2, messagesToArray[1].Signals.Count());
187-
Assert.AreEqual("name2", messagesToArray[1].Signals.First().Name);
188-
Assert.AreEqual("name3", messagesToArray[1].Signals.Skip(1).First().Name);
181+
Assert.AreEqual(234, messagesToArray[0].Value.ID);
182+
Assert.AreEqual(1, messagesToArray[0].Value.Signals.Count());
183+
Assert.AreEqual("name1", messagesToArray[0].Value.Signals.First().Value.Name);
184+
185+
Assert.AreEqual(235, messagesToArray[1].Value.ID);
186+
Assert.AreEqual(2, messagesToArray[1].Value.Signals.Count());
187+
Assert.AreEqual("name2", messagesToArray[1].Value.Signals.First().Value.Name);
188+
Assert.AreEqual("name3", messagesToArray[1].Value.Signals.Skip(1).First().Value.Name);
189189
}
190190

191191
[Test]
@@ -213,9 +213,9 @@ public void CommentIsAddedToSignal()
213213

214214
Assert.IsEmpty(dbc.Nodes);
215215
Assert.AreEqual(1, dbc.Messages.Count());
216-
Assert.AreEqual(234, dbc.Messages.First().ID);
217-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
218-
Assert.AreEqual("comment", dbc.Messages.First().Signals.First().Comment);
216+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
217+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
218+
Assert.AreEqual("comment", dbc.Messages.First().Value.Signals.First().Value.Comment);
219219
}
220220

221221
[Test]
@@ -232,9 +232,9 @@ public void CommentIsNotAddedToMissingSignalMessageId()
232232

233233
Assert.IsEmpty(dbc.Nodes);
234234
Assert.AreEqual(1, dbc.Messages.Count());
235-
Assert.AreEqual(234, dbc.Messages.First().ID);
236-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
237-
Assert.IsNull(dbc.Messages.First().Signals.First().Comment);
235+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
236+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
237+
Assert.IsNull(dbc.Messages.First().Value.Signals.First().Value.Comment);
238238
}
239239

240240
[Test]
@@ -251,9 +251,9 @@ public void CommentIsNotAddedToMissingSignalName()
251251

252252
Assert.IsEmpty(dbc.Nodes);
253253
Assert.AreEqual(1, dbc.Messages.Count());
254-
Assert.AreEqual(234, dbc.Messages.First().ID);
255-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
256-
Assert.IsNull(dbc.Messages.First().Signals.First().Comment);
254+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
255+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
256+
Assert.IsNull(dbc.Messages.First().Value.Signals.First().Value.Comment);
257257
}
258258

259259
[Test]
@@ -271,11 +271,11 @@ public void TableValuesAreAddedToSignal()
271271

272272
Assert.IsEmpty(dbc.Nodes);
273273
Assert.AreEqual(1, dbc.Messages.Count());
274-
Assert.AreEqual(234, dbc.Messages.First().ID);
275-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
276-
Assert.AreEqual(testValuesDict, dbc.Messages.First().Signals.First().ValueTableMap);
277-
Assert.AreEqual(1, dbc.Messages.First().Signals.First().ValueTableMap.Keys.First());
278-
Assert.AreEqual("fake", dbc.Messages.First().Signals.First().ValueTableMap.Values.First());
274+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
275+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
276+
Assert.AreEqual(testValuesDict, dbc.Messages.First().Value.Signals.First().Value.ValueTableMap);
277+
Assert.AreEqual(1, dbc.Messages.First().Value.Signals.First().Value.ValueTableMap.Keys.First());
278+
Assert.AreEqual("fake", dbc.Messages.First().Value.Signals.First().Value.ValueTableMap.Values.First());
279279
}
280280

281281
[Test]
@@ -293,11 +293,11 @@ public void TableValuesWithExtendedMessageIdAreAddedToSignal()
293293

294294
Assert.IsEmpty(dbc.Nodes);
295295
Assert.AreEqual(1, dbc.Messages.Count());
296-
Assert.AreEqual(message.ID, dbc.Messages.First().ID);
297-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
298-
Assert.AreEqual(testValuesDict, dbc.Messages.First().Signals.First().ValueTableMap);
299-
Assert.AreEqual(1, dbc.Messages.First().Signals.First().ValueTableMap.Keys.First());
300-
Assert.AreEqual("fake", dbc.Messages.First().Signals.First().ValueTableMap.Values.First());
296+
Assert.AreEqual(message.ID, dbc.Messages.First().Value.ID);
297+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
298+
Assert.AreEqual(testValuesDict, dbc.Messages.First().Value.Signals.First().Value.ValueTableMap);
299+
Assert.AreEqual(1, dbc.Messages.First().Value.Signals.First().Value.ValueTableMap.Keys.First());
300+
Assert.AreEqual("fake", dbc.Messages.First().Value.Signals.First().Value.ValueTableMap.Values.First());
301301
}
302302

303303
[Test]
@@ -315,9 +315,9 @@ public void TableValueIsNotAddedToMissingSignalMessageId()
315315

316316
Assert.IsEmpty(dbc.Nodes);
317317
Assert.AreEqual(1, dbc.Messages.Count());
318-
Assert.AreEqual(234, dbc.Messages.First().ID);
319-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
320-
Assert.IsEmpty(dbc.Messages.First().Signals.First().ValueTableMap);
318+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
319+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
320+
Assert.IsEmpty(dbc.Messages.First().Value.Signals.First().Value.ValueTableMap);
321321
}
322322

323323
[Test]
@@ -335,9 +335,9 @@ public void TableValueIsNotAddedToMissingSignalName()
335335

336336
Assert.IsEmpty(dbc.Nodes);
337337
Assert.AreEqual(1, dbc.Messages.Count());
338-
Assert.AreEqual(234, dbc.Messages.First().ID);
339-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
340-
Assert.IsEmpty(dbc.Messages.First().Signals.First().ValueTableMap);
338+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
339+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
340+
Assert.IsEmpty(dbc.Messages.First().Value.Signals.First().Value.ValueTableMap);
341341
}
342342

343343
[Test]
@@ -357,11 +357,11 @@ public void NamedTableValuesAreAddedToSignal()
357357

358358
Assert.IsEmpty(dbc.Nodes);
359359
Assert.AreEqual(1, dbc.Messages.Count());
360-
Assert.AreEqual(234, dbc.Messages.First().ID);
361-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
362-
Assert.AreEqual(testValuesDict, dbc.Messages.First().Signals.First().ValueTableMap);
363-
Assert.AreEqual(1, dbc.Messages.First().Signals.First().ValueTableMap.Keys.First());
364-
Assert.AreEqual("fake", dbc.Messages.First().Signals.First().ValueTableMap.Values.First());
360+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
361+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
362+
Assert.AreEqual(testValuesDict, dbc.Messages.First().Value.Signals.First().Value.ValueTableMap);
363+
Assert.AreEqual(1, dbc.Messages.First().Value.Signals.First().Value.ValueTableMap.Keys.First());
364+
Assert.AreEqual("fake", dbc.Messages.First().Value.Signals.First().Value.ValueTableMap.Values.First());
365365
}
366366

367367
[Test]
@@ -381,9 +381,9 @@ public void NamedTableValueIsNotAddedToMissingSignalMessageId()
381381

382382
Assert.IsEmpty(dbc.Nodes);
383383
Assert.AreEqual(1, dbc.Messages.Count());
384-
Assert.AreEqual(234, dbc.Messages.First().ID);
385-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
386-
Assert.IsEmpty(dbc.Messages.First().Signals.First().ValueTableMap);
384+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
385+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
386+
Assert.IsEmpty(dbc.Messages.First().Value.Signals.First().Value.ValueTableMap);
387387
}
388388

389389
[Test]
@@ -403,9 +403,9 @@ public void NamedTableValueIsNotAddedToMissingSignalName()
403403

404404
Assert.IsEmpty(dbc.Nodes);
405405
Assert.AreEqual(1, dbc.Messages.Count());
406-
Assert.AreEqual(234, dbc.Messages.First().ID);
407-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
408-
Assert.IsEmpty(dbc.Messages.First().Signals.First().ValueTableMap);
406+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
407+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
408+
Assert.IsEmpty(dbc.Messages.First().Value.Signals.First().Value.ValueTableMap);
409409
}
410410

411411
[Test]
@@ -422,9 +422,9 @@ public void NamedTableValueIsNotAddedIfTableNameDoesNotExist()
422422

423423
Assert.IsEmpty(dbc.Nodes);
424424
Assert.AreEqual(1, dbc.Messages.Count());
425-
Assert.AreEqual(234, dbc.Messages.First().ID);
426-
Assert.AreEqual("name1", dbc.Messages.First().Signals.First().Name);
427-
Assert.IsEmpty(dbc.Messages.First().Signals.First().ValueTableMap);
425+
Assert.AreEqual(234, dbc.Messages.First().Value.ID);
426+
Assert.AreEqual("name1", dbc.Messages.First().Value.Signals.First().Value.Name);
427+
Assert.IsEmpty(dbc.Messages.First().Value.Signals.First().Value.ValueTableMap);
428428
}
429429

430430
[Test]

‎DbcParserLib.Tests/DbcParserLib.Tests.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
4+
<TargetFramework>net8.0</TargetFramework>
65
<IsPackable>false</IsPackable>
76
</PropertyGroup>
87

‎DbcParserLib.Tests/ExtensionMethodsTests.cs

-100
Original file line numberDiff line numberDiff line change
@@ -35,106 +35,6 @@ public void IntelTest()
3535
Assert.IsTrue(sig.Lsb());
3636
}
3737

38-
[Test]
39-
public void NoMultiplexingTest()
40-
{
41-
var sig = new Signal
42-
{
43-
Multiplexing = null,
44-
};
45-
46-
var multiplexing = sig.MultiplexingInfo();
47-
Assert.AreEqual(MultiplexingRole.None, multiplexing.Role);
48-
Assert.AreEqual(0, multiplexing.Group);
49-
}
50-
51-
[Test]
52-
public void MultiplexorTest()
53-
{
54-
var sig = new Signal
55-
{
56-
Multiplexing = "M",
57-
};
58-
59-
var multiplexing = sig.MultiplexingInfo();
60-
Assert.AreEqual(MultiplexingRole.Multiplexor, multiplexing.Role);
61-
Assert.AreEqual(0, multiplexing.Group);
62-
}
63-
64-
[Test]
65-
public void MultiplexedSingleDigitTest()
66-
{
67-
var sig = new Signal
68-
{
69-
Multiplexing = "m3",
70-
};
71-
72-
var multiplexing = sig.MultiplexingInfo();
73-
Assert.AreEqual(MultiplexingRole.Multiplexed, multiplexing.Role);
74-
Assert.AreEqual(3, multiplexing.Group);
75-
}
76-
77-
[Test]
78-
public void ExtendedMultiplexingIsPartiallySupportedTest()
79-
{
80-
var sig = new Signal
81-
{
82-
Multiplexing = "m3M",
83-
};
84-
85-
var multiplexing = sig.MultiplexingInfo();
86-
Assert.AreEqual(MultiplexingRole.Multiplexed, multiplexing.Role);
87-
Assert.AreEqual(3, multiplexing.Group);
88-
}
89-
90-
[Test]
91-
public void MultiplexedDoubleDigitTest()
92-
{
93-
var sig = new Signal
94-
{
95-
Multiplexing = "m12",
96-
};
97-
98-
var multiplexing = sig.MultiplexingInfo();
99-
Assert.AreEqual(MultiplexingRole.Multiplexed, multiplexing.Role);
100-
Assert.AreEqual(12, multiplexing.Group);
101-
}
102-
103-
[Test]
104-
public void MultiplexedMessageTest()
105-
{
106-
var sig = new Signal
107-
{
108-
Multiplexing = "M",
109-
};
110-
111-
var message = new Message();
112-
message.Signals.Add(sig);
113-
114-
Assert.IsTrue(message.IsMultiplexed());
115-
}
116-
117-
[Test]
118-
public void MessageWithNoMutiplexorIsNotMultiplexedTest()
119-
{
120-
var sig = new Signal
121-
{
122-
Multiplexing = null,
123-
};
124-
125-
var message = new Message();
126-
message.Signals.Add(sig);
127-
128-
Assert.IsFalse(message.IsMultiplexed());
129-
}
130-
131-
[Test]
132-
public void EmptyMessageIsNotMultiplexedTest()
133-
{
134-
var message = new Message();
135-
Assert.IsFalse(message.IsMultiplexed());
136-
}
137-
13838
[TestCase("1 \"First\" 2 \"Second\" 3 \"Third\"")]
13939
[TestCase("1 \"First with spaces\" 2 \" Second \" 3 \"T h i r d\"")]
14040
[TestCase("1 \"First with spaces\" 2 \" \" 3 \"\"")]

0 commit comments

Comments
 (0)