Enlarge an xUnit collection to include all ModelMetadataProviders.Current readers

dougbu · dougbu · commit f09883601d38 · 2017-10-22T10:58:12.000-07:00
- #41 - have not seen similar `InvalidOperationException`s in other test classes - `DisplayExtensionsTest` and `EditorExtensionsTest` are already in this increasingly-poorly named collection - they temporarily change `ModelMetadataProviders.Current` to reference a `Mock<ModelMetadataProvider>` This is a **temporary** fix: should use `[CollectionDefinition(DisableParallelization = true)]` xUnit v2.3.0 - i.e. create an isolated collection containing just `DisplayExtensionsTest` and `EditorExtensionsTest`
diff --git a/test/System.Web.Mvc.Test/Html/Test/DefaultDisplayTemplatesTest.cs b/test/System.Web.Mvc.Test/Html/Test/DefaultDisplayTemplatesTest.cs
@@ -13,6 +13,7 @@
 
 namespace System.Web.Mvc.Html.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class DefaultDisplayTemplatesTest
     {
         // BooleanTemplate
diff --git a/test/System.Web.Mvc.Test/Test/AssociatedValidatorProviderTest.cs b/test/System.Web.Mvc.Test/Test/AssociatedValidatorProviderTest.cs
@@ -9,6 +9,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class AssociatedValidatorProviderTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/CompareAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/CompareAttributeAdapterTest.cs
@@ -9,6 +9,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class CompareAttributeAdapterTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/CompareAttributeTest.cs b/test/System.Web.Mvc.Test/Test/CompareAttributeTest.cs
@@ -8,6 +8,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class CompareAttributeTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/ControllerActionInvokerTest.cs b/test/System.Web.Mvc.Test/Test/ControllerActionInvokerTest.cs
@@ -18,6 +18,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class ControllerActionInvokerTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorProviderTest.cs b/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorProviderTest.cs
@@ -11,6 +11,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class DataAnnotationsModelValidatorProviderTest
     {
         // Validation attribute adapter registration
diff --git a/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorTest.cs b/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorTest.cs
@@ -10,6 +10,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class DataAnnotationsModelValidatorTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/DefaultModelBinderTest.cs b/test/System.Web.Mvc.Test/Test/DefaultModelBinderTest.cs
@@ -15,6 +15,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class DefaultModelBinderTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/MaxLengthAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/MaxLengthAttributeAdapterTest.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using Microsoft.TestCommon;
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class MaxLengthAttributeAdapterTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/MinLengthAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/MinLengthAttributeAdapterTest.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using Microsoft.TestCommon;
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class MinLengthAttributeAdapterTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/ModelBindingContextTest.cs b/test/System.Web.Mvc.Test/Test/ModelBindingContextTest.cs
@@ -7,6 +7,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class ModelBindingContextTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/ModelMetadataTest.cs b/test/System.Web.Mvc.Test/Test/ModelMetadataTest.cs
@@ -10,6 +10,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class ModelMetadataTest
     {
         // Guard clauses
@@ -826,7 +827,7 @@ public void FromLambdaExpressionSetsContainerTypeToDerivedMostType()
                     Assert.Equal(derivedModel.GetType(), type);
                     Assert.Equal("MyProperty", propertyName);
                 })
-                .Returns<Func<object>, Type, string>((accessor, type, propertyName) => 
+                .Returns<Func<object>, Type, string>((accessor, type, propertyName) =>
                 {
                     return new ModelMetadata(provider.Object, derivedModel.GetType(), accessor, type, propertyName);
                 })
diff --git a/test/System.Web.Mvc.Test/Test/ModelValidatorTest.cs b/test/System.Web.Mvc.Test/Test/ModelValidatorTest.cs
@@ -8,6 +8,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class ModelValidatorTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/RangeAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/RangeAttributeAdapterTest.cs
@@ -7,6 +7,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class RangeAttributeAdapterTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/RegularExpressionAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/RegularExpressionAttributeAdapterTest.cs
@@ -7,6 +7,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class RegularExpressionAttributeAdapterTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/RemoteAttributeTest.cs b/test/System.Web.Mvc.Test/Test/RemoteAttributeTest.cs
@@ -9,6 +9,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class RemoteAttributeTest
     {
         // Good route name, bad route name
@@ -261,7 +262,7 @@ public void ActionControllerAreaReference_WithUseRoot_RemoteFindsControllerInRoo
         [Fact]
         public void ActionController_InArea_RemoteFindsControllerInCurrentArea()
         {
-            // Arrange 
+            // Arrange
             ModelMetadata metadata = ModelMetadataProviders.Current.GetMetadataForProperty(modelAccessor: null,
                 containerType: typeof(string), propertyName: "Length");
             TestableRemoteAttribute attribute = new TestableRemoteAttribute("Action", "Controller");
diff --git a/test/System.Web.Mvc.Test/Test/RequiredAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/RequiredAttributeAdapterTest.cs
@@ -7,6 +7,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class RequiredAttributeAdapterTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/StringLengthAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/StringLengthAttributeAdapterTest.cs
@@ -7,6 +7,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class StringLengthAttributeAdapterTest
     {
         [Fact]
diff --git a/test/System.Web.Mvc.Test/Test/ValidatableObjectAdapterTest.cs b/test/System.Web.Mvc.Test/Test/ValidatableObjectAdapterTest.cs
@@ -9,6 +9,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class ValidatableObjectAdapterTest
     {
         // IValidatableObject support
diff --git a/test/System.Web.Mvc.Test/Test/ViewDataDictionaryTest.cs b/test/System.Web.Mvc.Test/Test/ViewDataDictionaryTest.cs
@@ -9,6 +9,7 @@
 
 namespace System.Web.Mvc.Test
 {
+    [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current
     public class ViewDataDictionaryTest
     {
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace System.Web.Mvc.Html.Test`
`15`	`15`	`{`
	`16`	`+ [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current`
`16`	`17`	`public class DefaultDisplayTemplatesTest`
`17`	`18`	`{`
`18`	`19`	`// BooleanTemplate`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace System.Web.Mvc.Test`
`11`	`11`	`{`
	`12`	`+ [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current`
`12`	`13`	`public class AssociatedValidatorProviderTest`
`13`	`14`	`{`
`14`	`15`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace System.Web.Mvc.Test`
`10`	`10`	`{`
	`11`	`+ [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current`
`11`	`12`	`public class CompareAttributeTest`
`12`	`13`	`{`
`13`	`14`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`namespace System.Web.Mvc.Test`
`20`	`20`	`{`
	`21`	`+ [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current`
`21`	`22`	`public class ControllerActionInvokerTest`
`22`	`23`	`{`
`23`	`24`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace System.Web.Mvc.Test`
`13`	`13`	`{`
	`14`	`+ [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current`
`14`	`15`	`public class DataAnnotationsModelValidatorProviderTest`
`15`	`16`	`{`
`16`	`17`	`// Validation attribute adapter registration`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace System.Web.Mvc.Test`
`12`	`12`	`{`
	`13`	`+ [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current`
`13`	`14`	`public class DataAnnotationsModelValidatorTest`
`14`	`15`	`{`
`15`	`16`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`namespace System.Web.Mvc.Test`
`17`	`17`	`{`
	`18`	`+ [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current`
`18`	`19`	`public class DefaultModelBinderTest`
`19`	`20`	`{`
`20`	`21`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System.ComponentModel.DataAnnotations;`
`5`		`-using System.Linq;`
`6`	`5`	`using Microsoft.TestCommon;`
`7`	`6`
`8`	`7`	`namespace System.Web.Mvc.Test`
`9`	`8`	`{`
	`9`	`+ [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current`
`10`	`10`	`public class MaxLengthAttributeAdapterTest`
`11`	`11`	`{`
`12`	`12`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace System.Web.Mvc.Test`
`9`	`9`	`{`
	`10`	`+ [Xunit.Collection("Uses ScopeStorage or ViewEngines.Engines")] // Uses ModelMetadataProviders.Current`
`10`	`11`	`public class ModelBindingContextTest`
`11`	`12`	`{`
`12`	`13`	`[Fact]`