Merge remote-tracking branch 'upstream/develop' into develop

Author: vincentparrett

Source/Base/Collections/Spring.Collections.Dictionaries.pas

@@ -237,18 +237,15 @@       TInverse = class(TCollectionBase<TValueKeyPair>,
       end;
 
       TEnumerator = class(TRefCountedObject,
-        IEnumerator<TKeyValuePair>, IEnumerator<TKey>, IEnumerator<TValue>,
-        IEnumerator<TValueKeyPair>)
+        IEnumerator<TKeyValuePair>, IEnumerator<TKey>, IEnumerator<TValue>)
       private
         {$IFDEF AUTOREFCOUNT}[Unsafe]{$ENDIF}
         fSource: TBidiDictionary<TKey, TValue>;
         fItemIndex: Integer;
         fVersion: Integer;
         function GetCurrent: TKeyValuePair;
-        function GetCurrentInverse: TValueKeyPair;
         function GetCurrentKey: TKey;
         function GetCurrentValue: TValue;
-        function IEnumerator<TValueKeyPair>.GetCurrent = GetCurrentInverse;
         function IEnumerator<TKey>.GetCurrent = GetCurrentKey;
         function IEnumerator<TValue>.GetCurrent = GetCurrentValue;
       public
@@ -257,6 +254,11 @@       TEnumerator = class(TRefCountedObject,
         function MoveNext: Boolean;
       end;
 
+      TInverseEnumerator = class(TEnumerator, IEnumerator<TValueKeyPair>)
+      private
+        function GetCurrent: TValueKeyPair;
+      end;
+
       TKeyCollection = class(TEnumerableBase<TKey>,
         IEnumerable<TKey>, IReadOnlyCollection<TKey>)
       private
@@ -1946,7 +1948,7 @@ function TBidiDictionary<TKey, TValue>.TInverse.GetCount: Integer;
 
 function TBidiDictionary<TKey, TValue>.TInverse.GetEnumerator: IEnumerator<TValueKeyPair>;
 begin
-  Result := TEnumerator.Create(fSource);
+  Result := TInverseEnumerator.Create(fSource);
 end;
 
 function TBidiDictionary<TKey, TValue>.TInverse.GetInverse: IBidiDictionary<TKey, TValue>;
@@ -2170,12 +2172,6 @@ function TBidiDictionary<TKey, TValue>.TEnumerator.GetCurrent: TKeyValuePair;
   Result.Value := fSource.fItems[fItemIndex].Value;
 end;
 
-function TBidiDictionary<TKey, TValue>.TEnumerator.GetCurrentInverse: TValueKeyPair;
-begin
-  Result.Key := fSource.fItems[fItemIndex].Value;
-  Result.Value := fSource.fItems[fItemIndex].Key;
-end;
-
 function TBidiDictionary<TKey, TValue>.TEnumerator.GetCurrentKey: TKey;
 begin
   Result := fSource.fItems[fItemIndex].Key;
@@ -2194,6 +2190,17 @@ function TBidiDictionary<TKey, TValue>.TEnumerator.MoveNext: Boolean;
 {$ENDREGION}
 
 
+{$REGION 'TBidiDictionary<TKey, TValue>.TInverseEnumerator' }
+
+function TBidiDictionary<TKey, TValue>.TInverseEnumerator.GetCurrent: TValueKeyPair;
+begin
+  Result.Key := fSource.fItems[fItemIndex].Value;
+  Result.Value := fSource.fItems[fItemIndex].Key;
+end;
+
+{$ENDREGION}
+
+
 {$REGION 'TBidiDictionary<TKey, TValue>.TKeyCollection'}
 
 constructor TBidiDictionary<TKey, TValue>.TKeyCollection.Create(

Tests/Source/Base/Spring.Tests.Base.pas

@@ -4261,7 +4261,7 @@ procedure TSortTest.TestSort<T>(const genvalue: Func<T>);
   Generics.Collections.TArray.Sort<T>(data2, comparer);
   for i := 1 to High(data) do
   begin
-    Check(comparer.Compare(data[i-1], data[i-1]) <= 0);
+    Check(comparer.Compare(data[i-1], data[i]) <= 0);
     Check(comparer.Compare(data[i], data2[i]) = 0);
   end;
 end;

Tests/Source/Base/Spring.Tests.Collections.Dictionaries.pas

@@ -173,6 +173,8 @@   TTestBidiDictionaryBase = class(TTestDictionaryBase)
   TTestBidiDictionary = class(TTestBidiDictionaryBase)
   protected
     procedure SetUp; override;
+  published
+    procedure TestEnumerators;
   end;
 
   TTestBidiDictionaryInverse = class(TTestBidiDictionaryBase)
@@ -1360,6 +1362,33 @@ procedure TTestBidiDictionary.SetUp;
   SUTinverse := dict.Inverse;
 end;
 
+procedure TTestBidiDictionary.TestEnumerators;
+var
+  SUT: IBidiDictionary<string,string>;
+  i: Integer;
+  p: TPair<string,string>;
+begin
+  SUT := TCollections.CreateBidiDictionary<string,string>;
+  SUT['Key1'] := 'Val1';
+  SUT['Key2'] := 'Val2';
+  SUT['Key3'] := 'Val3';
+
+  i := 0;
+  for p in SUT do
+  begin
+    Inc(i);
+    CheckEquals('Key' + IntToStr(i), p.Key);
+    CheckEquals('Val' + IntToStr(i), p.Value);
+  end;
+  i := 0;
+  for p in SUT.Inverse do
+  begin
+    Inc(i);
+    CheckEquals('Val' + IntToStr(i), p.Key);
+    CheckEquals('Key' + IntToStr(i), p.Value);
+  end;
+end;
+
 {$ENDREGION}