Added test_public_inherited_overloaded_indexer

tminka · tminka · commit bdebad74cf66 · 2021-01-21T13:33:52.000Z
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -837,9 +837,9 @@ internal virtual IntPtr Invoke(IntPtr inst, IntPtr args, IntPtr kw, MethodBase i
                     {
                         value.Append($" for {methodinfo[0].Name}");
                     }
-                    else if (list.Count > 0 && list[0].Name != null)
+                    else if (list.Count > 0 && list[0].Valid)
                     {
-                        value.Append($" for {list[0].Name}");
+                        value.Append($" for {list[0].Value.Name}");
                     }
 
                     value.Append(": ");
diff --git a/src/testing/indexertest.cs b/src/testing/indexertest.cs
@@ -427,7 +427,8 @@ public interface IIndexer
 
     public interface IInheritedIndexer : IIndexer { }
 
-    public class InterfaceInheritedIndexerTest :IndexerBase,  IInheritedIndexer  {
+    public class InterfaceInheritedIndexerTest : IndexerBase,  IInheritedIndexer
+    {
         private System.Collections.Generic.IDictionary<int, string> d = new System.Collections.Generic.Dictionary<int, string>();
 
         public string this[int index]
@@ -436,4 +437,13 @@ public string this[int index]
             set { t[index] = value; }
         }
     }
+
+    public class PublicInheritedOverloadedIndexer : PublicIndexerTest
+    {
+        public string this[string index]
+        {
+            get { return GetValue(index); }
+            set { t[index] = value; }
+        }
+    }
 }
diff --git a/src/tests/test_indexer.py b/src/tests/test_indexer.py
@@ -646,3 +646,21 @@ def test_inherited_indexer_interface():
     ifc = IInheritedIndexer(impl)
     ifc[0] = "zero"
     assert ifc[0] == "zero"
+
+def test_public_inherited_overloaded_indexer():
+    """Test public indexers."""
+    ob = Test.PublicInheritedOverloadedIndexer()
+
+    ob[0] = "zero"
+    assert ob[0] == "zero"
+
+    ob[1] = "one"
+    assert ob[1] == "one"
+
+    assert ob[10] is None
+
+    ob["spam"] = "spam"
+    assert ob["spam"] == "spam"
+
+    with pytest.raises(TypeError):
+        ob[[]]

Original file line number	Diff line number	Diff line change
`@@ -837,9 +837,9 @@ internal virtual IntPtr Invoke(IntPtr inst, IntPtr args, IntPtr kw, MethodBase i`
`837`	`837`	`{`
`838`	`838`	`value.Append($" for {methodinfo[0].Name}");`
`839`	`839`	`}`
`840`		`- else if (list.Count > 0 && list[0].Name != null)`
	`840`	`+ else if (list.Count > 0 && list[0].Valid)`
`841`	`841`	`{`
`842`		`- value.Append($" for {list[0].Name}");`
	`842`	`+ value.Append($" for {list[0].Value.Name}");`
`843`	`843`	`}`
`844`	`844`
`845`	`845`	`value.Append(": ");`