Fix whith the EdiFragment IComparer implementation. When there is an…

… index vs a range. closes #190
indice-co · May 17, 2021 · 2b2d86e · 2b2d86e
1 parent b3d44f0
commit 2b2d86e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/indice.Edi/EdiPathFragment.cs b/src/indice.Edi/EdiPathFragment.cs
@@ -155,7 +155,7 @@ public override bool Equals(object obj) {
         /// <param name="other">The object to check equality with</param>
         /// <returns></returns>
         public bool Equals(EdiPathFragment other) {
-            bool eq = IsWildcard || other.IsWildcard || (HasIndex && Index.Equals(other.Index)) || Value.Equals(other.Value);
+            bool eq = IsWildcard || other.IsWildcard || (HasIndex && other.HasIndex && Index.Equals(other.Index)) || Value.Equals(other.Value);
 
             if (!eq && (IsRange || other.HasIndex)) {
                 return Min <= other.Index && Max >= other.Index;
@@ -185,6 +185,14 @@ public int CompareTo(object obj) {
                     return 0;
                 } else if (other.HasIndex && HasIndex) {
                     return Index.CompareTo(other.Index);
+                } else if (other.HasIndex && IsRange) {
+                    return Max < other.Index ? -1 :
+                           Min > other.Index ? 1 :
+                           0;
+                } else if (other.IsRange && HasIndex) {
+                    return Index < other.Min ? -1 :
+                           Index > other.Max ? 1 :
+                           0;
                 } else {
                     return string.Compare(Value, other.Value, StringComparison.OrdinalIgnoreCase);
                 }

diff --git a/src/indice.Edi/indice.Edi.csproj b/src/indice.Edi/indice.Edi.csproj
@@ -30,6 +30,7 @@
       - Bug fix for Wildcard paths working only for collections #170.
       - Fix for segment collection serialization. When some collection items where being serialized as elements instead #168.
       - Fix missing path (non existing) on condition attirute should not enter infinite loop #188
+      - Fix whith the EdiFragment IComparer implementation. When there is an index vs a range. #190
     </PackageReleaseNotes>
     <PackageIcon>icon-256.png</PackageIcon>
     <PackageProjectUrl>https://github.com/indice-co/EDI.Net</PackageProjectUrl>

diff --git a/test/indice.Edi.Tests/SerializerTests.cs b/test/indice.Edi.Tests/SerializerTests.cs
@@ -433,7 +433,7 @@ public void Serialize_RangeError_Issue190() {
                 Names = new List<EdiFact_Issue190.GivenName> {"Hello", "World"}
             };
             var badResult = Serialize(bad);
-            var badExpected = new StringBuilder().AppendLine("UNA:+.? '").AppendLine("TIF+ADT+Hello+World'").ToString();
+            var badExpected = new StringBuilder().AppendLine("UNA:+.? '").AppendLine("TIF+:ADT+Hello+World'").ToString();
             Assert.Equal(badExpected, badResult);
 
             string Serialize<T>(T data) {