EFeru#14 EFeru#37 Use Immutable objects where were possible; Use ride…

…r for code cleanup; Add IsMultiplexed to signal
Uight · Jul 29, 2024 · 102f422 · 102f422
1 parent 1f237cf
commit 102f422
Show file tree

Hide file tree

Showing 10 changed files with 306 additions and 219 deletions.
diff --git a/DbcParserLib.Tests/PropertiesLineParserTests.cs b/DbcParserLib.Tests/PropertiesLineParserTests.cs
@@ -233,8 +233,8 @@ public void MsgCycleTimePropertyIsParsedTest()
             Assert.IsTrue(ParseLine(@"BA_ ""GenMsgCycleTime"" BO_ 2394947585 100;", msgCycleTimeLineParser, builder, nextLineProvider));
 
             var dbc = builder.Build();
-            Assert.AreEqual(true, dbc.Messages.First().Value.CycleTime(out var cycleTime));
-            Assert.AreEqual(100, cycleTime);
+            Assert.IsNotNull(dbc.Messages.First().Value.CycleTime);
+            Assert.AreEqual(100, dbc.Messages.First().Value.CycleTime);
         }
 
         [Test]
@@ -253,9 +253,8 @@ public void SigInitialValueIntegerPropertyIsParsedTest()
             Assert.IsTrue(ParseLine(@"BA_ ""GenSigStartValue"" SG_ 2394947585 sig_name 40;", sigInitialValueLineParser, builder, nextLineProvider));
 
             var dbc = builder.Build();
-            Assert.AreEqual(true, dbc.Messages.First().Value.Signals.First().InitialValue(out var initialValue));
+            Assert.IsNotNull(dbc.Messages.First().Value.Signals.First().InitialValue);
             Assert.AreEqual(40, dbc.Messages.First().Value.Signals.First().InitialValue);
-            Assert.AreEqual(40, initialValue);
         }
 
         [Test]
@@ -274,9 +273,8 @@ public void SigInitialValueHexPropertyIsParsedTest()
             Assert.IsTrue(ParseLine(@"BA_ ""GenSigStartValue"" SG_ 2394947585 sig_name 40;", sigInitialValueLineParser, builder, nextLineProvider));
 
             var dbc = builder.Build();
-            Assert.AreEqual(true, dbc.Messages.First().Value.Signals.First().InitialValue(out var initialValue));
+            Assert.IsNotNull(dbc.Messages.First().Value.Signals.First().InitialValue);
             Assert.AreEqual(40, dbc.Messages.First().Value.Signals.First().InitialValue);
-            Assert.AreEqual(40, initialValue);
         }
 
         [Test]

diff --git a/DbcParserLib/Dbc.cs b/DbcParserLib/Dbc.cs
@@ -8,11 +8,11 @@ namespace DbcParserLib
 {
     public class Dbc
     {
-        public IEnumerable<Node> Nodes {get;}
-        public IReadOnlyDictionary<uint, Message> Messages {get;}
-        public IEnumerable<EnvironmentVariable> EnvironmentVariables { get; }
+        public IReadOnlyCollection<ImmutableNode> Nodes {get;}
+        public IReadOnlyDictionary<uint, ImmutableMessage> Messages {get;}
+        public IReadOnlyCollection<ImmutableEnvironmentVariable> EnvironmentVariables { get; }
 
-        public Dbc(IEnumerable<Node> nodes, IReadOnlyDictionary<uint, Message> messages, IEnumerable<EnvironmentVariable> environmentVariables)
+        public Dbc(List<ImmutableNode> nodes, Dictionary<uint, ImmutableMessage> messages, List<ImmutableEnvironmentVariable> environmentVariables)
         {
             Nodes = nodes;
             Messages = messages;