Minor changes

EFeru · Mar 24, 2023 · 64e9f99 · 64e9f99
1 parent d3a0f72
commit 64e9f99
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/DbcParserLib.Tests/DbcBuilderTests.cs b/DbcParserLib.Tests/DbcBuilderTests.cs
@@ -6,6 +6,7 @@
 
 namespace DbcParserLib.Tests
 {
+    [TestFixture]
     public class DbcBuilderTests
     {
         private MockRepository m_repository;
@@ -104,7 +105,7 @@ public void MessageIsAdded()
             Assert.IsEmpty(dbc.Nodes);
             Assert.AreEqual(1, dbc.Messages.Count());
             Assert.AreEqual(1, dbc.Messages.First().ID);
-            Assert.AreEqual(false, dbc.Messages.First().IsExtID);
+            Assert.IsFalse(dbc.Messages.First().IsExtID);
         }
 
         [Test]
@@ -118,7 +119,7 @@ public void ExtendedMessageIsAdded()
             Assert.IsEmpty(dbc.Nodes);
             Assert.AreEqual(1, dbc.Messages.Count());
             Assert.AreEqual(1, dbc.Messages.First().ID);
-            Assert.AreEqual(true, dbc.Messages.First().IsExtID);
+            Assert.IsTrue(dbc.Messages.First().IsExtID);
         }
 
         [Test]

diff --git a/DbcParserLib.Tests/EnvironmentVariableLineParserTests.cs b/DbcParserLib.Tests/EnvironmentVariableLineParserTests.cs
@@ -6,6 +6,7 @@
 
 namespace DbcParserLib.Tests
 {
+    [TestFixture]
     public class EnvironmentVariableLineParserTests
     {
         private MockRepository m_repository;

diff --git a/DbcParserLib.Tests/ExtensionMethodsTests.cs b/DbcParserLib.Tests/ExtensionMethodsTests.cs
@@ -3,6 +3,7 @@
 
 namespace DbcParserLib.Tests
 {
+    [TestFixture]
     public class ExtensionMethodsTests
     {
         [Test]

diff --git a/DbcParserLib/DbcBuilder.cs b/DbcParserLib/DbcBuilder.cs
@@ -303,8 +303,10 @@ public Dbc Build()
             foreach (var message in m_messages)
             {
                 message.Value.Signals.Clear();
-                message.Value.Signals.AddRange(m_signals[message.Key].Values);
-                message.Value.IsExtID();
+                if(m_signals.TryGetValue(message.Key, out var signals) && signals != null)
+                    message.Value.Signals.AddRange(signals.Values);
+
+                message.Value.AdjustExtendedId();
             }
 
             //TODO: uncomment once Immutable classes are used

diff --git a/DbcParserLib/Extensions.cs b/DbcParserLib/Extensions.cs
@@ -66,7 +66,7 @@ public static bool IsMultiplexed(this Message message)
             return message.Signals.Any(s => s.MultiplexingInfo().Role == MultiplexingRole.Multiplexor);
         }
 
-        internal static void IsExtID(this Message message)
+        internal static void AdjustExtendedId(this Message message)
         {
             // For extended ID bit 31 is always 1
             if(message.ID >= 0x80000000)
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     namespace DbcParserLib.Tests
     {
+        [TestFixture]
         public class ExtensionMethodsTests
         {
             [Test]
@@ Expand Down @@