#2931: Tighten up types to prevent accidentically calling AddOrGet wi…

…th a ConcurrentDictionary (v2)
xunit · May 17, 2024 · be6db6f · be6db6f
1 parent f466d81
commit be6db6f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/common/DictionaryExtensions.cs b/src/common/DictionaryExtensions.cs
@@ -4,18 +4,18 @@
 
 static class DictionaryExtensions
 {
-    public static void Add<TKey, TValue>(this IDictionary<TKey, List<TValue>> dictionary, TKey key, TValue value)
+    public static void Add<TKey, TValue>(this Dictionary<TKey, List<TValue>> dictionary, TKey key, TValue value)
     {
         dictionary.AddOrGet(key).Add(value);
     }
 
-    public static TValue AddOrGet<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)
+    public static TValue AddOrGet<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key)
         where TValue : new()
     {
         return dictionary.AddOrGet(key, () => new TValue());
     }
 
-    public static TValue AddOrGet<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TValue> newValue)
+    public static TValue AddOrGet<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, Func<TValue> newValue)
     {
         TValue result;
 
@@ -28,7 +28,11 @@ static class DictionaryExtensions
         return result;
     }
 
+#if NET35
     public static bool Contains<TKey, TValue>(this IDictionary<TKey, List<TValue>> dictionary, TKey key, TValue value, IEqualityComparer<TValue> valueComparer)
+#else
+    public static bool Contains<TKey, TValue>(this IReadOnlyDictionary<TKey, List<TValue>> dictionary, TKey key, TValue value, IEqualityComparer<TValue> valueComparer)
+#endif
     {
         List<TValue> values;
 

diff --git a/src/xunit.execution/Sdk/ExtensibilityPointFactory.cs b/src/xunit.execution/Sdk/ExtensibilityPointFactory.cs
@@ -73,7 +73,7 @@ public static void Dispose()
         /// <returns>The instance of the type.</returns>
         public static TInterface Get<TInterface>(IMessageSink diagnosticMessageSink, Type type, object[] ctorArgs = null)
         {
-            return (TInterface)instances.AddOrGet(Tuple.Create(type, diagnosticMessageSink), () => CreateInstance(diagnosticMessageSink, type, ctorArgs));
+            return (TInterface)instances.GetOrAdd(Tuple.Create(type, diagnosticMessageSink), _ => CreateInstance(diagnosticMessageSink, type, ctorArgs));
         }
 
         /// <summary>

diff --git a/src/xunit.execution/Sdk/Frameworks/XunitTestCase.cs b/src/xunit.execution/Sdk/Frameworks/XunitTestCase.cs
@@ -149,10 +149,10 @@ protected override void Initialize()
         }
 
         static IEnumerable<IAttributeInfo> GetCachedTraitAttributes(IAssemblyInfo assembly)
-            => assemblyTraitAttributeCache.AddOrGet(assembly.Name, () => assembly.GetCustomAttributes(typeof(ITraitAttribute)));
+            => assemblyTraitAttributeCache.GetOrAdd(assembly.Name, _ => assembly.GetCustomAttributes(typeof(ITraitAttribute)));
 
         static IEnumerable<IAttributeInfo> GetCachedTraitAttributes(ITypeInfo type)
-            => typeTraitAttributeCache.AddOrGet(type.Name, () => type.GetCustomAttributes(typeof(ITraitAttribute)));
+            => typeTraitAttributeCache.GetOrAdd(type.Name, _ => type.GetCustomAttributes(typeof(ITraitAttribute)));
 
         static IEnumerable<IAttributeInfo> GetTraitAttributesData(ITestMethod testMethod)
         {