Fix generated equals method

Fixes #33

Plotly.Blazor.Generator/Templates/Class/Class.txt

@@ -67,8 +67,8 @@ namespace {{Namespace}}
 {{#Properties}}
 {{^IsList}}
                 (
-                    {{PropertyName}} == other.{{PropertyName}} &&
-                    {{PropertyName}} != null && other.{{PropertyName}} != null &&
+                    {{PropertyName}} == other.{{PropertyName}} ||
+                    {{PropertyName}} != null &&
                     {{PropertyName}}.Equals(other.{{PropertyName}})
                 ){{#HasMore}} && {{/HasMore}}{{^HasMore}};{{/HasMore}}
 {{/IsList}}

Plotly.Blazor.Tests/GeneratorTests.cs

@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using NUnit.Framework;
+using Plotly.Blazor.Traces;
+using Plotly.Blazor.Traces.ScatterLib;
+using Plotly.Blazor.Traces.ScatterLib.ErrorXLib;
+
+namespace Plotly.Blazor.Tests
+{
+    public class GeneratorTests
+    { 
+        /// <summary>
+        /// Defines the test method EqualsMethodTest.
+        /// </summary>
+        [Test]
+        public void EqualsMethodTest()
+        {
+            var referenceScatter = new Scatter
+            {
+                ClipOnAxis = true,
+                DX = new decimal(1.23),
+                Fill = FillEnum.ToNext,
+                HoverTemplateArray = new List<string> {"123", "456"},
+                CustomDataSrc = "123",
+                ErrorX = new ErrorX
+                {
+                    CopyYStyle = true,
+                    Array = new List<object>(),
+                    Type = TypeEnum.Constant
+                }
+            };
+
+            var equalScatter = new Scatter
+            {
+                ClipOnAxis = true,
+                DX = new decimal(1.23),
+                Fill = FillEnum.ToNext,
+                HoverTemplateArray = new List<string> {"123", "456"},
+                CustomDataSrc = "123",
+                ErrorX = new ErrorX
+                {
+                    CopyYStyle = true,
+                    Array = new List<object>(),
+                    Type = TypeEnum.Constant
+                }
+            };
+
+            var notEqualScatter = new Scatter
+            {
+                ClipOnAxis = null,
+                DX = new decimal(1.23),
+                Fill = FillEnum.ToNext,
+                HoverTemplateArray = new List<string> {"123", "456"},
+                CustomDataSrc = "123",
+                ErrorX = new ErrorX
+                {
+                    CopyYStyle = true,
+                    Array = new List<object>(),
+                    Type = TypeEnum.Constant
+                }
+            };
+
+            Assert.IsFalse(referenceScatter.Equals(null));
+
+            Assert.IsTrue(referenceScatter.Equals(equalScatter));
+            Assert.IsTrue(equalScatter.Equals(referenceScatter));
+            Assert.IsTrue(referenceScatter == equalScatter);
+            Assert.IsFalse(referenceScatter != equalScatter);
+
+            Assert.IsFalse(referenceScatter.Equals(notEqualScatter));
+            Assert.IsFalse(notEqualScatter.Equals(referenceScatter));
+            Assert.IsFalse(referenceScatter == notEqualScatter);
+            Assert.IsTrue(referenceScatter != notEqualScatter);
+        }
+
+    }
+}

Plotly.Blazor/Animation.cs

@@ -67,28 +67,28 @@ public bool Equals([AllowNull] Animation other)
 
             return 
                 (
-                    Mode == other.Mode &&
-                    Mode != null && other.Mode != null &&
+                    Mode == other.Mode ||
+                    Mode != null &&
                     Mode.Equals(other.Mode)
                 ) && 
                 (
-                    Direction == other.Direction &&
-                    Direction != null && other.Direction != null &&
+                    Direction == other.Direction ||
+                    Direction != null &&
                     Direction.Equals(other.Direction)
                 ) && 
                 (
-                    FromCurrent == other.FromCurrent &&
-                    FromCurrent != null && other.FromCurrent != null &&
+                    FromCurrent == other.FromCurrent ||
+                    FromCurrent != null &&
                     FromCurrent.Equals(other.FromCurrent)
                 ) && 
                 (
-                    Frame == other.Frame &&
-                    Frame != null && other.Frame != null &&
+                    Frame == other.Frame ||
+                    Frame != null &&
                     Frame.Equals(other.Frame)
                 ) && 
                 (
-                    Transition == other.Transition &&
-                    Transition != null && other.Transition != null &&
+                    Transition == other.Transition ||
+                    Transition != null &&
                     Transition.Equals(other.Transition)
                 );
         }

Plotly.Blazor/AnimationLib/Frame.cs

@@ -48,13 +48,13 @@ public bool Equals([AllowNull] Frame other)
 
             return 
                 (
-                    Duration == other.Duration &&
-                    Duration != null && other.Duration != null &&
+                    Duration == other.Duration ||
+                    Duration != null &&
                     Duration.Equals(other.Duration)
                 ) && 
                 (
-                    Redraw == other.Redraw &&
-                    Redraw != null && other.Redraw != null &&
+                    Redraw == other.Redraw ||
+                    Redraw != null &&
                     Redraw.Equals(other.Redraw)
                 );
         }

Plotly.Blazor/AnimationLib/Transition.cs

@@ -53,18 +53,18 @@ public bool Equals([AllowNull] Transition other)
 
             return 
                 (
-                    Duration == other.Duration &&
-                    Duration != null && other.Duration != null &&
+                    Duration == other.Duration ||
+                    Duration != null &&
                     Duration.Equals(other.Duration)
                 ) && 
                 (
-                    Easing == other.Easing &&
-                    Easing != null && other.Easing != null &&
+                    Easing == other.Easing ||
+                    Easing != null &&
                     Easing.Equals(other.Easing)
                 ) && 
                 (
-                    Ordering == other.Ordering &&
-                    Ordering != null && other.Ordering != null &&
+                    Ordering == other.Ordering ||
+                    Ordering != null &&
                     Ordering.Equals(other.Ordering)
                 );
         }