#2931: Tighten up types to prevent accidentically calling AddOrGet with a ConcurrentDictionary (v2)

bradwilson · bradwilson · commit be6db6f41069 · 2024-05-17T15:37:02.000-07:00
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 @@ public static TValue AddOrGet<TKey, TValue>(this IDictionary<TKey, TValue> dicti
         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)
         {

Original file line number	Diff line number	Diff line change
`@@ -4,18 +4,18 @@`
`4`	`4`
`5`	`5`	`static class DictionaryExtensions`
`6`	`6`	`{`
`7`		`- public static void Add<TKey, TValue>(this IDictionary<TKey, List<TValue>> dictionary, TKey key, TValue value)`
	`7`	`+ public static void Add<TKey, TValue>(this Dictionary<TKey, List<TValue>> dictionary, TKey key, TValue value)`
`8`	`8`	`{`
`9`	`9`	`dictionary.AddOrGet(key).Add(value);`
`10`	`10`	`}`
`11`	`11`
`12`		`- public static TValue AddOrGet<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)`
	`12`	`+ public static TValue AddOrGet<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key)`
`13`	`13`	`where TValue : new()`
`14`	`14`	`{`
`15`	`15`	`return dictionary.AddOrGet(key, () => new TValue());`
`16`	`16`	`}`
`17`	`17`
`18`		`- public static TValue AddOrGet<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TValue> newValue)`
	`18`	`+ public static TValue AddOrGet<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, Func<TValue> newValue)`
`19`	`19`	`{`
`20`	`20`	`TValue result;`
`21`	`21`
`@@ -28,7 +28,11 @@ public static TValue AddOrGet<TKey, TValue>(this IDictionary<TKey, TValue> dicti`
`28`	`28`	`return result;`
`29`	`29`	`}`
`30`	`30`
	`31`	`+#if NET35`
`31`	`32`	`public static bool Contains<TKey, TValue>(this IDictionary<TKey, List<TValue>> dictionary, TKey key, TValue value, IEqualityComparer<TValue> valueComparer)`
	`33`	`+#else`
	`34`	`+ public static bool Contains<TKey, TValue>(this IReadOnlyDictionary<TKey, List<TValue>> dictionary, TKey key, TValue value, IEqualityComparer<TValue> valueComparer)`
	`35`	`+#endif`
`32`	`36`	`{`
`33`	`37`	`List<TValue> values;`
`34`	`38`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public static void Dispose()`
`73`	`73`	`/// <returns>The instance of the type.</returns>`
`74`	`74`	`public static TInterface Get<TInterface>(IMessageSink diagnosticMessageSink, Type type, object[] ctorArgs = null)`
`75`	`75`	`{`
`76`		`- return (TInterface)instances.AddOrGet(Tuple.Create(type, diagnosticMessageSink), () => CreateInstance(diagnosticMessageSink, type, ctorArgs));`
	`76`	`+ return (TInterface)instances.GetOrAdd(Tuple.Create(type, diagnosticMessageSink), _ => CreateInstance(diagnosticMessageSink, type, ctorArgs));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,10 @@ protected override void Initialize()`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`static IEnumerable<IAttributeInfo> GetCachedTraitAttributes(IAssemblyInfo assembly)`
`152`		`- => assemblyTraitAttributeCache.AddOrGet(assembly.Name, () => assembly.GetCustomAttributes(typeof(ITraitAttribute)));`
	`152`	`+ => assemblyTraitAttributeCache.GetOrAdd(assembly.Name, _ => assembly.GetCustomAttributes(typeof(ITraitAttribute)));`
`153`	`153`
`154`	`154`	`static IEnumerable<IAttributeInfo> GetCachedTraitAttributes(ITypeInfo type)`
`155`		`- => typeTraitAttributeCache.AddOrGet(type.Name, () => type.GetCustomAttributes(typeof(ITraitAttribute)));`
	`155`	`+ => typeTraitAttributeCache.GetOrAdd(type.Name, _ => type.GetCustomAttributes(typeof(ITraitAttribute)));`
`156`	`156`
`157`	`157`	`static IEnumerable<IAttributeInfo> GetTraitAttributesData(ITestMethod testMethod)`
`158`	`158`	`{`