From d1ad0539bd405d72ea5b9fbaa23a9aa30c7a44dd Mon Sep 17 00:00:00 2001 From: bradwilson Date: Wed, 22 Aug 2012 11:38:00 -0700 Subject: [PATCH] Clean up xUnit.net usage, standardizing around Microsoft.TestCommon --- test/Common/DictionaryExtensionsTest.cs | 3 - test/Common/ErrorTest.cs | 3 +- test/Common/HttpMethodHelperTest.cs | 3 - test/Common/PrefixContainerTest.cs | 4 +- test/Common/TaskHelpersExtensionsTest.cs | 2 - test/Common/TaskHelpersTest.cs | 2 - test/Common/UriQueryUtilityTest.cs | 3 - .../{AssertEx.cs => Assert.cs} | 6 +- test/Microsoft.TestCommon/CultureReplacer.cs | 2 +- test/Microsoft.TestCommon/DataAttribute.cs | 11 ++ .../EnumHelperTestBase.cs | 2 +- .../ExceptionAssertions.cs | 4 +- .../{WsrFactAttribute.cs => FactAttribute.cs} | 5 +- test/Microsoft.TestCommon/ForceGCAttribute.cs | 3 +- .../InlineDataAttribute.cs | 15 ++ test/Microsoft.TestCommon/MemberHelper.cs | 2 +- .../Microsoft.TestCommon.csproj | 10 +- .../Microsoft/TestCommon/GenericTypeAssert.cs | 1 - .../Microsoft/TestCommon/HttpAssert.cs | 1 - .../Microsoft/TestCommon/MediaTypeAssert.cs | 1 - .../Microsoft/TestCommon/TaskAssert.cs | 1 - .../TestCommon/TestDataSetAttribute.cs | 1 - .../Microsoft/TestCommon/TypeAssert.cs | 1 - .../Microsoft/TestCommon/XmlAssert.cs | 1 - .../PartialTrustRunner.cs | 170 +++++++++--------- test/Microsoft.TestCommon/Platform.cs | 12 +- .../PreAppStartTestHelper.cs | 2 +- .../PreserveSyncContextAttribute.cs | 3 +- .../PropertyDataAttribute.cs | 15 ++ test/Microsoft.TestCommon/ReflectionAssert.cs | 1 - .../ReplaceCultureAttribute.cs | 3 +- .../RestoreThreadPrincipalAttribute.cs | 3 +- test/Microsoft.TestCommon/TaskExtensions.cs | 2 +- test/Microsoft.TestCommon/TestFile.cs | 2 +- test/Microsoft.TestCommon/TestHelper.cs | 2 +- ...rTheoryAttribute.cs => TheoryAttribute.cs} | 5 +- test/Microsoft.TestCommon/TraitAttribute.cs | 15 ++ .../AnalyticsTest.cs | 2 +- test/Microsoft.Web.Helpers.Test/BingTest.cs | 3 +- .../FacebookTest.cs | 2 - .../FileUploadTest.cs | 3 +- .../GamerCardTest.cs | 3 +- .../GravatarTest.cs | 3 +- .../LinkShareTest.cs | 3 +- test/Microsoft.Web.Helpers.Test/MapsTest.cs | 2 +- .../PreAppStartCodeTest.cs | 2 +- .../ReCaptchaTest.cs | 3 +- test/Microsoft.Web.Helpers.Test/ThemesTest.cs | 3 +- .../Microsoft.Web.Helpers.Test/TwitterTest.cs | 3 +- .../UrlBuilderTest.cs | 2 +- test/Microsoft.Web.Helpers.Test/VideoTest.cs | 3 +- .../UpshotExtensionsTests.cs | 3 +- .../ChangeSetTests.cs | 3 +- .../DataControllerDescriptionTest.cs | 3 +- .../DataControllerSubmitTests.cs | 3 +- .../MetadataExtensionsTests.cs | 2 +- .../Controls/Test/DropDownListTest.cs | 2 +- .../Controls/Test/MvcControlTest.cs | 2 +- .../Test/ArrayModelBinderProviderTest.cs | 2 +- .../ModelBinding/Test/ArrayModelBinderTest.cs | 2 +- .../Test/BinaryDataModelBinderProviderTest.cs | 2 +- .../Test/BindingBehaviorAttributeTest.cs | 2 +- .../Test/CollectionModelBinderProviderTest.cs | 2 +- .../Test/CollectionModelBinderTest.cs | 2 +- .../Test/CollectionModelBinderUtilTest.cs | 2 +- .../ComplexModelDtoModelBinderProviderTest.cs | 2 +- .../Test/ComplexModelDtoModelBinderTest.cs | 2 +- .../Test/ComplexModelDtoResultTest.cs | 3 +- .../ModelBinding/Test/ComplexModelDtoTest.cs | 3 +- .../Test/DictionaryModelBinderProviderTest.cs | 2 +- .../Test/DictionaryModelBinderTest.cs | 2 +- .../Test/ExtensibleModelBinderAdapterTest.cs | 3 +- .../Test/ExtensibleModelBindingContextTest.cs | 3 +- .../Test/GenericModelBinderProviderTest.cs | 3 +- .../KeyValuePairModelBinderProviderTest.cs | 2 +- .../Test/KeyValuePairModelBinderTest.cs | 2 +- .../Test/KeyValuePairModelBinderUtilTest.cs | 2 +- .../Test/ModelBinderConfigTest.cs | 2 +- .../Test/ModelBinderProviderCollectionTest.cs | 3 +- .../Test/ModelBinderProvidersTest.cs | 2 +- .../ModelBinding/Test/ModelBinderUtilTest.cs | 3 +- .../Test/ModelValidationNodeTest.cs | 3 +- .../MutableObjectModelBinderProviderTest.cs | 2 +- .../Test/MutableObjectModelBinderTest.cs | 3 +- .../Test/SimpleModelBinderProviderTest.cs | 3 +- .../TypeConverterModelBinderProviderTest.cs | 2 +- .../Test/TypeConverterModelBinderTest.cs | 2 +- .../Test/TypeMatchModelBinderProviderTest.cs | 2 +- .../Test/TypeMatchModelBinderTest.cs | 2 +- .../Test/AjaxOnlyAttributeTest.cs | 3 +- .../Test/AreaHelpersTest.cs | 2 +- .../Test/AsyncManagerExtensionsTest.cs | 3 +- .../Microsoft.Web.Mvc.Test/Test/ButtonTest.cs | 3 +- .../Test/ContentTypeAttributeTest.cs | 3 +- .../Test/ControllerExtensionsTest.cs | 3 +- .../Test/CookieTempDataProviderTest.cs | 3 +- .../Test/CookieValueProviderFactoryTest.cs | 2 +- .../Test/CopyAsyncParametersAttributeTest.cs | 3 +- .../Test/CreditCardAttributeTest.cs | 2 +- .../Test/CssExtensionsTests.cs | 3 +- .../Test/DeserializeAttributeTest.cs | 3 +- .../Test/DynamicReflectionObjectTest.cs | 3 +- .../Test/DynamicViewDataDictionaryTest.cs | 3 +- .../Test/DynamicViewPageTest.cs | 2 +- .../Test/ElementalValueProviderTest.cs | 2 +- .../Test/EmailAddressAttribueTest.cs | 2 +- .../Test/ExpressionHelperTest.cs | 3 +- .../Test/FileExtensionsAttributeTest.cs | 2 +- .../Test/FormExtensionsTest.cs | 2 +- .../Test/ImageExtensionsTest.cs | 3 +- .../Test/MailToExtensionsTest.cs | 3 +- .../Test/ModelCopierTest.cs | 2 +- .../Test/MvcSerializerTest.cs | 3 +- .../Test/RadioExtensionsTest.cs | 2 +- .../Test/ReaderWriterCacheTest.cs | 2 +- .../Test/RenderActionTest.cs | 3 +- .../Test/ScriptExtensionsTest.cs | 3 +- .../Test/SerializationExtensionsTest.cs | 3 +- ...ServerVariablesValueProviderFactoryTest.cs | 2 +- .../Test/SessionValueProviderFactoryTest.cs | 2 +- .../Test/SkipBindingAttributeTest.cs | 2 +- .../Test/SubmitButtonExtensionsTest.cs | 2 +- .../Test/SubmitImageExtensionsTest.cs | 3 +- .../Test/TempDataValueProviderFactoryTest.cs | 2 +- .../Test/TypeHelpersTest.cs | 2 +- .../Test/UrlAttributeTest.cs | 2 +- .../Test/ValueProviderUtilTest.cs | 2 +- .../OAuthWebSecurityTest.cs | 9 +- .../PreAppStartCodeTest.cs | 2 +- .../BufferedMediaTypeFormatterTests.cs | 3 - .../ContentNegotiationResultTest.cs | 3 +- ...DataContractJsonMediaTypeFormatterTests.cs | 3 - .../DefaultContentNegotiatorTests.cs | 3 - .../Formatting/FormDataCollectionTests.cs | 4 +- .../FormUrlEncodedFromContentTests.cs | 3 - .../FormUrlEncodedFromUriQueryTests.cs | 2 - .../Formatting/FormUrlEncodedJsonTests.cs | 2 - .../FormUrlEncodedMediaTypeFormatterTests.cs | 3 - .../Formatting/JsonMediaTypeFormatterTests.cs | 3 - .../Formatting/JsonNetSerializationTest.cs | 2 - .../Formatting/JsonNetValidationTest.cs | 2 - .../Formatting/MediaTypeConstantsTests.cs | 3 +- .../MediaTypeFormatterCollectionTests.cs | 3 - .../MediaTypeFormatterExtensionsTests.cs | 2 - .../Formatting/MediaTypeFormatterMatchTest.cs | 3 +- .../Formatting/MediaTypeFormatterTestBase.cs | 3 - .../Formatting/MediaTypeFormatterTests.cs | 3 - .../MediaTypeHeaderValueExtensionsTests.cs | 2 - .../Formatting/MediaTypeMappingTests.cs | 3 +- ...TypeWithQualityHeaderValueComparerTests.cs | 3 - .../ParsedMediaTypeHeaderValueTests.cs | 2 - .../Parsers/FormUrlEncodedParserTests.cs | 3 - .../Parsers/HttpRequestHeaderParserTests.cs | 3 - .../Parsers/HttpRequestLineParserTests.cs | 3 - .../Parsers/HttpResponseHeaderParserTests.cs | 3 - .../Parsers/HttpStatusLineParserTests.cs | 3 - .../InternetMessageFormatHeaderParserTests.cs | 2 - .../Parsers/MimeMultipartParserTests.cs | 3 - .../Formatting/QueryStringMappingTests.cs | 3 - .../Formatting/RequestHeaderMappingTests.cs | 3 - .../Formatting/SerializerConsistencyTests.cs | 2 +- .../Formatting/StringComparisonHelperTest.cs | 2 +- ...ringWithQualityHeaderValueComparerTests.cs | 3 - .../XmlHttpRequestHeaderMappingTest.cs | 3 - .../Formatting/XmlMediaTypeFormatterTests.cs | 3 - .../XmlSerializerMediaTypeFormatterTests.cs | 3 - .../FormattingUtilitiesTests.cs | 3 - .../Handlers/HttpProgressEventArgsTest.cs | 3 +- .../Handlers/ProgressContentTest.cs | 3 +- .../Handlers/ProgressMessageHandlerTest.cs | 3 +- .../Handlers/ProgressStreamTest.cs | 2 +- .../Handlers/ProgressWriteAsyncResultTest.cs | 4 +- .../Headers/CookieHeaderValueTest.cs | 3 - .../Headers/CookieStateTest.cs | 3 - .../HttpClientExtensionsTest.cs | 3 +- .../HttpClientFactoryTest.cs | 3 - .../HttpContentExtensionsTest.cs | 3 +- .../HttpContentFormDataExtensionsTest.cs | 3 - .../HttpContentMessageExtensionsTests.cs | 3 - .../HttpContentMultipartExtensionsTests.cs | 4 - .../HttpHeaderExtensionsTest.cs | 3 +- .../HttpMessageContentTests.cs | 2 - .../HttpRequestHeadersExtensionsTest.cs | 4 - .../HttpRequestMessageCommonExtensionsTest.cs | 2 - .../HttpResponseHeadersExtensionsTest.cs | 5 +- .../HttpUnsortedRequestTest.cs | 3 +- .../HttpUnsortedResponseTest.cs | 3 +- .../Internal/AsyncResultTest.cs | 5 +- .../Internal/DelegatingStreamTest.cs | 3 +- .../Internal/HttpValueCollectionTest.cs | 3 - .../NonClosingDelegatingStreamTest.cs | 3 +- .../ReadOnlyStreamWithEncodingPreambleTest.cs | 2 - .../MimeBodyPartTest.cs | 3 - .../MultipartFileDataTest.cs | 3 +- .../MultipartFileStreamProviderTests.cs | 3 - .../MultipartFormDataStreamProviderTests.cs | 3 +- .../MultipartMemoryStreamProviderTests.cs | 3 +- .../MultipartRelatedStreamProviderTests.cs | 3 - .../MultipartStreamProviderTestBase.cs | 3 +- .../ObjectContentOfTTests.cs | 3 +- .../ObjectContentTests.cs | 3 - .../PushStreamContentTest.cs | 3 +- .../UriExtensionsTests.cs | 3 - test/System.Web.Helpers.Test/ChartTest.cs | 3 +- .../ConversionUtilTest.cs | 2 +- test/System.Web.Helpers.Test/CryptoTest.cs | 3 +- .../DynamicHelperTest.cs | 2 +- .../HelperResultTest.cs | 3 +- test/System.Web.Helpers.Test/JsonTest.cs | 3 +- .../System.Web.Helpers.Test/ObjectInfoTest.cs | 3 +- .../PreComputedGridDataSourceTest.cs | 2 +- .../System.Web.Helpers.Test/ServerInfoTest.cs | 2 +- test/System.Web.Helpers.Test/WebCacheTest.cs | 3 +- .../WebGridDataSourceTest.cs | 2 +- test/System.Web.Helpers.Test/WebGridTest.cs | 2 - test/System.Web.Helpers.Test/WebImageTest.cs | 3 +- test/System.Web.Helpers.Test/WebMailTest.cs | 3 +- test/System.Web.Helpers.Test/XhtmlAssert.cs | 2 +- .../ApiExplorer/ApiExplorerSettingsTest.cs | 2 +- .../ApiExplorer/DocumentationTest.cs | 2 +- .../ApiExplorer/FormattersTest.cs | 2 +- .../ApiExplorer/ParameterSourceTest.cs | 2 +- .../ApiExplorer/RouteConstraintsTest.cs | 2 +- .../ApiExplorer/RoutesTest.cs | 3 +- .../ContentNegotiation/AcceptHeaderTests.cs | 3 +- .../CustomFormatterTests.cs | 2 +- .../DefaultContentNegotiatorTests.cs | 2 +- .../HttpResponseReturnTests.cs | 3 +- .../Controllers/ActionAttributesTest.cs | 3 +- .../Controllers/ActionReachabilityTest.cs | 3 +- .../ApiControllerActionSelectorTest.cs | 4 +- .../ControllerConfigurationTest.cs | 3 +- .../ExceptionHandlingTest.cs | 4 +- .../HttpResponseExceptionTest.cs | 3 +- .../IncludeErrorDetailTest.cs | 2 - .../ModelBinding/BodyBindingTests.cs | 3 +- .../ModelBinding/CustomBindingTests.cs | 2 +- .../DefaultActionValueBinderTest.cs | 1 - .../ModelBinding/HttpContentBindingTests.cs | 3 +- .../ModelBinding/ModelBindingController.cs | 2 +- .../ModelBinding/QueryStringBindingTests.cs | 3 +- .../ModelBinding/RouteBindingTests.cs | 2 +- .../PartialTrust/BasicScenarioTest.cs | 4 +- .../Tracing/TracingTest.cs | 2 - .../Util/ApiExplorerHelper.cs | 2 +- .../BaselineResource.Designer.cs | 8 +- .../HttpConfigurationExtensionTests.cs | 2 +- .../OData/Builder/ComplexTypeTest.cs | 3 +- .../Conventions/ConventionsHelpersTests.cs | 2 - .../Conventions/EntityKeyConventionTests.cs | 2 +- .../ODataConventionModelBuilderTests.cs | 2 +- .../Builder/EntitySetLinkConfigurationTest.cs | 2 +- .../OData/Builder/EntitySetTest.cs | 2 +- .../OData/Builder/EntityTypeTest.cs | 2 +- .../OData/Builder/MetadataTest.cs | 2 +- .../OData/Builder/ODataModelBuilderTest.cs | 2 +- .../OData/Builder/PrimitiveTypeTest.cs | 2 +- .../Builder/ProgrammableBuilderApiTest.cs | 2 +- .../Builder/PropertySelectorVisitorTest.cs | 2 +- .../OData/Builder/RoutingTest.cs | 2 +- .../OData/DeltaTest.cs | 3 +- .../DefaultODataDeserializerProviderTests.cs | 4 +- .../ODataComplexTypeDeserializerTests.cs | 3 +- .../ODataEntityDeserializerTests.cs | 2 +- ...ataEntityReferenceLinkDeserializerTests.cs | 2 +- .../Formatter/ODataFormatterConstantsTest.cs | 3 +- .../OData/Formatter/ODataFormatterTests.cs | 2 +- .../Formatter/ODataMediaTypeFormatterTests.cs | 6 - .../OData/Formatter/ODataTestUtil.cs | 2 +- .../Formatter/Serialization/CollectionTest.cs | 4 +- .../Serialization/ComplexTypeTest.cs | 4 +- .../DefaultODataSerializerProviderTests.cs | 3 - .../Formatter/Serialization/EntityTypeTest.cs | 3 - .../Serialization/EnumHelperTestBase.cs | 2 +- .../OData/Formatter/Serialization/FeedTest.cs | 3 - .../ODataCollectionSerializerTests.cs | 3 +- .../ODataComplexTypeSerializerTests.cs | 2 +- .../ODataEntityTypeSerializerTests.cs | 3 +- .../Serialization/ODataFeedSerializerTests.cs | 2 +- .../ODataPayloadKindHelperTests.cs | 2 +- .../ODataPrimitiveSerializerTests.cs | 3 - .../Serialization/ODataUriHelperTest.cs | 3 +- .../Serialization/PrimitiveTypesTest.cs | 3 - .../OData/ODataMetaDataControllerTests.cs | 2 +- .../Query/Expressions/FilterBinderTests.cs | 4 +- .../OData/Query/FilterQueryOptionTest.cs | 3 +- .../HttpActionDescriptorExtensionTests.cs | 3 +- .../OData/Query/ODataQueryContextTests.cs | 13 +- .../OData/Query/ODataQueryOptionTest.cs | 3 - ...DataQueryParameterBindingAttributeTests.cs | 2 - .../OData/Query/OrderByQueryOptionTest.cs | 3 +- .../OData/Query/QueryCompositionTests.cs | 2 - .../OData/Query/SkipQueryOptionTests.cs | 3 +- .../OData/Query/TopQueryOptionTests.cs | 3 +- .../OData/Query/UriParserTest.cs | 2 +- .../QueryableAttributeTests.cs | 7 +- .../System.Web.Http.OData.Test.csproj | 2 +- .../Authentication/BasicOverHttpTest.cs | 2 +- .../Authentication/CustomMessageHandler.cs | 1 - .../HttpBindingSecurityModeHelperTest.cs | 2 +- .../DeeplyNestedTypeTests.cs | 3 +- .../HttpSelfHostConfigurationTest.cs | 3 - .../HttpSelfHostResponseTest.cs | 2 +- .../HttpSelfHostServerTest.cs | 3 +- .../MaxHttpCollectionKeyTests.cs | 3 +- .../HostNameComparisonModeHelperTest.cs | 2 +- .../ServiceModel/TransferModeHelperTest.cs | 2 +- .../AuthorizeAttributeTest.cs | 3 - .../ApiControllerActionInvokerTest.cs | 3 +- .../ApiControllerActionSelectorTest.cs | 3 +- .../Controllers/ApiControllerTest.cs | 2 - .../Controllers/HttpActionContextTest.cs | 3 +- .../Controllers/HttpActionDescriptorTest.cs | 4 +- .../Controllers/HttpConfigurationTest.cs | 6 +- .../Controllers/HttpControllerContextTest.cs | 3 +- .../HttpControllerDescriptorTest.cs | 3 +- .../Controllers/HttpParameterBindingTest.cs | 3 +- .../HttpParameterDescriptorTest.cs | 3 +- .../ParameterBindingExtensionsTest.cs | 3 +- .../ReflectedHttpActionDescriptorTest.cs | 4 +- .../ReflectedHttpParameterDescriptorTest.cs | 3 +- .../ResponseMessageResultConverterTest.cs | 3 +- .../Controllers/ValueResultConverterTest.cs | 3 +- .../Controllers/VoidResultConverterTest.cs | 3 +- .../DefaultAssembliesResolverTest.cs | 3 +- .../DefaultHttpControllerActivatorTest.cs | 3 +- .../DefaultHttpControllerSelectorTest.cs | 4 +- .../DefaultHttpControllerTypeResolverTest.cs | 3 - .../HttpControllerDispatcherTest.cs | 3 +- .../Dispatcher/HttpErrorTest.cs | 3 +- .../Dispatcher/HttpRoutingDispatcherTest.cs | 3 +- .../ActionDescriptorFilterProviderTest.cs | 3 +- .../Filters/ActionFilterAttributeTest.cs | 3 +- .../AuthorizationFilterAttributeTest.cs | 3 +- .../ConfigurationFilterProviderTest.cs | 3 +- .../Filters/ExceptionFilterAttributeTest.cs | 3 +- .../Filters/FilterAttributeTest.cs | 3 +- .../Filters/FilterInfoComparerTest.cs | 2 - .../Filters/FilterInfoTest.cs | 3 +- .../Filters/HttpActionExecutedContextTest.cs | 3 +- .../Filters/HttpFilterCollectionTest.cs | 3 +- .../Hosting/HttpRouteTest.cs | 2 - .../HttpRequestMessageExtensionsTest.cs | 3 +- .../HttpResponseExceptionTest.cs | 3 +- .../HttpResponseMessageExtensionsTest.cs | 4 +- .../HttpRouteCollectionExtensionsTest.cs | 2 - test/System.Web.Http.Test/HttpServerTest.cs | 2 - .../Internal/CollectionModelBinderUtilTest.cs | 3 +- .../Internal/TypeActivatorTest.cs | 3 - .../Metadata/ModelMetadataTest.cs | 3 +- .../AssociatedMetadataProviderTest.cs | 4 +- ...ataAnnotationsModelMetadataProviderTest.cs | 4 +- .../Binders/ArrayModelBinderProviderTest.cs | 2 +- .../Binders/ArrayModelBinderTest.cs | 2 +- .../CollectionModelBinderProviderTest.cs | 2 +- .../Binders/CollectionModelBinderTest.cs | 2 +- .../ComplexModelDtoModelBinderProviderTest.cs | 2 +- .../Binders/ComplexModelDtoModelBinderTest.cs | 2 +- .../Binders/ComplexModelDtoResultTest.cs | 3 +- .../Binders/ComplexModelDtoTest.cs | 3 +- .../DictionaryModelBinderProviderTest.cs | 2 +- .../Binders/DictionaryModelBinderTest.cs | 2 +- .../KeyValuePairModelBinderProviderTest.cs | 2 +- .../Binders/KeyValuePairModelBinderTest.cs | 2 +- .../KeyValuePairModelBinderUtilTest.cs | 2 +- .../MutableObjectModelBinderProviderTest.cs | 2 +- .../Binders/MutableObjectModelBinderTest.cs | 3 +- .../Binders/SimpleModelBinderProviderTest.cs | 3 +- .../TypeConverterModelBinderProviderTest.cs | 2 +- .../Binders/TypeConverterModelBinderTest.cs | 2 +- .../TypeMatchModelBinderProviderTest.cs | 2 +- .../Binders/TypeMatchModelBinderTest.cs | 2 +- .../ModelBinding/CompositeModelBinderTest.cs | 2 +- .../DefaultActionValueBinderTest.cs | 3 +- .../FormDataCollectionExtensionsTest.cs | 4 +- .../HttpBindingBehaviorAttributeTest.cs | 2 +- .../HttpParameterBindingExtensionsTest.cs | 3 +- .../ModelBinding/ModelBinderAttributeTest.cs | 3 +- .../ModelBinding/ModelBinderConfigTest.cs | 2 +- .../ModelBinding/ModelBindingContextTest.cs | 3 +- .../ModelBinding/ModelBindingUtilTest.cs | 3 +- .../ParameterBindingProvidersTest.cs | 3 +- .../Routing/HttpRouteTest.cs | 3 +- .../Routing/HttpRouteValueDictionaryTest.cs | 3 - .../MediaTypeFormatterExtensionsTests.cs | 3 +- .../Routing/UriPathExtensionMappingTests.cs | 3 - .../Routing/UrlHelperTest.cs | 3 - .../Services/ControllerServicesTests.cs | 3 +- .../Services/DefaultServicesTests.cs | 3 +- .../Services/ServicesExtensionsTests.cs | 3 +- .../Tracing/FormattingUtilitiesTest.cs | 3 - .../HttpRequestMessageExtensionsTest.cs | 3 +- .../Tracing/ITraceWriterExtensionsTest.cs | 3 +- .../Tracing/TraceManagerTest.cs | 4 +- .../Tracing/TracerCorrectnessTest.cs | 3 - .../ActionFilterAttributeTracerTest.cs | 3 +- .../Tracing/Tracers/ActionFilterTracerTest.cs | 3 +- .../Tracers/ActionValueBinderTracerTest.cs | 3 +- .../AuthorizationFilterAttributeTracerTest.cs | 3 +- .../Tracers/AuthorizationFilterTracerTest.cs | 3 +- .../BufferedMediaTypeFormatterTracerTest.cs | 3 +- .../Tracers/ContentNegotiatorTracerTest.cs | 3 +- .../ExceptionFilterAttributeTracerTest.cs | 3 +- .../Tracers/ExceptionFilterTracerTest.cs | 3 +- .../Tracing/Tracers/FilterTracerTest.cs | 3 +- ...mUrlEncodedMediaTypeFormatterTracerTest.cs | 3 +- .../FormatterParameterBindingTracerTest.cs | 3 +- .../Tracers/HttpActionBindingTracerTest.cs | 3 +- .../Tracers/HttpActionDescriptorTracerTest.cs | 3 +- .../Tracers/HttpActionInvokerTracerTest.cs | 3 +- .../Tracers/HttpActionSelectorTracerTest.cs | 3 +- .../HttpControllerActivatorTracerTest.cs | 3 +- .../HttpControllerDescriptorTracerTest.cs | 2 +- .../HttpControllerSelectorTracerTest.cs | 3 +- .../Tracers/HttpControllerTracerTest.cs | 3 +- .../Tracers/HttpParameterBindingTracerTest.cs | 3 +- .../JsonMediaTypeFormatterTracerTest.cs | 3 +- .../Tracers/MediaTypeFormatterTracerTest.cs | 2 - .../MediaTypeFormatterTracerTestBase.cs | 3 +- .../Tracers/MessageHandlerTracerTest.cs | 3 +- ...adWriteMediaTypeFormatterTracerTestBase.cs | 3 +- .../RequestMessageHandlerTracerTest.cs | 3 +- .../XmlMediaTypeFormatterTracerTest.cs | 3 +- .../DefaultBodyModelValidatorTest.cs | 3 - .../ModelStateFormatterLoggerTest.cs | 3 +- .../Validation/ModelValidationNodeTest.cs | 3 +- ...delValidationRequiredMemberSelectorTest.cs | 3 +- .../Validation/ModelValidationResultTest.cs | 2 +- .../Validation/ModelValidatorTest.cs | 3 +- .../AssociatedValidatorProviderTest.cs | 3 +- ...taAnnotationsModelValidatorProviderTest.cs | 3 +- .../DataMemberModelValidatorProviderTest.cs | 3 +- .../InvalidModelValidatorProviderTest.cs | 3 +- .../DataAnnotationsModelValidatorTest.cs | 3 +- .../Validators/ErrorModelValidatorTest.cs | 3 +- .../NameValuePairsValueProviderTest.cs | 3 +- .../QueryStringValueProviderFactoryTest.cs | 3 +- .../Providers/QueryStringValueProviderTest.cs | 2 +- .../RouteDataValueProviderFactoryTest.cs | 3 +- .../System.Web.Http.Tracing.Test.csproj | 6 +- .../SystemDiagnosticsTraceWriterTest.cs | 24 +-- .../HttpControllerHandlerTest.cs | 29 +-- .../RouteCollectionExtensionsTest.cs | 2 - .../Routing/HostedHttpRouteCollectionTest.cs | 3 +- .../Routing/HostedUrlHelperTest.cs | 3 +- .../Routing/HttpRequestMessageWrapperTest.cs | 3 - .../SuppressFormsAuthRedirectModuleTest.cs | 43 ++--- .../WebHostBufferPolicySelectorTest.cs | 3 - .../Ajax/Test/AjaxExtensionsTest.cs | 3 +- .../Ajax/Test/AjaxOptionsTest.cs | 3 +- .../Async/Test/AsyncActionDescriptorTest.cs | 3 +- .../Test/AsyncActionMethodSelectorTest.cs | 3 +- .../Test/AsyncControllerActionInvokerTest.cs | 3 +- .../Async/Test/AsyncManagerTest.cs | 3 +- .../Async/Test/AsyncResultWrapperTest.cs | 3 +- .../Async/Test/AsyncUtilTest.cs | 2 +- .../Async/Test/OperationCounterTest.cs | 2 +- .../ReflectedAsyncActionDescriptorTest.cs | 3 +- .../ReflectedAsyncControllerDescriptorTest.cs | 3 +- .../Async/Test/SimpleAsyncResultTest.cs | 2 +- .../Async/Test/SingleEntryGateTest.cs | 2 +- .../Test/SynchronizationContextUtilTest.cs | 3 +- .../Test/SynchronousOperationExceptionTest.cs | 3 +- .../Test/TaskAsyncActionDescriptorTest.cs | 3 +- .../Async/Test/TaskWrapperAsyncResultTest.cs | 2 +- .../Async/Test/TriggerListenerTest.cs | 2 +- .../Test/BinaryExpressionFingerprintTest.cs | 2 +- .../Test/CachedExpressionCompilerTest.cs | 2 +- .../ConditionalExpressionFingerprintTest.cs | 2 +- .../Test/ConstantExpressionFingerprintTest.cs | 2 +- .../Test/DefaultExpressionFingerprintTest.cs | 2 +- .../Test/ExpressionFingerprintTest.cs | 2 +- .../FingerprintingExpressionVisitorTest.cs | 2 +- .../Test/HoistingExpressionVisitorTest.cs | 2 +- .../Test/IndexExpressionFingerprintTest.cs | 2 +- .../Test/LambdaExpressionFingerprintTest.cs | 2 +- .../Test/MemberExpressionFingerprintTest.cs | 2 +- .../MethodCallExpressionFingerprintTest.cs | 2 +- .../ParameterExpressionFingerprintTest.cs | 2 +- .../TypeBinaryExpressionFingerprintTest.cs | 2 +- .../Test/UnaryExpressionFingerprintTest.cs | 2 +- .../Html/Test/ChildActionExtensionsTest.cs | 3 +- .../Html/Test/DefaultDisplayTemplatesTest.cs | 3 +- .../Html/Test/DefaultEditorTemplatesTest.cs | 3 +- .../Html/Test/DisplayNameExtensionsTest.cs | 3 +- .../Html/Test/FormExtensionsTest.cs | 2 +- .../Html/Test/InputExtensionsTest.cs | 2 - .../Html/Test/LabelExtensionsTest.cs | 3 +- .../Html/Test/LinkExtensionsTest.cs | 3 +- .../Html/Test/MvcFormTest.cs | 3 +- .../Html/Test/NameExtensionsTest.cs | 2 +- .../Html/Test/PartialExtensionsTest.cs | 2 +- .../Html/Test/RenderPartialExtensionsTest.cs | 2 +- .../Html/Test/SelectExtensionsTest.cs | 2 - .../Html/Test/TemplateHelpersTest.cs | 3 +- .../Html/Test/TextAreaExtensionsTest.cs | 3 +- .../Html/Test/ValidationExtensionsTest.cs | 3 +- .../Html/Test/ValueExtensionsTest.cs | 2 - .../Test/MvcCSharpRazorCodeGeneratorTest.cs | 2 +- .../Test/MvcCSharpRazorCodeParserTest.cs | 2 +- .../Razor/Test/MvcVBRazorCodeParserTest.cs | 2 +- .../Razor/Test/MvcWebPageRazorHostTest.cs | 3 +- .../Test/AcceptVerbsAttributeTest.cs | 3 +- .../Test/ActionDescriptorTest.cs | 3 +- .../Test/ActionExecutedContextTest.cs | 3 +- .../Test/ActionExecutingContextTest.cs | 3 +- .../Test/ActionFilterAttributeTest.cs | 3 +- .../Test/ActionMethodDispatcherCacheTest.cs | 2 +- .../Test/ActionMethodDispatcherTest.cs | 2 +- .../Test/ActionMethodSelectorTest.cs | 3 +- .../Test/ActionNameAttributeTest.cs | 3 +- .../Test/AdditionalMetadataAttributeTest.cs | 3 +- .../Test/AjaxHelperTest.cs | 3 +- .../Test/AjaxHelper`1Test.cs | 2 +- .../Test/AjaxRequestExtensionsTest.cs | 3 +- .../Test/AllowHtmlAttributeTest.cs | 3 +- .../Test/AreaHelpersTest.cs | 2 +- .../Test/AreaRegistrationContextTest.cs | 3 +- .../Test/AreaRegistrationTest.cs | 2 +- .../Test/AssociatedMetadataProviderTest.cs | 3 +- .../Test/AssociatedValidatorProviderTest.cs | 3 +- .../Test/AsyncControllerTest.cs | 3 +- .../Test/AsyncTimeoutAttributeTest.cs | 3 +- .../Test/AuthorizationContextTest.cs | 3 +- .../Test/AuthorizeAttributeTest.cs | 3 +- .../Test/BindAttributeTest.cs | 2 +- .../Test/BuildManagerCompiledViewTest.cs | 3 +- .../Test/BuildManagerViewEngineTest.cs | 2 +- .../Test/ByteArrayModelBinderTest.cs | 3 +- .../CachedAssociatedMetadataProviderTest.cs | 3 +- .../Test/CancellationTokenModelBinderTest.cs | 2 +- .../Test/ChildActionOnlyAttributeTest.cs | 3 +- .../ChildActionValueProviderFactoryTest.cs | 3 +- ...lientDataTypeModelValidatorProviderTest.cs | 4 +- .../Test/CompareAttributeTest.cs | 3 +- .../Test/ContentResultTest.cs | 3 +- .../Test/ControllerActionInvokerTest.cs | 3 +- .../Test/ControllerBaseTest.cs | 3 +- .../Test/ControllerBuilderTest.cs | 3 +- .../Test/ControllerContextTest.cs | 3 +- .../Test/ControllerDescriptorCacheTest.cs | 2 +- .../Test/ControllerDescriptorTest.cs | 3 +- .../ControllerInstanceFilterProviderTest.cs | 2 +- .../Test/ControllerTest.cs | 3 +- ...nnotationsModelMetadataProviderTestBase.cs | 3 +- ...taAnnotationsModelValidatorProviderTest.cs | 3 +- .../Test/DataAnnotationsModelValidatorTest.cs | 3 +- ...DataErrorInfoModelValidatorProviderTest.cs | 3 +- .../Test/DataTypeUtilTest.cs | 2 +- .../Test/DefaultControllerFactoryTest.cs | 4 +- .../Test/DefaultModelBinderTest.cs | 3 +- .../Test/DefaultViewLocationCacheTest.cs | 3 +- .../Test/DependencyResolverTest.cs | 3 +- .../Test/DescriptorUtilTest.cs | 2 +- .../Test/DictionaryHelpersTest.cs | 2 +- .../Test/DictionaryValueProviderTest.cs | 3 +- .../Test/DynamicViewDataDictionaryTest.cs | 2 +- .../Test/EmptyModelValidatorProviderTest.cs | 2 +- .../Test/ExceptionContextTest.cs | 3 +- .../Test/ExpressionHelperTest.cs | 3 +- .../Test/FieldValidationMetadataTest.cs | 2 +- .../Test/FileContentResultTest.cs | 3 +- .../Test/FilePathResultTest.cs | 3 +- .../Test/FileResultTest.cs | 3 - .../Test/FileStreamResultTest.cs | 3 +- .../Test/FilterAttributeFilterProviderTest.cs | 2 +- .../Test/FilterInfoTest.cs | 2 +- .../Test/FilterProviderCollectionTest.cs | 3 +- .../Test/FilterProvidersTest.cs | 2 +- test/System.Web.Mvc.Test/Test/FilterTest.cs | 3 +- .../Test/FormCollectionTest.cs | 3 +- .../Test/FormContextTest.cs | 3 +- .../Test/FormValueProviderFactoryTest.cs | 3 +- .../Test/GlobalFilterCollectionTest.cs | 4 +- .../Test/HandleErrorAttributeTest.cs | 3 +- .../Test/HandleErrorInfoTest.cs | 3 +- .../Test/HtmlHelperTest.cs | 2 - .../Test/HtmlHelper`1Test.cs | 2 +- .../Test/HttpDeleteAttributeTest.cs | 2 +- ...pFileCollectionValueProviderFactoryTest.cs | 3 +- .../HttpFileCollectionValueProviderTest.cs | 3 +- .../Test/HttpGetAttributeTest.cs | 2 +- .../Test/HttpHandlerUtilTest.cs | 3 +- .../Test/HttpHeadAttributeTest.cs | 2 +- .../Test/HttpNotFoundResultTest.cs | 2 +- .../Test/HttpOptionsAttributeTest.cs | 2 +- .../Test/HttpPatchAttributeTest.cs | 2 +- .../Test/HttpPostAttributeTest.cs | 2 +- .../Test/HttpPostedFileBaseModelBinderTest.cs | 3 +- .../Test/HttpPutAttributeTest.cs | 2 +- .../Test/HttpRequestExtensionsTest.cs | 4 +- .../Test/HttpStatusCodeResultTest.cs | 3 +- .../Test/HttpUnauthorizedResultTest.cs | 2 +- .../Test/HttpVerbAttributeHelper.cs | 2 +- .../Test/JavaScriptResultTest.cs | 3 +- .../Test/JsonResultTest.cs | 3 +- .../Test/JsonValueProviderFactoryTest.cs | 3 +- .../Test/LinqBinaryModelBinderTest.cs | 3 +- .../Test/ModelBinderAttributeTest.cs | 3 +- .../Test/ModelBinderDictionaryTest.cs | 3 +- .../Test/ModelBinderProviderCollectionTest.cs | 3 +- .../Test/ModelBinderProvidersTest.cs | 2 +- .../Test/ModelBindersTest.cs | 2 +- .../Test/ModelBindingContextTest.cs | 3 +- .../Test/ModelClientValidationRuleTest.cs | 2 +- .../Test/ModelErrorCollectionTest.cs | 2 +- .../Test/ModelErrorTest.cs | 3 +- .../Test/ModelMetadataProvidersTest.cs | 2 +- .../Test/ModelMetadataTest.cs | 3 +- .../Test/ModelStateDictionaryTest.cs | 3 +- .../Test/ModelStateTest.cs | 2 +- .../Test/ModelValidationResultTest.cs | 2 +- .../ModelValidatorProviderCollectionTest.cs | 3 +- .../Test/ModelValidatorProvidersTest.cs | 2 +- .../Test/ModelValidatorTest.cs | 3 +- .../Test/MultiSelectListTest.cs | 3 +- .../Test/MultiServiceResolverTest.cs | 3 +- .../Test/MvcHandlerTest.cs | 3 +- .../Test/MvcHtmlStringTest.cs | 2 +- .../Test/MvcHttpHandlerTest.cs | 3 +- .../Test/MvcRouteHandlerTest.cs | 3 +- .../Test/MvcWebRazorHostFactoryTest.cs | 2 +- .../Test/NameValueCollectionExtensionsTest.cs | 3 +- .../NameValueCollectionValueProviderTest.cs | 3 +- .../Test/NoAsyncTimeoutAttributeTest.cs | 2 +- .../Test/NonActionAttributeTest.cs | 2 +- .../Test/OutputCacheAttributeTest.cs | 3 +- .../Test/ParameterBindingInfoTest.cs | 2 +- .../Test/ParameterDescriptorTest.cs | 3 +- .../Test/ParameterInfoUtilTest.cs | 2 +- .../Test/PartialViewResultTest.cs | 3 +- .../Test/PathHelpersTest.cs | 2 +- .../Test/PreApplicationStartCodeTest.cs | 2 +- .../QueryStringValueProviderFactoryTest.cs | 3 +- .../Test/RangeAttributeAdapterTest.cs | 2 +- .../Test/RazorViewEngineTest.cs | 2 +- .../System.Web.Mvc.Test/Test/RazorViewTest.cs | 3 +- .../Test/ReaderWriterCacheTest.cs | 2 +- .../Test/RedirectResultTest.cs | 3 +- .../Test/RedirectToRouteResultTest.cs | 3 +- .../Test/ReflectedActionDescriptorTest.cs | 3 +- .../Test/ReflectedControllerDescriptorTest.cs | 3 +- .../Test/ReflectedParameterBindingInfoTest.cs | 3 +- .../Test/ReflectedParameterDescriptorTest.cs | 3 +- .../RegularExpressionAttributeAdapterTest.cs | 2 +- .../Test/RemoteAttributeTest.cs | 3 +- .../Test/RequireHttpsAttributeTest.cs | 3 +- .../Test/RequiredAttributeAdapterTest.cs | 2 +- .../Test/ResultExecutedContextTest.cs | 3 +- .../Test/ResultExecutingContextTest.cs | 3 +- .../Test/RouteCollectionExtensionsTest.cs | 3 +- .../Test/RouteDataValueProviderFactoryTest.cs | 3 +- .../Test/SelectListTest.cs | 2 +- .../Test/SessionStateTempDataProviderTest.cs | 3 +- .../Test/SingleServiceResolverTest.cs | 3 +- .../Test/StringLengthAttributeAdapterTest.cs | 2 +- .../Test/TempDataDictionaryTest.cs | 2 +- .../Test/TypeCacheSerializerTest.cs | 2 +- .../Test/TypeCacheUtilTest.cs | 2 +- .../Test/TypeHelpersTest.cs | 2 +- .../System.Web.Mvc.Test/Test/UrlHelperTest.cs | 3 +- .../Test/UrlParameterTest.cs | 2 +- .../Test/UrlRewriterHelperTest.cs | 2 +- .../Test/ValidatableObjectAdapterTest.cs | 3 +- .../ValidateAntiForgeryTokenAttributeTest.cs | 4 +- .../Test/ValidateInputAttributeTest.cs | 3 +- .../Test/ValueProviderCollectionTest.cs | 3 +- .../Test/ValueProviderDictionaryTest.cs | 2 +- .../Test/ValueProviderFactoriesTest.cs | 2 +- .../ValueProviderFactoryCollectionTest.cs | 3 +- .../Test/ValueProviderResultTest.cs | 3 - .../Test/ValueProviderUtilTest.cs | 2 +- .../Test/ViewContextTest.cs | 3 +- .../Test/ViewDataDictionaryTest.cs | 3 +- .../Test/ViewDataInfoTest.cs | 2 +- .../Test/ViewEngineCollectionTest.cs | 3 +- .../Test/ViewEngineResultTest.cs | 3 +- .../Test/ViewEnginesTest.cs | 2 +- .../Test/ViewMasterPageControlBuilderTest.cs | 2 +- .../Test/ViewMasterPageTest.cs | 3 +- .../Test/ViewPageControlBuilderTest.cs | 2 +- test/System.Web.Mvc.Test/Test/ViewPageTest.cs | 3 +- .../Test/ViewResultBaseTest.cs | 3 +- .../Test/ViewResultTest.cs | 3 +- .../Test/ViewStartPageTest.cs | 3 +- .../Test/ViewTypeParserFilterTest.cs | 2 +- .../Test/ViewUserControlControlBuilderTest.cs | 2 +- .../Test/ViewUserControlTest.cs | 3 +- .../Test/VirtualPathProviderViewEngineTest.cs | 3 +- .../Test/WebFormViewEngineTest.cs | 2 +- .../Test/WebFormViewTest.cs | 3 +- .../Util/DictionaryHelper.cs | 2 +- .../CSharpRazorCodeLanguageTest.cs | 2 +- .../Editor/RazorEditorParserTest.cs | 3 +- .../Framework/ParserTestBase.cs | 2 +- .../Generator/CSharpRazorCodeGeneratorTest.cs | 4 +- .../Generator/GeneratedCodeMappingTest.cs | 2 +- .../Generator/RazorCodeGeneratorTest.cs | 2 +- .../Generator/VBRazorCodeGeneratorTest.cs | 4 +- .../System.Web.Razor.Test/Parser/BlockTest.cs | 2 +- .../Parser/CSharp/CSharpAutoCompleteTest.cs | 2 +- .../Parser/CSharp/CSharpBlockTest.cs | 3 +- .../Parser/CSharp/CSharpDirectivesTest.cs | 2 +- .../Parser/CSharp/CSharpErrorTest.cs | 2 +- .../CSharp/CSharpExplicitExpressionTest.cs | 2 +- .../Parser/CSharp/CSharpHelperTest.cs | 2 +- .../CSharp/CSharpImplicitExpressionTest.cs | 2 +- .../CSharp/CSharpLayoutDirectiveTest.cs | 3 +- .../CSharp/CSharpNestedStatementsTest.cs | 2 +- .../Parser/CSharp/CSharpRazorCommentsTest.cs | 2 +- .../Parser/CSharp/CSharpReservedWordsTest.cs | 2 +- .../Parser/CSharp/CSharpSectionTest.cs | 2 +- .../Parser/CSharp/CSharpSpecialBlockTest.cs | 2 +- .../Parser/CSharp/CSharpStatementTest.cs | 2 +- .../Parser/CSharp/CSharpTemplateTest.cs | 2 +- .../Parser/CSharp/CSharpToMarkupSwitchTest.cs | 2 +- .../Parser/CSharp/CSharpVerbatimBlockTest.cs | 2 +- .../CSharp/CSharpWhitespaceHandlingTest.cs | 2 +- .../Parser/CSharp/CsHtmlDocumentTest.cs | 2 +- .../Parser/CallbackParserListenerTest.cs | 2 +- .../Parser/Html/HtmlAttributeTest.cs | 2 +- .../Parser/Html/HtmlBlockTest.cs | 3 +- .../Parser/Html/HtmlDocumentTest.cs | 3 +- .../Parser/Html/HtmlErrorTest.cs | 2 +- .../Parser/Html/HtmlTagsTest.cs | 3 +- .../Parser/Html/HtmlToCodeSwitchTest.cs | 2 +- .../Parser/Html/HtmlUrlAttributeTest.cs | 2 +- .../Parser/ParserContextTest.cs | 3 +- .../Parser/ParserVisitorExtensionsTest.cs | 3 +- .../CSharpPartialParsingTest.cs | 2 +- .../PartialParsing/PartialParsingTestBase.cs | 2 +- .../PartialParsing/VBPartialParsingTest.cs | 2 +- .../Parser/RazorParserTest.cs | 3 +- .../Parser/VB/VBAutoCompleteTest.cs | 2 +- .../Parser/VB/VBBlockTest.cs | 4 +- .../Parser/VB/VBContinueStatementTest.cs | 2 +- .../Parser/VB/VBDirectiveTest.cs | 2 +- .../Parser/VB/VBErrorTest.cs | 3 +- .../Parser/VB/VBExitStatementTest.cs | 2 +- .../Parser/VB/VBExplicitExpressionTest.cs | 2 +- .../Parser/VB/VBExpressionTest.cs | 3 +- .../Parser/VB/VBExpressionsInCodeTest.cs | 3 +- .../Parser/VB/VBHelperTest.cs | 2 +- .../Parser/VB/VBHtmlDocumentTest.cs | 2 +- .../Parser/VB/VBImplicitExpressionTest.cs | 2 +- .../Parser/VB/VBLayoutDirectiveTest.cs | 3 +- .../Parser/VB/VBNestedStatementsTest.cs | 2 +- .../Parser/VB/VBRazorCommentsTest.cs | 2 +- .../Parser/VB/VBReservedWordsTest.cs | 2 +- .../Parser/VB/VBSectionTest.cs | 2 +- .../Parser/VB/VBSpecialKeywordsTest.cs | 2 +- .../Parser/VB/VBStatementTest.cs | 2 +- .../Parser/VB/VBTemplateTest.cs | 2 +- .../Parser/VB/VBToMarkupSwitchTest.cs | 3 +- .../Parser/WhitespaceRewriterTest.cs | 3 +- .../RazorCodeLanguageTest.cs | 2 +- .../RazorDirectiveAttributeTest.cs | 3 +- .../RazorEngineHostTest.cs | 3 +- .../RazorTemplateEngineTest.cs | 3 +- .../Text/BufferingTextReaderTest.cs | 3 +- .../Text/LineTrackingStringBufferTest.cs | 2 +- .../Text/LookaheadTextReaderTestBase.cs | 2 +- .../Text/SourceLocationTest.cs | 2 +- .../Text/SourceLocationTrackerTest.cs | 2 +- .../Text/TextBufferReaderTest.cs | 3 +- .../Text/TextChangeTest.cs | 3 +- .../Text/TextReaderExtensionsTest.cs | 3 +- .../Tokenizer/CSharpTokenizerCommentTest.cs | 2 +- .../CSharpTokenizerIdentifierTest.cs | 2 +- .../Tokenizer/CSharpTokenizerLiteralTest.cs | 2 +- .../Tokenizer/CSharpTokenizerOperatorsTest.cs | 2 +- .../Tokenizer/CSharpTokenizerTest.cs | 3 +- .../Tokenizer/HtmlTokenizerTest.cs | 3 +- .../Tokenizer/TokenizerLookaheadTest.cs | 2 +- .../Tokenizer/TokenizerTestBase.cs | 2 +- .../Tokenizer/VBTokenizerCommentTest.cs | 2 +- .../Tokenizer/VBTokenizerIdentifierTest.cs | 2 +- .../Tokenizer/VBTokenizerLiteralTest.cs | 2 +- .../Tokenizer/VBTokenizerOperatorsTest.cs | 2 +- .../Tokenizer/VBTokenizerTest.cs | 3 +- .../Utils/DisposableActionTest.cs | 3 +- .../System.Web.Razor.Test/Utils/MiscAssert.cs | 2 +- test/System.Web.Razor.Test/Utils/MiscUtils.cs | 2 +- .../System.Web.Razor.Test/Utils/SpanAssert.cs | 2 +- .../VBRazorCodeLanguageTest.cs | 2 +- .../AdminPackageTest.cs | 3 +- .../PackageManagerModuleTest.cs | 2 +- .../PackagesSourceFileTest.cs | 2 +- .../PageUtilsTest.cs | 2 +- .../PreApplicationStartCodeTest.cs | 2 +- .../RemoteAssemblyTest.cs | 2 +- .../WebProjectManagerTest.cs | 3 +- .../WebProjectSystemTest.cs | 2 +- .../AssemblyUtilsTest.cs | 2 +- .../PreApplicationStartCodeTest.cs | 3 +- .../WebPagesDeploymentTest.cs | 4 +- .../PreApplicationStartCodeTest.cs | 2 +- .../RazorBuildProviderTest.cs | 2 +- .../WebCodeRazorEngineHostTest.cs | 2 +- .../WebPageRazorEngineHostTest.cs | 3 +- .../WebRazorHostFactoryTest.cs | 3 +- .../ApplicationPartRegistryTest.cs | 3 +- .../ApplicationParts/ApplicationPartTest.cs | 3 +- .../ApplicationParts/MimeMappingTest.cs | 3 +- .../ApplicationParts/ResourceHandlerTest.cs | 3 +- .../Extensions/HttpContextExtensionsTest.cs | 2 +- .../Extensions/HttpRequestExtensionsTest.cs | 2 +- .../Extensions/HttpResponseExtensionsTest.cs | 2 +- .../Extensions/StringExtensionsTest.cs | 3 +- .../Helpers/AntiForgeryConfigTest.cs | 3 +- .../Helpers/AntiForgeryTest.cs | 3 +- .../AntiForgeryTokenSerializerTest.cs | 4 +- .../AntiXsrf/AntiForgeryTokenStoreTest.cs | 4 +- .../Helpers/AntiXsrf/AntiForgeryTokenTest.cs | 3 +- .../Helpers/AntiXsrf/AntiForgeryWorkerTest.cs | 4 +- .../Helpers/AntiXsrf/BinaryBlobTest.cs | 4 +- .../Helpers/AntiXsrf/ClaimUidExtractorTest.cs | 5 +- .../AntiXsrf/MachineKey40CryptoSystemTest.cs | 4 +- .../AntiXsrf/MachineKey45CryptoSystemTest.cs | 3 +- .../Helpers/AntiXsrf/MockableTokenStore.cs | 1 - .../Helpers/AntiXsrf/TokenValidatorTest.cs | 5 +- .../Helpers/Claims/ClaimTest.cs | 3 +- .../Claims/ClaimsIdentityConverterTest.cs | 4 +- .../Helpers/Claims/ClaimsIdentityTest.cs | 3 +- .../Helpers/CryptoUtilTest.cs | 4 +- .../Helpers/UnvalidatedRequestValuesTest.cs | 2 +- .../Html/CheckBoxTest.cs | 3 +- .../Html/HtmlHelperTest.cs | 3 +- .../Html/InputHelperTest.cs | 3 +- .../Html/RadioButtonTest.cs | 3 +- .../Html/SelectHelperTest.cs | 3 +- .../Html/TextAreaHelperTest.cs | 3 +- .../Html/ValidationHelperTest.cs | 2 +- .../InstrumentationServiceTest.cs | 2 +- .../Mvc/HttpAntiForgeryExceptionTest.cs | 2 +- ...entValidationMembershipPasswordRuleTest.cs | 2 +- .../Mvc/TagBuilderTest.cs | 3 +- .../PreApplicationStartCodeTest.cs | 2 +- .../AspNetRequestScopeStorageProviderTest.cs | 3 +- .../ScopeStorageDictionaryTest.cs | 2 +- .../ScopeStorageKeyComparerTest.cs | 2 +- .../ScopeStorage/WebConfigScopeStorageTest.cs | 3 +- .../Utils/CultureUtilTest.cs | 2 +- .../Utils/PathUtilTest.cs | 2 +- .../Utils/SessionStateUtilTest.cs | 3 +- .../Utils/TypeHelperTest.cs | 3 +- .../Utils/UrlUtilTest.cs | 2 +- .../Validation/ValidationHelperTest.cs | 3 +- .../Validation/ValidatorTest.cs | 3 +- .../WebPage/ApplicationStartPageTest.cs | 3 +- .../WebPage/BrowserHelpersTest.cs | 2 +- .../WebPage/BrowserOverrideStoresTest.cs | 2 +- .../WebPage/BuildManagerExceptionUtilTest.cs | 3 +- .../WebPage/BuildManagerWrapperTest.cs | 2 +- .../WebPage/CookieBrowserOverrideStoreTest.cs | 2 +- .../WebPage/DefaultDisplayModeTest.cs | 2 +- .../WebPage/DisplayInfoTest.cs | 3 +- .../WebPage/DisplayModeProviderTest.cs | 2 +- .../DynamicHttpApplicationStateTest.cs | 3 +- .../WebPage/DynamicPageDataDictionaryTest.cs | 3 +- .../WebPage/FileExistenceCacheTest.cs | 2 +- .../WebPage/LayoutTest.cs | 3 +- .../WebPage/PageDataDictionaryTest.cs | 2 +- .../WebPage/RenderPageTest.cs | 3 +- .../RequestBrowserOverrideStoreTest.cs | 2 +- .../WebPage/RequestResourceTrackerTest.cs | 3 +- .../WebPage/StartPageTest.cs | 3 +- .../WebPage/TemplateStackTest.cs | 2 +- .../WebPage/UrlDataTest.cs | 3 +- .../VirtualPathFactoryExtensionsTest.cs | 2 +- .../WebPage/VirtualPathFactoryManagerTest.cs | 2 +- .../WebPage/WebPageContextTest.cs | 2 +- .../WebPage/WebPageExecutingBaseTest.cs | 2 +- .../WebPage/WebPageHttpHandlerTest.cs | 3 +- .../WebPage/WebPageHttpModuleTest.cs | 2 +- .../WebPage/WebPageRenderingBaseTest.cs | 3 +- .../WebPage/WebPageRouteTest.cs | 4 +- .../WebPage/WebPageTest.cs | 3 +- .../WebApiHelpPage.Test/HelpControllerTest.cs | 3 +- .../HelpPageApiModelTest.cs | 2 +- .../HelpPageAreaRegistrationTest.cs | 2 +- .../HelpPageConfigurationExtensionsTest.cs | 3 +- .../HelpPageSampleKeyTest.cs | 3 +- .../HelppageSampleGeneratorTest.cs | 3 +- test/WebApiHelpPage.Test/ImageSampleTest.cs | 2 +- test/WebApiHelpPage.Test/InvalidSampleTest.cs | 2 +- .../ObjectGeneratorTest.cs | 3 +- test/WebApiHelpPage.Test/TextSampleTest.cs | 2 +- .../WebApiHelpPage.Test.csproj | 4 + .../XmlDocumentationProviderTest.cs | 3 +- .../ConfigurationManagerWrapperTest.cs | 2 +- test/WebMatrix.Data.Test/DatabaseTest.cs | 3 +- test/WebMatrix.Data.Test/DynamicRecordTest.cs | 3 +- test/WebMatrix.Data.Test/FileHandlerTest.cs | 2 +- .../PreApplicationStartCodeTest.cs | 2 +- .../SimpleMembershipProviderTest.cs | 2 +- .../WebMatrix.WebData.Test/WebSecurityTest.cs | 3 +- 897 files changed, 1017 insertions(+), 1688 deletions(-) rename test/Microsoft.TestCommon/{AssertEx.cs => Assert.cs} (94%) create mode 100644 test/Microsoft.TestCommon/DataAttribute.cs rename test/Microsoft.TestCommon/{WsrFactAttribute.cs => FactAttribute.cs} (95%) create mode 100644 test/Microsoft.TestCommon/InlineDataAttribute.cs create mode 100644 test/Microsoft.TestCommon/PropertyDataAttribute.cs rename test/Microsoft.TestCommon/{WsrTheoryAttribute.cs => TheoryAttribute.cs} (94%) create mode 100644 test/Microsoft.TestCommon/TraitAttribute.cs diff --git a/test/Common/DictionaryExtensionsTest.cs b/test/Common/DictionaryExtensionsTest.cs index 30acd162..bcb58f25 100644 --- a/test/Common/DictionaryExtensionsTest.cs +++ b/test/Common/DictionaryExtensionsTest.cs @@ -4,9 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Net; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/Common/ErrorTest.cs b/test/Common/ErrorTest.cs index 8a3cb173..4d045637 100644 --- a/test/Common/ErrorTest.cs +++ b/test/Common/ErrorTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http { diff --git a/test/Common/HttpMethodHelperTest.cs b/test/Common/HttpMethodHelperTest.cs index 6ac9b91e..f03b06df 100644 --- a/test/Common/HttpMethodHelperTest.cs +++ b/test/Common/HttpMethodHelperTest.cs @@ -2,9 +2,6 @@ using System.Net.Http; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/Common/PrefixContainerTest.cs b/test/Common/PrefixContainerTest.cs index 5a25c386..0063e54c 100644 --- a/test/Common/PrefixContainerTest.cs +++ b/test/Common/PrefixContainerTest.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web { diff --git a/test/Common/TaskHelpersExtensionsTest.cs b/test/Common/TaskHelpersExtensionsTest.cs index 9fe40864..d78c6678 100644 --- a/test/Common/TaskHelpersExtensionsTest.cs +++ b/test/Common/TaskHelpersExtensionsTest.cs @@ -2,8 +2,6 @@ using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; // There are several tests which need unreachable code (return after throw) to guarantee the correct lambda signature #pragma warning disable 0162 diff --git a/test/Common/TaskHelpersTest.cs b/test/Common/TaskHelpersTest.cs index 46128150..dfb51c1e 100644 --- a/test/Common/TaskHelpersTest.cs +++ b/test/Common/TaskHelpersTest.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Threading.Tasks { diff --git a/test/Common/UriQueryUtilityTest.cs b/test/Common/UriQueryUtilityTest.cs index 6e4714f7..a33c9732 100644 --- a/test/Common/UriQueryUtilityTest.cs +++ b/test/Common/UriQueryUtilityTest.cs @@ -6,9 +6,6 @@ using System.Net.Http.Formatting; using System.Text; using System.Web.Http; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/Microsoft.TestCommon/AssertEx.cs b/test/Microsoft.TestCommon/Assert.cs similarity index 94% rename from test/Microsoft.TestCommon/AssertEx.cs rename to test/Microsoft.TestCommon/Assert.cs index 8cc946ed..a33f4c53 100644 --- a/test/Microsoft.TestCommon/AssertEx.cs +++ b/test/Microsoft.TestCommon/Assert.cs @@ -1,15 +1,13 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; - namespace Microsoft.TestCommon { // This extends xUnit.net's Assert class, and makes it partial so that we can // organize the extension points by logical functionality (rather than dumping them // all into this single file). // - // See files named XxxAssertions for root extensions to AssertEx. - public partial class AssertEx : Assert + // See files named XxxAssertions for root extensions to Assert. + public partial class Assert : Xunit.Assert { public static readonly ReflectionAssert Reflection = new ReflectionAssert(); diff --git a/test/Microsoft.TestCommon/CultureReplacer.cs b/test/Microsoft.TestCommon/CultureReplacer.cs index a10a03d8..3bd5c7bd 100644 --- a/test/Microsoft.TestCommon/CultureReplacer.cs +++ b/test/Microsoft.TestCommon/CultureReplacer.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Threading; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.TestUtil { diff --git a/test/Microsoft.TestCommon/DataAttribute.cs b/test/Microsoft.TestCommon/DataAttribute.cs new file mode 100644 index 00000000..87494de3 --- /dev/null +++ b/test/Microsoft.TestCommon/DataAttribute.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.TestCommon +{ + [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)] + public abstract class DataAttribute : Xunit.Extensions.DataAttribute + { + } +} diff --git a/test/Microsoft.TestCommon/EnumHelperTestBase.cs b/test/Microsoft.TestCommon/EnumHelperTestBase.cs index 91c4bced..e9b3d0f7 100644 --- a/test/Microsoft.TestCommon/EnumHelperTestBase.cs +++ b/test/Microsoft.TestCommon/EnumHelperTestBase.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http.Formatting { diff --git a/test/Microsoft.TestCommon/ExceptionAssertions.cs b/test/Microsoft.TestCommon/ExceptionAssertions.cs index 041d68cf..1277cd96 100644 --- a/test/Microsoft.TestCommon/ExceptionAssertions.cs +++ b/test/Microsoft.TestCommon/ExceptionAssertions.cs @@ -8,7 +8,7 @@ using System.Web; namespace Microsoft.TestCommon { - public partial class AssertEx + public partial class Assert { /// /// Determines if your thread's current culture and current UI culture is English. @@ -510,7 +510,7 @@ namespace Microsoft.TestCommon protected override bool ExcludeStackFrame(string stackFrame) { - if (stackFrame.StartsWith("at Microsoft.TestCommon.AssertEx.", StringComparison.OrdinalIgnoreCase)) + if (stackFrame.StartsWith("at Microsoft.TestCommon.Assert.", StringComparison.OrdinalIgnoreCase)) { return true; } diff --git a/test/Microsoft.TestCommon/WsrFactAttribute.cs b/test/Microsoft.TestCommon/FactAttribute.cs similarity index 95% rename from test/Microsoft.TestCommon/WsrFactAttribute.cs rename to test/Microsoft.TestCommon/FactAttribute.cs index 3fa94b12..359d0625 100644 --- a/test/Microsoft.TestCommon/WsrFactAttribute.cs +++ b/test/Microsoft.TestCommon/FactAttribute.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; -using Xunit; using Xunit.Sdk; namespace Microsoft.TestCommon @@ -11,9 +10,9 @@ namespace Microsoft.TestCommon /// An override of that provides extended capabilities. /// [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] - public class WsrFactAttribute : FactAttribute + public class FactAttribute : Xunit.FactAttribute { - public WsrFactAttribute() + public FactAttribute() { Timeout = TimeoutConstant.DefaultTimeout; Platforms = Platform.All; diff --git a/test/Microsoft.TestCommon/ForceGCAttribute.cs b/test/Microsoft.TestCommon/ForceGCAttribute.cs index 0eaa64f2..03bc46c8 100644 --- a/test/Microsoft.TestCommon/ForceGCAttribute.cs +++ b/test/Microsoft.TestCommon/ForceGCAttribute.cs @@ -2,11 +2,10 @@ using System; using System.Reflection; -using Xunit; namespace Microsoft.TestCommon { - public class ForceGCAttribute : BeforeAfterTestAttribute + public class ForceGCAttribute : Xunit.BeforeAfterTestAttribute { public override void After(MethodInfo methodUnderTest) { diff --git a/test/Microsoft.TestCommon/InlineDataAttribute.cs b/test/Microsoft.TestCommon/InlineDataAttribute.cs new file mode 100644 index 00000000..cd044399 --- /dev/null +++ b/test/Microsoft.TestCommon/InlineDataAttribute.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.TestCommon +{ + [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)] + public class InlineDataAttribute : Xunit.Extensions.InlineDataAttribute + { + public InlineDataAttribute(params object[] dataValues) + : base(dataValues) + { + } + } +} diff --git a/test/Microsoft.TestCommon/MemberHelper.cs b/test/Microsoft.TestCommon/MemberHelper.cs index 0cbe6231..56dadb16 100644 --- a/test/Microsoft.TestCommon/MemberHelper.cs +++ b/test/Microsoft.TestCommon/MemberHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Reflection; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.TestUtil { diff --git a/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj b/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj index abde25ab..2dacb48b 100644 --- a/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj +++ b/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj @@ -63,21 +63,24 @@ + + + - + Code - - + + Code @@ -116,6 +119,7 @@ + diff --git a/test/Microsoft.TestCommon/Microsoft/TestCommon/GenericTypeAssert.cs b/test/Microsoft.TestCommon/Microsoft/TestCommon/GenericTypeAssert.cs index 7865642e..10c72327 100644 --- a/test/Microsoft.TestCommon/Microsoft/TestCommon/GenericTypeAssert.cs +++ b/test/Microsoft.TestCommon/Microsoft/TestCommon/GenericTypeAssert.cs @@ -3,7 +3,6 @@ using System; using System.Linq; using System.Reflection; -using Xunit; namespace Microsoft.TestCommon { diff --git a/test/Microsoft.TestCommon/Microsoft/TestCommon/HttpAssert.cs b/test/Microsoft.TestCommon/Microsoft/TestCommon/HttpAssert.cs index f0986d24..a4502035 100644 --- a/test/Microsoft.TestCommon/Microsoft/TestCommon/HttpAssert.cs +++ b/test/Microsoft.TestCommon/Microsoft/TestCommon/HttpAssert.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Net.Http; using System.Net.Http.Headers; using System.Text.RegularExpressions; -using Xunit; namespace Microsoft.TestCommon { diff --git a/test/Microsoft.TestCommon/Microsoft/TestCommon/MediaTypeAssert.cs b/test/Microsoft.TestCommon/Microsoft/TestCommon/MediaTypeAssert.cs index 51276226..0bca8e37 100644 --- a/test/Microsoft.TestCommon/Microsoft/TestCommon/MediaTypeAssert.cs +++ b/test/Microsoft.TestCommon/Microsoft/TestCommon/MediaTypeAssert.cs @@ -2,7 +2,6 @@ using System; using System.Net.Http.Headers; -using Xunit; namespace Microsoft.TestCommon { diff --git a/test/Microsoft.TestCommon/Microsoft/TestCommon/TaskAssert.cs b/test/Microsoft.TestCommon/Microsoft/TestCommon/TaskAssert.cs index 78b75d86..b49ae0dd 100644 --- a/test/Microsoft.TestCommon/Microsoft/TestCommon/TaskAssert.cs +++ b/test/Microsoft.TestCommon/Microsoft/TestCommon/TaskAssert.cs @@ -3,7 +3,6 @@ using System; using System.Reflection; using System.Threading.Tasks; -using Xunit; namespace Microsoft.TestCommon { diff --git a/test/Microsoft.TestCommon/Microsoft/TestCommon/TestDataSetAttribute.cs b/test/Microsoft.TestCommon/Microsoft/TestCommon/TestDataSetAttribute.cs index 5c14acff..dd1a3963 100644 --- a/test/Microsoft.TestCommon/Microsoft/TestCommon/TestDataSetAttribute.cs +++ b/test/Microsoft.TestCommon/Microsoft/TestCommon/TestDataSetAttribute.cs @@ -5,7 +5,6 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using System.Reflection; -using Xunit.Extensions; namespace Microsoft.TestCommon { diff --git a/test/Microsoft.TestCommon/Microsoft/TestCommon/TypeAssert.cs b/test/Microsoft.TestCommon/Microsoft/TestCommon/TypeAssert.cs index f6f00545..9eae1d3d 100644 --- a/test/Microsoft.TestCommon/Microsoft/TestCommon/TypeAssert.cs +++ b/test/Microsoft.TestCommon/Microsoft/TestCommon/TypeAssert.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.TestCommon { diff --git a/test/Microsoft.TestCommon/Microsoft/TestCommon/XmlAssert.cs b/test/Microsoft.TestCommon/Microsoft/TestCommon/XmlAssert.cs index 0f1cfd94..4608150b 100644 --- a/test/Microsoft.TestCommon/Microsoft/TestCommon/XmlAssert.cs +++ b/test/Microsoft.TestCommon/Microsoft/TestCommon/XmlAssert.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Web; using System.Xml.Linq; -using Xunit; namespace Microsoft.TestCommon { diff --git a/test/Microsoft.TestCommon/PartialTrustRunner.cs b/test/Microsoft.TestCommon/PartialTrustRunner.cs index 72579999..0a244f07 100644 --- a/test/Microsoft.TestCommon/PartialTrustRunner.cs +++ b/test/Microsoft.TestCommon/PartialTrustRunner.cs @@ -9,66 +9,73 @@ using System.Reflection; using System.Security; using System.Security.Permissions; using System.Web; -using Xunit; using Xunit.Sdk; namespace Microsoft.TestCommon { - public class PartialTrustRunner : ITestClassCommand + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)] + public class PartialTrustRunnerAttribute : Xunit.RunWithAttribute { - private AppDomain sandbox; - - // Delegate most of the work to the existing TestClassCommand class so that we - // can preserve any existing behavior (like supporting IUseFixture). - private readonly TestClassCommand originalTestClassCommand = new TestClassCommand(); - - public int ChooseNextTest(ICollection testsLeftToRun) + public PartialTrustRunnerAttribute() + : base(typeof(PartialTrustTestClassCommand)) { - return this.originalTestClassCommand.ChooseNextTest(testsLeftToRun); } - public Exception ClassFinish() + private class PartialTrustTestClassCommand : ITestClassCommand { - Exception result = this.originalTestClassCommand.ClassFinish(); - if (this.sandbox != null) + private AppDomain sandbox; + + // Delegate most of the work to the existing TestClassCommand class so that we + // can preserve any existing behavior (like supporting IUseFixture). + private readonly TestClassCommand originalTestClassCommand = new TestClassCommand(); + + public int ChooseNextTest(ICollection testsLeftToRun) { - AppDomain.Unload(this.sandbox); - this.sandbox = null; + return this.originalTestClassCommand.ChooseNextTest(testsLeftToRun); } - return result; - } + public Exception ClassFinish() + { + Exception result = this.originalTestClassCommand.ClassFinish(); + if (this.sandbox != null) + { + AppDomain.Unload(this.sandbox); + this.sandbox = null; + } - public Exception ClassStart() - { - this.GuardTypeUnderTest(); - Assembly xunitAssembly = typeof(FactAttribute).Assembly; - this.sandbox = CreatePartialTrustAppDomain(); + return result; + } - return this.originalTestClassCommand.ClassStart(); - } + public Exception ClassStart() + { + this.GuardTypeUnderTest(); + Assembly xunitAssembly = typeof(FactAttribute).Assembly; + this.sandbox = CreatePartialTrustAppDomain(); - private static AppDomain CreatePartialTrustAppDomain() - { - PermissionSet permissions = new PermissionSet(PermissionState.None); - permissions.AddPermission(new AspNetHostingPermission(AspNetHostingPermissionLevel.Medium)); - permissions.AddPermission(new DnsPermission(PermissionState.Unrestricted)); - permissions.AddPermission(new EnvironmentPermission(EnvironmentPermissionAccess.Read, "TEMP;TMP;USERNAME;OS;COMPUTERNAME")); - permissions.AddPermission(new FileIOPermission(FileIOPermissionAccess.AllAccess, AppDomain.CurrentDomain.BaseDirectory)); - permissions.AddPermission(new IsolatedStorageFilePermission(PermissionState.None) { UsageAllowed = IsolatedStorageContainment.AssemblyIsolationByUser, UserQuota = Int64.MaxValue }); - permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution)); - permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlThread)); - permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlPrincipal)); - permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.RemotingConfiguration)); - permissions.AddPermission(new SmtpPermission(SmtpAccess.Connect)); - permissions.AddPermission(new SqlClientPermission(PermissionState.Unrestricted)); - permissions.AddPermission(new TypeDescriptorPermission(PermissionState.Unrestricted)); - permissions.AddPermission(new WebPermission(PermissionState.Unrestricted)); - permissions.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.RestrictedMemberAccess)); + return this.originalTestClassCommand.ClassStart(); + } - AppDomainSetup setup = new AppDomainSetup() { ApplicationBase = AppDomain.CurrentDomain.BaseDirectory }; + private static AppDomain CreatePartialTrustAppDomain() + { + PermissionSet permissions = new PermissionSet(PermissionState.None); + permissions.AddPermission(new AspNetHostingPermission(AspNetHostingPermissionLevel.Medium)); + permissions.AddPermission(new DnsPermission(PermissionState.Unrestricted)); + permissions.AddPermission(new EnvironmentPermission(EnvironmentPermissionAccess.Read, "TEMP;TMP;USERNAME;OS;COMPUTERNAME")); + permissions.AddPermission(new FileIOPermission(FileIOPermissionAccess.AllAccess, AppDomain.CurrentDomain.BaseDirectory)); + permissions.AddPermission(new IsolatedStorageFilePermission(PermissionState.None) { UsageAllowed = IsolatedStorageContainment.AssemblyIsolationByUser, UserQuota = Int64.MaxValue }); + permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution)); + permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlThread)); + permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlPrincipal)); + permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.RemotingConfiguration)); + permissions.AddPermission(new SmtpPermission(SmtpAccess.Connect)); + permissions.AddPermission(new SqlClientPermission(PermissionState.Unrestricted)); + permissions.AddPermission(new TypeDescriptorPermission(PermissionState.Unrestricted)); + permissions.AddPermission(new WebPermission(PermissionState.Unrestricted)); + permissions.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.RestrictedMemberAccess)); - setup.PartialTrustVisibleAssemblies = new string[] + AppDomainSetup setup = new AppDomainSetup() { ApplicationBase = AppDomain.CurrentDomain.BaseDirectory }; + + setup.PartialTrustVisibleAssemblies = new string[] { "System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293", "System.Web.Extensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9", @@ -81,54 +88,55 @@ namespace Microsoft.TestCommon }; - return AppDomain.CreateDomain("Partial Trust Sandbox", null, setup, permissions); - } - - public IEnumerable EnumerateTestCommands(IMethodInfo testMethod) - { - return this.originalTestClassCommand.EnumerateTestCommands(testMethod); - } - - public IEnumerable EnumerateTestMethods() - { - return this.originalTestClassCommand.EnumerateTestMethods(); - } - - public bool IsTestMethod(IMethodInfo testMethod) - { - return this.originalTestClassCommand.IsTestMethod(testMethod); - } - - public object ObjectUnderTest - { - get - { - return sandbox.CreateInstanceAndUnwrap(this.TypeUnderTest.Type.Assembly.FullName, this.TypeUnderTest.Type.FullName); + return AppDomain.CreateDomain("Partial Trust Sandbox", null, setup, permissions); } - } - public ITypeInfo TypeUnderTest - { - get + public IEnumerable EnumerateTestCommands(IMethodInfo testMethod) { - return this.originalTestClassCommand.TypeUnderTest; + return this.originalTestClassCommand.EnumerateTestCommands(testMethod); } - set + + public IEnumerable EnumerateTestMethods() { - if (!typeof(MarshalByRefObject).IsAssignableFrom(value.Type)) + return this.originalTestClassCommand.EnumerateTestMethods(); + } + + public bool IsTestMethod(IMethodInfo testMethod) + { + return this.originalTestClassCommand.IsTestMethod(testMethod); + } + + public object ObjectUnderTest + { + get { - throw new InvalidOperationException("Test types to be run in PT must derive from MarshalByRefObject"); + return sandbox.CreateInstanceAndUnwrap(this.TypeUnderTest.Type.Assembly.FullName, this.TypeUnderTest.Type.FullName); } - - this.originalTestClassCommand.TypeUnderTest = value; } - } - private void GuardTypeUnderTest() - { - if (TypeUnderTest == null) + public ITypeInfo TypeUnderTest { - throw new InvalidOperationException("Forgot to set TypeUnderTest before calling ObjectUnderTest"); + get + { + return this.originalTestClassCommand.TypeUnderTest; + } + set + { + if (!typeof(MarshalByRefObject).IsAssignableFrom(value.Type)) + { + throw new InvalidOperationException("Test types to be run in PT must derive from MarshalByRefObject"); + } + + this.originalTestClassCommand.TypeUnderTest = value; + } + } + + private void GuardTypeUnderTest() + { + if (TypeUnderTest == null) + { + throw new InvalidOperationException("Forgot to set TypeUnderTest before calling ObjectUnderTest"); + } } } } diff --git a/test/Microsoft.TestCommon/Platform.cs b/test/Microsoft.TestCommon/Platform.cs index 15b5bbce..8ec9d669 100644 --- a/test/Microsoft.TestCommon/Platform.cs +++ b/test/Microsoft.TestCommon/Platform.cs @@ -17,19 +17,19 @@ namespace Microsoft.TestCommon /// /// Indicates that the test wants to run on .NET 4 (when used with - /// and/or ), + /// and/or ), /// or that the current platform that the test is running on is .NET 4 (when used with the - /// , , and/or - /// ). + /// , , and/or + /// ). /// Net40 = 0x01, /// /// Indicates that the test wants to run on .NET 4.5 (when used with - /// and/or ), + /// and/or ), /// or that the current platform that the test is running on is .NET 4.5 (when used with the - /// , , and/or - /// ). + /// , , and/or + /// ). /// Net45 = 0x02, } diff --git a/test/Microsoft.TestCommon/PreAppStartTestHelper.cs b/test/Microsoft.TestCommon/PreAppStartTestHelper.cs index dfac40de..47638d36 100644 --- a/test/Microsoft.TestCommon/PreAppStartTestHelper.cs +++ b/test/Microsoft.TestCommon/PreAppStartTestHelper.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.TestUtils { diff --git a/test/Microsoft.TestCommon/PreserveSyncContextAttribute.cs b/test/Microsoft.TestCommon/PreserveSyncContextAttribute.cs index 354d94ba..1c1dd1d8 100644 --- a/test/Microsoft.TestCommon/PreserveSyncContextAttribute.cs +++ b/test/Microsoft.TestCommon/PreserveSyncContextAttribute.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Threading; -using Xunit; namespace Microsoft.TestCommon { @@ -9,7 +8,7 @@ namespace Microsoft.TestCommon /// Preserves the current . Use this attribute on /// tests which modify the current . /// - public class PreserveSyncContextAttribute : BeforeAfterTestAttribute + public class PreserveSyncContextAttribute : Xunit.BeforeAfterTestAttribute { private SynchronizationContext _syncContext; diff --git a/test/Microsoft.TestCommon/PropertyDataAttribute.cs b/test/Microsoft.TestCommon/PropertyDataAttribute.cs new file mode 100644 index 00000000..af1b5aa6 --- /dev/null +++ b/test/Microsoft.TestCommon/PropertyDataAttribute.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.TestCommon +{ + [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)] + public class PropertyDataAttribute : Xunit.Extensions.PropertyDataAttribute + { + public PropertyDataAttribute(string propertyName) + : base(propertyName) + { + } + } +} diff --git a/test/Microsoft.TestCommon/ReflectionAssert.cs b/test/Microsoft.TestCommon/ReflectionAssert.cs index d96ebe05..8d4c8393 100644 --- a/test/Microsoft.TestCommon/ReflectionAssert.cs +++ b/test/Microsoft.TestCommon/ReflectionAssert.cs @@ -3,7 +3,6 @@ using System; using System.Linq.Expressions; using System.Reflection; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.TestCommon { diff --git a/test/Microsoft.TestCommon/ReplaceCultureAttribute.cs b/test/Microsoft.TestCommon/ReplaceCultureAttribute.cs index 0b2ca7a4..a638aaaa 100644 --- a/test/Microsoft.TestCommon/ReplaceCultureAttribute.cs +++ b/test/Microsoft.TestCommon/ReplaceCultureAttribute.cs @@ -4,7 +4,6 @@ using System; using System.Globalization; using System.Reflection; using System.Threading; -using Xunit; namespace Microsoft.TestCommon { @@ -12,7 +11,7 @@ namespace Microsoft.TestCommon /// Replaces the current culture and UI culture for the test. /// [AttributeUsage(AttributeTargets.Method)] - public class ReplaceCultureAttribute : BeforeAfterTestAttribute + public class ReplaceCultureAttribute : Xunit.BeforeAfterTestAttribute { private CultureInfo _originalCulture; private CultureInfo _originalUICulture; diff --git a/test/Microsoft.TestCommon/RestoreThreadPrincipalAttribute.cs b/test/Microsoft.TestCommon/RestoreThreadPrincipalAttribute.cs index b7de0b7e..1f08dc6f 100644 --- a/test/Microsoft.TestCommon/RestoreThreadPrincipalAttribute.cs +++ b/test/Microsoft.TestCommon/RestoreThreadPrincipalAttribute.cs @@ -4,11 +4,10 @@ using System; using System.Reflection; using System.Security.Principal; using System.Threading; -using Xunit; namespace Microsoft.TestCommon { - public class RestoreThreadPrincipalAttribute : BeforeAfterTestAttribute + public class RestoreThreadPrincipalAttribute : Xunit.BeforeAfterTestAttribute { private IPrincipal _originalPrincipal; diff --git a/test/Microsoft.TestCommon/TaskExtensions.cs b/test/Microsoft.TestCommon/TaskExtensions.cs index f2f4ee9d..eeb44197 100644 --- a/test/Microsoft.TestCommon/TaskExtensions.cs +++ b/test/Microsoft.TestCommon/TaskExtensions.cs @@ -2,7 +2,7 @@ using System; using System.Threading.Tasks; -using Xunit; +using Microsoft.TestCommon; // No namespace so that these extensions are available for all test classes diff --git a/test/Microsoft.TestCommon/TestFile.cs b/test/Microsoft.TestCommon/TestFile.cs index db528aaf..7ebd32fb 100644 --- a/test/Microsoft.TestCommon/TestFile.cs +++ b/test/Microsoft.TestCommon/TestFile.cs @@ -2,7 +2,7 @@ using System.IO; using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.TestUtils { diff --git a/test/Microsoft.TestCommon/TestHelper.cs b/test/Microsoft.TestCommon/TestHelper.cs index 5f64f4d9..afe7c535 100644 --- a/test/Microsoft.TestCommon/TestHelper.cs +++ b/test/Microsoft.TestCommon/TestHelper.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.TestUtil { diff --git a/test/Microsoft.TestCommon/WsrTheoryAttribute.cs b/test/Microsoft.TestCommon/TheoryAttribute.cs similarity index 94% rename from test/Microsoft.TestCommon/WsrTheoryAttribute.cs rename to test/Microsoft.TestCommon/TheoryAttribute.cs index 6e422a9d..90e787a2 100644 --- a/test/Microsoft.TestCommon/WsrTheoryAttribute.cs +++ b/test/Microsoft.TestCommon/TheoryAttribute.cs @@ -2,15 +2,14 @@ using System; using System.Collections.Generic; -using Xunit.Extensions; using Xunit.Sdk; namespace Microsoft.TestCommon { [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] - public class WsrTheoryAttribute : TheoryAttribute + public class TheoryAttribute : Xunit.Extensions.TheoryAttribute { - public WsrTheoryAttribute() + public TheoryAttribute() { Timeout = TimeoutConstant.DefaultTimeout; Platforms = Platform.All; diff --git a/test/Microsoft.TestCommon/TraitAttribute.cs b/test/Microsoft.TestCommon/TraitAttribute.cs new file mode 100644 index 00000000..19965e62 --- /dev/null +++ b/test/Microsoft.TestCommon/TraitAttribute.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.TestCommon +{ + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)] + public class TraitAttribute : Xunit.TraitAttribute + { + public TraitAttribute(string name, string value) + : base(name, value) + { + } + } +} diff --git a/test/Microsoft.Web.Helpers.Test/AnalyticsTest.cs b/test/Microsoft.Web.Helpers.Test/AnalyticsTest.cs index 01812ea1..aa7294a7 100644 --- a/test/Microsoft.Web.Helpers.Test/AnalyticsTest.cs +++ b/test/Microsoft.Web.Helpers.Test/AnalyticsTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.TestUtil; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/BingTest.cs b/test/Microsoft.Web.Helpers.Test/BingTest.cs index e54f01d6..a2225224 100644 --- a/test/Microsoft.Web.Helpers.Test/BingTest.cs +++ b/test/Microsoft.Web.Helpers.Test/BingTest.cs @@ -8,9 +8,8 @@ using System.Web; using System.Web.Helpers.Test; using System.Web.TestUtil; using System.Web.WebPages.Scope; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/FacebookTest.cs b/test/Microsoft.Web.Helpers.Test/FacebookTest.cs index 27c52ecf..503bf63b 100644 --- a/test/Microsoft.Web.Helpers.Test/FacebookTest.cs +++ b/test/Microsoft.Web.Helpers.Test/FacebookTest.cs @@ -6,8 +6,6 @@ using System.Web; using System.Web.TestUtil; using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/FileUploadTest.cs b/test/Microsoft.Web.Helpers.Test/FileUploadTest.cs index f6f0fa24..c2ae2c8e 100644 --- a/test/Microsoft.Web.Helpers.Test/FileUploadTest.cs +++ b/test/Microsoft.Web.Helpers.Test/FileUploadTest.cs @@ -4,9 +4,8 @@ using System.Collections; using System.Web; using System.Web.Helpers.Test; using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/GamerCardTest.cs b/test/Microsoft.Web.Helpers.Test/GamerCardTest.cs index 6e14fef1..992ae147 100644 --- a/test/Microsoft.Web.Helpers.Test/GamerCardTest.cs +++ b/test/Microsoft.Web.Helpers.Test/GamerCardTest.cs @@ -3,8 +3,7 @@ using System; using System.Web.Helpers.Test; using System.Web.TestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/GravatarTest.cs b/test/Microsoft.Web.Helpers.Test/GravatarTest.cs index d0e95aaf..6652cc4e 100644 --- a/test/Microsoft.Web.Helpers.Test/GravatarTest.cs +++ b/test/Microsoft.Web.Helpers.Test/GravatarTest.cs @@ -2,8 +2,7 @@ using System; using System.Web.Helpers.Test; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/LinkShareTest.cs b/test/Microsoft.Web.Helpers.Test/LinkShareTest.cs index 2a377003..51202dba 100644 --- a/test/Microsoft.Web.Helpers.Test/LinkShareTest.cs +++ b/test/Microsoft.Web.Helpers.Test/LinkShareTest.cs @@ -6,8 +6,7 @@ using System.Web; using System.Web.Helpers.Test; using System.Web.TestUtil; using System.Web.WebPages.Scope; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/MapsTest.cs b/test/Microsoft.Web.Helpers.Test/MapsTest.cs index d96ba21b..d991bbb8 100644 --- a/test/Microsoft.Web.Helpers.Test/MapsTest.cs +++ b/test/Microsoft.Web.Helpers.Test/MapsTest.cs @@ -2,7 +2,7 @@ using System; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/PreAppStartCodeTest.cs b/test/Microsoft.Web.Helpers.Test/PreAppStartCodeTest.cs index f49d93d9..b527b9c3 100644 --- a/test/Microsoft.Web.Helpers.Test/PreAppStartCodeTest.cs +++ b/test/Microsoft.Web.Helpers.Test/PreAppStartCodeTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Web.WebPages.Razor; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/ReCaptchaTest.cs b/test/Microsoft.Web.Helpers.Test/ReCaptchaTest.cs index 59ce622b..7d8733a9 100644 --- a/test/Microsoft.Web.Helpers.Test/ReCaptchaTest.cs +++ b/test/Microsoft.Web.Helpers.Test/ReCaptchaTest.cs @@ -8,9 +8,8 @@ using System.Web; using System.Web.Helpers.Test; using System.Web.TestUtil; using System.Web.WebPages.Scope; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/ThemesTest.cs b/test/Microsoft.Web.Helpers.Test/ThemesTest.cs index b01579ac..245221d9 100644 --- a/test/Microsoft.Web.Helpers.Test/ThemesTest.cs +++ b/test/Microsoft.Web.Helpers.Test/ThemesTest.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using System.Web.Hosting; using System.Web.WebPages.Scope; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/TwitterTest.cs b/test/Microsoft.Web.Helpers.Test/TwitterTest.cs index da4d1dfe..e6ca1d56 100644 --- a/test/Microsoft.Web.Helpers.Test/TwitterTest.cs +++ b/test/Microsoft.Web.Helpers.Test/TwitterTest.cs @@ -4,8 +4,7 @@ using System.Web; using System.Web.Helpers; using System.Web.Helpers.Test; using System.Web.TestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/UrlBuilderTest.cs b/test/Microsoft.Web.Helpers.Test/UrlBuilderTest.cs index a58448b7..d316f0cd 100644 --- a/test/Microsoft.Web.Helpers.Test/UrlBuilderTest.cs +++ b/test/Microsoft.Web.Helpers.Test/UrlBuilderTest.cs @@ -8,8 +8,8 @@ using System.Text; using System.Web; using System.Web.UI; using System.Web.WebPages; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Helpers.Test/VideoTest.cs b/test/Microsoft.Web.Helpers.Test/VideoTest.cs index 1f92dfc7..5c921d21 100644 --- a/test/Microsoft.Web.Helpers.Test/VideoTest.cs +++ b/test/Microsoft.Web.Helpers.Test/VideoTest.cs @@ -4,9 +4,8 @@ using System; using System.Reflection; using System.Text.RegularExpressions; using System.Web; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Helpers.Test { diff --git a/test/Microsoft.Web.Http.Data.Helpers.Test/UpshotExtensionsTests.cs b/test/Microsoft.Web.Http.Data.Helpers.Test/UpshotExtensionsTests.cs index 59778bd2..6349ef56 100644 --- a/test/Microsoft.Web.Http.Data.Helpers.Test/UpshotExtensionsTests.cs +++ b/test/Microsoft.Web.Http.Data.Helpers.Test/UpshotExtensionsTests.cs @@ -2,10 +2,9 @@ using System.Text.RegularExpressions; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.Http.Data.Test; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Http.Data.Helpers.Test { diff --git a/test/Microsoft.Web.Http.Data.Test/ChangeSetTests.cs b/test/Microsoft.Web.Http.Data.Test/ChangeSetTests.cs index 1b203f41..13843e20 100644 --- a/test/Microsoft.Web.Http.Data.Test/ChangeSetTests.cs +++ b/test/Microsoft.Web.Http.Data.Test/ChangeSetTests.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Microsoft.Web.Http.Data; using Microsoft.Web.Http.Data.Test.Models; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.ServiceModel.DomainServices.Server.Test { diff --git a/test/Microsoft.Web.Http.Data.Test/DataControllerDescriptionTest.cs b/test/Microsoft.Web.Http.Data.Test/DataControllerDescriptionTest.cs index 8bb7942e..85075474 100644 --- a/test/Microsoft.Web.Http.Data.Test/DataControllerDescriptionTest.cs +++ b/test/Microsoft.Web.Http.Data.Test/DataControllerDescriptionTest.cs @@ -9,11 +9,10 @@ using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Microsoft.Web.Http.Data.EntityFramework; using Microsoft.Web.Http.Data.EntityFramework.Metadata; using Microsoft.Web.Http.Data.Test.Models; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Http.Data.Test { diff --git a/test/Microsoft.Web.Http.Data.Test/DataControllerSubmitTests.cs b/test/Microsoft.Web.Http.Data.Test/DataControllerSubmitTests.cs index 333db5b6..d0b763ae 100644 --- a/test/Microsoft.Web.Http.Data.Test/DataControllerSubmitTests.cs +++ b/test/Microsoft.Web.Http.Data.Test/DataControllerSubmitTests.cs @@ -15,10 +15,9 @@ using System.Web.Http.Controllers; using System.Web.Http.Dispatcher; using System.Web.Http.Filters; using System.Web.Http.Routing; +using Microsoft.TestCommon; using Microsoft.Web.Http.Data.Test.Models; using Newtonsoft.Json; -using Assert = Microsoft.TestCommon.AssertEx; -using FactAttribute = Microsoft.TestCommon.WsrFactAttribute; namespace Microsoft.Web.Http.Data.Test { diff --git a/test/Microsoft.Web.Http.Data.Test/MetadataExtensionsTests.cs b/test/Microsoft.Web.Http.Data.Test/MetadataExtensionsTests.cs index 91bdc4c8..a312fa66 100644 --- a/test/Microsoft.Web.Http.Data.Test/MetadataExtensionsTests.cs +++ b/test/Microsoft.Web.Http.Data.Test/MetadataExtensionsTests.cs @@ -2,10 +2,10 @@ using System; using System.ComponentModel.DataAnnotations; +using Microsoft.TestCommon; using Microsoft.Web.Http.Data.Helpers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Xunit; namespace Microsoft.Web.Http.Data.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Controls/Test/DropDownListTest.cs b/test/Microsoft.Web.Mvc.Test/Controls/Test/DropDownListTest.cs index def697b6..72e32116 100644 --- a/test/Microsoft.Web.Mvc.Test/Controls/Test/DropDownListTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Controls/Test/DropDownListTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Mvc; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Controls.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Controls/Test/MvcControlTest.cs b/test/Microsoft.Web.Mvc.Test/Controls/Test/MvcControlTest.cs index e86e5119..9ef42f7c 100644 --- a/test/Microsoft.Web.Mvc.Test/Controls/Test/MvcControlTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Controls/Test/MvcControlTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Web.Mvc; using System.Web.UI; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Controls.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderProviderTest.cs index 78de1d77..2e7d9b3e 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderProviderTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderTest.cs index 54c73522..ae529765 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderTest.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BinaryDataModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BinaryDataModelBinderProviderTest.cs index 2b39d7b0..619e3a16 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BinaryDataModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BinaryDataModelBinderProviderTest.cs @@ -2,8 +2,8 @@ using System.Data.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BindingBehaviorAttributeTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BindingBehaviorAttributeTest.cs index 3138b23d..006eec27 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BindingBehaviorAttributeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BindingBehaviorAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderProviderTest.cs index 4030534f..8c27ef41 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderProviderTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderTest.cs index b34a22b2..d0ad94c2 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderTest.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderUtilTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderUtilTest.cs index daf360cb..e7951cf1 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderUtilTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderUtilTest.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Web.Mvc; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderProviderTest.cs index 74682ed6..e0c59964 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderProviderTest.cs @@ -2,7 +2,7 @@ using System; using System.Web.Mvc; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderTest.cs index 468c8ae7..c17df706 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderTest.cs @@ -3,8 +3,8 @@ using System; using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoResultTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoResultTest.cs index e59e70cc..8f53bcdd 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoResultTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoResultTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Mvc; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoTest.cs index c5ac9719..f7336f29 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoTest.cs @@ -2,8 +2,7 @@ using System.Linq; using System.Web.Mvc; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderProviderTest.cs index 3026e94e..39fee736 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderProviderTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderTest.cs index c8bc47db..8065296c 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderTest.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBinderAdapterTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBinderAdapterTest.cs index e03d87ee..f5c91f98 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBinderAdapterTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBinderAdapterTest.cs @@ -3,10 +3,9 @@ using System; using System.Collections.Generic; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBindingContextTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBindingContextTest.cs index f15e8ffd..8df345ac 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBindingContextTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBindingContextTest.cs @@ -3,9 +3,8 @@ using System; using System.Web.Mvc; using System.Web.TestUtil; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/GenericModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/GenericModelBinderProviderTest.cs index ac695c3c..8d850be8 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/GenericModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/GenericModelBinderProviderTest.cs @@ -3,10 +3,9 @@ using System; using System.Collections.Generic; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderProviderTest.cs index 6b043972..e3f432d5 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderProviderTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderTest.cs index ec08ae9c..51242c92 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderTest.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderUtilTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderUtilTest.cs index 728a0e60..524c23ca 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderUtilTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderUtilTest.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderConfigTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderConfigTest.cs index 4eb0d1dc..8616df5f 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderConfigTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderConfigTest.cs @@ -5,8 +5,8 @@ using System.Globalization; using System.Web; using System.Web.Mvc; using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProviderCollectionTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProviderCollectionTest.cs index 183ec797..07859dae 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProviderCollectionTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProviderCollectionTest.cs @@ -5,10 +5,9 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProvidersTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProvidersTest.cs index 3b641109..e77fc602 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProvidersTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProvidersTest.cs @@ -2,7 +2,7 @@ using System; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderUtilTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderUtilTest.cs index bd6f1e1f..a0546a80 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderUtilTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderUtilTest.cs @@ -3,8 +3,7 @@ using System; using System.Collections.Generic; using System.Web.Mvc; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelValidationNodeTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelValidationNodeTest.cs index 621b82eb..8e77fc66 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelValidationNodeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelValidationNodeTest.cs @@ -5,8 +5,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Mvc; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderProviderTest.cs index 809959e3..51efb860 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderProviderTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderTest.cs index 02a16cc9..900415cc 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderTest.cs @@ -6,9 +6,8 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/SimpleModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/SimpleModelBinderProviderTest.cs index fe0d8302..f29d9a4c 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/SimpleModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/SimpleModelBinderProviderTest.cs @@ -2,10 +2,9 @@ using System; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderProviderTest.cs index c1a4fee3..1491262e 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderProviderTest.cs @@ -2,8 +2,8 @@ using System; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderTest.cs index ee377655..cf487bd6 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderTest.cs @@ -4,8 +4,8 @@ using System; using System.ComponentModel; using System.Globalization; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderProviderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderProviderTest.cs index 4c7cc111..8f0784cf 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderProviderTest.cs @@ -3,8 +3,8 @@ using System; using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderTest.cs b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderTest.cs index 54d1894d..913de4fe 100644 --- a/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderTest.cs @@ -2,8 +2,8 @@ using System; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.ModelBinding.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/AjaxOnlyAttributeTest.cs b/test/Microsoft.Web.Mvc.Test/Test/AjaxOnlyAttributeTest.cs index 0126b846..cf6590e2 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/AjaxOnlyAttributeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/AjaxOnlyAttributeTest.cs @@ -2,9 +2,8 @@ using System.Collections.Specialized; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/AreaHelpersTest.cs b/test/Microsoft.Web.Mvc.Test/Test/AreaHelpersTest.cs index 4e40b776..7a5e9495 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/AreaHelpersTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/AreaHelpersTest.cs @@ -4,7 +4,7 @@ using System; using System.Web; using System.Web.Mvc; using System.Web.Routing; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/AsyncManagerExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/AsyncManagerExtensionsTest.cs index bb1043fa..dc7d38a6 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/AsyncManagerExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/AsyncManagerExtensionsTest.cs @@ -3,8 +3,7 @@ using System; using System.Threading; using System.Web.Mvc.Async; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ButtonTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ButtonTest.cs index 186547e4..e8cdad46 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ButtonTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ButtonTest.cs @@ -2,9 +2,8 @@ using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ContentTypeAttributeTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ContentTypeAttributeTest.cs index 7f306b18..9ab7dc1f 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ContentTypeAttributeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ContentTypeAttributeTest.cs @@ -3,9 +3,8 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ControllerExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ControllerExtensionsTest.cs index eebf2397..29517f1c 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ControllerExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ControllerExtensionsTest.cs @@ -2,9 +2,8 @@ using System; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/CookieTempDataProviderTest.cs b/test/Microsoft.Web.Mvc.Test/Test/CookieTempDataProviderTest.cs index 783df468..eba6591d 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/CookieTempDataProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/CookieTempDataProviderTest.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using System.Web; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/CookieValueProviderFactoryTest.cs b/test/Microsoft.Web.Mvc.Test/Test/CookieValueProviderFactoryTest.cs index 7e328e83..bf2879f8 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/CookieValueProviderFactoryTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/CookieValueProviderFactoryTest.cs @@ -3,8 +3,8 @@ using System.Globalization; using System.Web; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/CopyAsyncParametersAttributeTest.cs b/test/Microsoft.Web.Mvc.Test/Test/CopyAsyncParametersAttributeTest.cs index 86a4e152..97c79a11 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/CopyAsyncParametersAttributeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/CopyAsyncParametersAttributeTest.cs @@ -3,8 +3,7 @@ using System; using System.Collections.Generic; using System.Web.Mvc; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/CreditCardAttributeTest.cs b/test/Microsoft.Web.Mvc.Test/Test/CreditCardAttributeTest.cs index 1bc74c31..2d2724a4 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/CreditCardAttributeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/CreditCardAttributeTest.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/CssExtensionsTests.cs b/test/Microsoft.Web.Mvc.Test/Test/CssExtensionsTests.cs index c6201501..4a4935ef 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/CssExtensionsTests.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/CssExtensionsTests.cs @@ -2,9 +2,8 @@ using System; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/DeserializeAttributeTest.cs b/test/Microsoft.Web.Mvc.Test/Test/DeserializeAttributeTest.cs index d4e6aab2..01bbf698 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/DeserializeAttributeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/DeserializeAttributeTest.cs @@ -3,10 +3,9 @@ using System; using System.Runtime.Serialization; using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/DynamicReflectionObjectTest.cs b/test/Microsoft.Web.Mvc.Test/Test/DynamicReflectionObjectTest.cs index 5389751e..801e444b 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/DynamicReflectionObjectTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/DynamicReflectionObjectTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/DynamicViewDataDictionaryTest.cs b/test/Microsoft.Web.Mvc.Test/Test/DynamicViewDataDictionaryTest.cs index cbe3aa24..53f26050 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/DynamicViewDataDictionaryTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/DynamicViewDataDictionaryTest.cs @@ -2,8 +2,7 @@ using System; using System.Web.Mvc; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/DynamicViewPageTest.cs b/test/Microsoft.Web.Mvc.Test/Test/DynamicViewPageTest.cs index f5f9cbca..71c0ad80 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/DynamicViewPageTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/DynamicViewPageTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ElementalValueProviderTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ElementalValueProviderTest.cs index efb8d587..36c75982 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ElementalValueProviderTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ElementalValueProviderTest.cs @@ -3,7 +3,7 @@ using System; using System.Globalization; using System.Web.Mvc; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/EmailAddressAttribueTest.cs b/test/Microsoft.Web.Mvc.Test/Test/EmailAddressAttribueTest.cs index 37707ecb..506cb0bc 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/EmailAddressAttribueTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/EmailAddressAttribueTest.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ExpressionHelperTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ExpressionHelperTest.cs index 9806f332..cf3596d1 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ExpressionHelperTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ExpressionHelperTest.cs @@ -4,8 +4,7 @@ using System; using System.Linq.Expressions; using System.Web.Mvc; using System.Web.Routing; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; using ExpressionHelper = Microsoft.Web.Mvc.Internal.ExpressionHelper; namespace Microsoft.Web.Mvc.Test diff --git a/test/Microsoft.Web.Mvc.Test/Test/FileExtensionsAttributeTest.cs b/test/Microsoft.Web.Mvc.Test/Test/FileExtensionsAttributeTest.cs index 9aad72a3..2d1e056e 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/FileExtensionsAttributeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/FileExtensionsAttributeTest.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/FormExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/FormExtensionsTest.cs index b2b7f1e7..1f58152a 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/FormExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/FormExtensionsTest.cs @@ -5,8 +5,8 @@ using System.IO; using System.Web; using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ImageExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ImageExtensionsTest.cs index 619b49c8..0de33c45 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ImageExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ImageExtensionsTest.cs @@ -2,9 +2,8 @@ using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/MailToExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/MailToExtensionsTest.cs index e3571b3a..3c9d91b6 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/MailToExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/MailToExtensionsTest.cs @@ -2,9 +2,8 @@ using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ModelCopierTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ModelCopierTest.cs index 69d25258..713c857a 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ModelCopierTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ModelCopierTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/MvcSerializerTest.cs b/test/Microsoft.Web.Mvc.Test/Test/MvcSerializerTest.cs index 9cac33ec..fbd35030 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/MvcSerializerTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/MvcSerializerTest.cs @@ -3,8 +3,7 @@ using System; using System.Runtime.Serialization; using System.Web.Security; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/RadioExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/RadioExtensionsTest.cs index 51f5926f..f88a628f 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/RadioExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/RadioExtensionsTest.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ReaderWriterCacheTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ReaderWriterCacheTest.cs index 78191df0..440db98b 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ReaderWriterCacheTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ReaderWriterCacheTest.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/RenderActionTest.cs b/test/Microsoft.Web.Mvc.Test/Test/RenderActionTest.cs index 1c2dd83f..c563cc39 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/RenderActionTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/RenderActionTest.cs @@ -6,10 +6,9 @@ using System.Reflection; using System.Web; using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ScriptExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ScriptExtensionsTest.cs index 6e4e3664..22546947 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ScriptExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ScriptExtensionsTest.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/SerializationExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/SerializationExtensionsTest.cs index 9e5b7d12..4af97412 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/SerializationExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/SerializationExtensionsTest.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Mvc; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ServerVariablesValueProviderFactoryTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ServerVariablesValueProviderFactoryTest.cs index 9c0018e7..259c3c3a 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ServerVariablesValueProviderFactoryTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ServerVariablesValueProviderFactoryTest.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; using System.Globalization; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/SessionValueProviderFactoryTest.cs b/test/Microsoft.Web.Mvc.Test/Test/SessionValueProviderFactoryTest.cs index 7986a504..9d7e09f6 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/SessionValueProviderFactoryTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/SessionValueProviderFactoryTest.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Globalization; using System.Web; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/SkipBindingAttributeTest.cs b/test/Microsoft.Web.Mvc.Test/Test/SkipBindingAttributeTest.cs index 4ee3f15d..09148c85 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/SkipBindingAttributeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/SkipBindingAttributeTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Mvc; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/SubmitButtonExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/SubmitButtonExtensionsTest.cs index 0fbb6849..ebb76825 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/SubmitButtonExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/SubmitButtonExtensionsTest.cs @@ -2,8 +2,8 @@ using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/SubmitImageExtensionsTest.cs b/test/Microsoft.Web.Mvc.Test/Test/SubmitImageExtensionsTest.cs index 22074fcb..1c13e158 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/SubmitImageExtensionsTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/SubmitImageExtensionsTest.cs @@ -2,9 +2,8 @@ using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/TempDataValueProviderFactoryTest.cs b/test/Microsoft.Web.Mvc.Test/Test/TempDataValueProviderFactoryTest.cs index 0a1a440d..f78d640f 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/TempDataValueProviderFactoryTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/TempDataValueProviderFactoryTest.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/TypeHelpersTest.cs b/test/Microsoft.Web.Mvc.Test/Test/TypeHelpersTest.cs index f6b883fc..54a088b1 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/TypeHelpersTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/TypeHelpersTest.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/UrlAttributeTest.cs b/test/Microsoft.Web.Mvc.Test/Test/UrlAttributeTest.cs index c3b15280..807e343a 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/UrlAttributeTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/UrlAttributeTest.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.Mvc.Test/Test/ValueProviderUtilTest.cs b/test/Microsoft.Web.Mvc.Test/Test/ValueProviderUtilTest.cs index a306dd3d..be51c49e 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/ValueProviderUtilTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/ValueProviderUtilTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.Mvc.Test { diff --git a/test/Microsoft.Web.WebPages.OAuth.Test/OAuthWebSecurityTest.cs b/test/Microsoft.Web.WebPages.OAuth.Test/OAuthWebSecurityTest.cs index cca38089..5cb54d60 100644 --- a/test/Microsoft.Web.WebPages.OAuth.Test/OAuthWebSecurityTest.cs +++ b/test/Microsoft.Web.WebPages.OAuth.Test/OAuthWebSecurityTest.cs @@ -8,7 +8,6 @@ using System.Web.Security; using DotNetOpenAuth.AspNet; using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.Web.WebPages.OAuth.Test { @@ -17,7 +16,7 @@ namespace Microsoft.Web.WebPages.OAuth.Test [Fact] public void RegisterClientThrowsOnNullValue() { - AssertEx.ThrowsArgumentNull(() => OAuthWebSecurity.RegisterClient(null), "client"); + Assert.ThrowsArgumentNull(() => OAuthWebSecurity.RegisterClient(null), "client"); } [Fact] @@ -28,12 +27,12 @@ namespace Microsoft.Web.WebPages.OAuth.Test client.Setup(c => c.ProviderName).Returns((string)null); // Act & Assert - AssertEx.ThrowsArgument(() => OAuthWebSecurity.RegisterClient(client.Object), "client"); + Assert.ThrowsArgument(() => OAuthWebSecurity.RegisterClient(client.Object), "client"); client.Setup(c => c.ProviderName).Returns(""); // Act & Assert - AssertEx.ThrowsArgument(() => OAuthWebSecurity.RegisterClient(client.Object), "client"); + Assert.ThrowsArgument(() => OAuthWebSecurity.RegisterClient(client.Object), "client"); } [Fact] @@ -49,7 +48,7 @@ namespace Microsoft.Web.WebPages.OAuth.Test OAuthWebSecurity.RegisterClient(client1.Object); // Act & Assert - AssertEx.ThrowsArgument(() => OAuthWebSecurity.RegisterClient(client2.Object), null); + Assert.ThrowsArgument(() => OAuthWebSecurity.RegisterClient(client2.Object), null); } [Fact] diff --git a/test/Microsoft.Web.WebPages.OAuth.Test/PreAppStartCodeTest.cs b/test/Microsoft.Web.WebPages.OAuth.Test/PreAppStartCodeTest.cs index 736a672e..15144365 100644 --- a/test/Microsoft.Web.WebPages.OAuth.Test/PreAppStartCodeTest.cs +++ b/test/Microsoft.Web.WebPages.OAuth.Test/PreAppStartCodeTest.cs @@ -2,7 +2,7 @@ using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace Microsoft.Web.WebPages.OAuth.Test { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/BufferedMediaTypeFormatterTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/BufferedMediaTypeFormatterTests.cs index 7d28a195..01c61563 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/BufferedMediaTypeFormatterTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/BufferedMediaTypeFormatterTests.cs @@ -8,9 +8,6 @@ using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/ContentNegotiationResultTest.cs b/test/System.Net.Http.Formatting.Test/Formatting/ContentNegotiationResultTest.cs index 1da8c93f..78917039 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/ContentNegotiationResultTest.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/ContentNegotiationResultTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http.Headers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/DataContractJsonMediaTypeFormatterTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/DataContractJsonMediaTypeFormatterTests.cs index 5860ab5a..000c9d8b 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/DataContractJsonMediaTypeFormatterTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/DataContractJsonMediaTypeFormatterTests.cs @@ -10,9 +10,6 @@ using System.Runtime.Serialization.Json; using System.Text; using System.Threading.Tasks; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/DefaultContentNegotiatorTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/DefaultContentNegotiatorTests.cs index ad8df691..e7837f5c 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/DefaultContentNegotiatorTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/DefaultContentNegotiatorTests.cs @@ -7,9 +7,6 @@ using System.Net.Http.Headers; using System.Text; using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/FormDataCollectionTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/FormDataCollectionTests.cs index 7283ffa9..a561cab9 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/FormDataCollectionTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/FormDataCollectionTests.cs @@ -3,9 +3,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedFromContentTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedFromContentTests.cs index 21b37bc7..9fda0914 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedFromContentTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedFromContentTests.cs @@ -6,9 +6,6 @@ using System.Text; using System.Web.Http; using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedFromUriQueryTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedFromUriQueryTests.cs index 079fbdc2..1f4c5a25 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedFromUriQueryTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedFromUriQueryTests.cs @@ -5,8 +5,6 @@ using System.Text; using System.Web.Http; using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedJsonTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedJsonTests.cs index 9cdbacbd..8df43526 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedJsonTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedJsonTests.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedMediaTypeFormatterTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedMediaTypeFormatterTests.cs index 30db5069..8bb35dcb 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedMediaTypeFormatterTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/FormUrlEncodedMediaTypeFormatterTests.cs @@ -7,9 +7,6 @@ using System.Net.Http.Headers; using System.Text; using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/JsonMediaTypeFormatterTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/JsonMediaTypeFormatterTests.cs index fda2a987..759ea6c7 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/JsonMediaTypeFormatterTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/JsonMediaTypeFormatterTests.cs @@ -12,9 +12,6 @@ using System.Threading.Tasks; using Microsoft.TestCommon; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/JsonNetSerializationTest.cs b/test/System.Net.Http.Formatting.Test/Formatting/JsonNetSerializationTest.cs index eb9a2ddb..039440f3 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/JsonNetSerializationTest.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/JsonNetSerializationTest.cs @@ -9,8 +9,6 @@ using System.Threading.Tasks; using Microsoft.TestCommon; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/JsonNetValidationTest.cs b/test/System.Net.Http.Formatting.Test/Formatting/JsonNetValidationTest.cs index 17307b9a..6b8717a1 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/JsonNetValidationTest.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/JsonNetValidationTest.cs @@ -4,8 +4,6 @@ using System.Reflection; using System.Text; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeConstantsTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeConstantsTests.cs index 3d27d968..80edabf7 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeConstantsTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeConstantsTests.cs @@ -2,8 +2,7 @@ using System.Net.Http.Formatting; using System.Net.Http.Headers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterCollectionTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterCollectionTests.cs index fda0798c..d570b57b 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterCollectionTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterCollectionTests.cs @@ -8,9 +8,6 @@ using System.Net.Http.Formatting.Mocks; using System.Net.Http.Headers; using System.Web.Http; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterExtensionsTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterExtensionsTests.cs index 2e28ad8f..a7f17a32 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterExtensionsTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterExtensionsTests.cs @@ -5,8 +5,6 @@ using System.Linq; using System.Net.Http.Formatting.Mocks; using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterMatchTest.cs b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterMatchTest.cs index c4ca445e..d0bfa0c5 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterMatchTest.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterMatchTest.cs @@ -2,8 +2,7 @@ using System.Net.Http.Formatting.Mocks; using System.Net.Http.Headers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterTestBase.cs b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterTestBase.cs index 12fb82ed..17e0d2b8 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterTestBase.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterTestBase.cs @@ -9,9 +9,6 @@ using System.Text; using System.Threading.Tasks; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterTests.cs index 84dbdfaa..21fbe6a9 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterTests.cs @@ -9,9 +9,6 @@ using System.Text; using System.Web.Http; using Microsoft.TestCommon; using Moq; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; -using FactAttribute = Microsoft.TestCommon.WsrFactAttribute; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeHeaderValueExtensionsTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeHeaderValueExtensionsTests.cs index 7be191dd..504316bb 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeHeaderValueExtensionsTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeHeaderValueExtensionsTests.cs @@ -2,8 +2,6 @@ using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeMappingTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeMappingTests.cs index 6f306c10..d316b322 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeMappingTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeMappingTests.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http.Headers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeWithQualityHeaderValueComparerTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeWithQualityHeaderValueComparerTests.cs index 074e7749..d91f7b86 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeWithQualityHeaderValueComparerTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/MediaTypeWithQualityHeaderValueComparerTests.cs @@ -4,9 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/ParsedMediaTypeHeaderValueTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/ParsedMediaTypeHeaderValueTests.cs index e713f117..f16a738c 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/ParsedMediaTypeHeaderValueTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/ParsedMediaTypeHeaderValueTests.cs @@ -2,8 +2,6 @@ using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/FormUrlEncodedParserTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/FormUrlEncodedParserTests.cs index 24e45f96..4ff8b857 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/FormUrlEncodedParserTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/FormUrlEncodedParserTests.cs @@ -5,9 +5,6 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting.Parsers { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpRequestHeaderParserTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpRequestHeaderParserTests.cs index ef85c256..6db1044c 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpRequestHeaderParserTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpRequestHeaderParserTests.cs @@ -5,9 +5,6 @@ using System.Linq; using System.Net.Http.Formatting.DataSets; using System.Text; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting.Parsers { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpRequestLineParserTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpRequestLineParserTests.cs index 6e6d9d2c..c3f84a6f 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpRequestLineParserTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpRequestLineParserTests.cs @@ -3,9 +3,6 @@ using System.Net.Http.Formatting.DataSets; using System.Text; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting.Parsers { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpResponseHeaderParserTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpResponseHeaderParserTests.cs index 9174030d..229a5d30 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpResponseHeaderParserTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpResponseHeaderParserTests.cs @@ -5,9 +5,6 @@ using System.Linq; using System.Net.Http.Formatting.DataSets; using System.Text; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting.Parsers { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpStatusLineParserTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpStatusLineParserTests.cs index dc718b12..5160a40a 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpStatusLineParserTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/HttpStatusLineParserTests.cs @@ -3,9 +3,6 @@ using System.Net.Http.Formatting.DataSets; using System.Text; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting.Parsers { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/InternetMessageFormatHeaderParserTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/InternetMessageFormatHeaderParserTests.cs index 00e0f2e7..cc8aea57 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/InternetMessageFormatHeaderParserTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/InternetMessageFormatHeaderParserTests.cs @@ -5,8 +5,6 @@ using System.Linq; using System.Net.Http.Headers; using System.Text; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting.Parsers { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/MimeMultipartParserTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/MimeMultipartParserTests.cs index 3a11080a..a79d7885 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/Parsers/MimeMultipartParserTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/Parsers/MimeMultipartParserTests.cs @@ -4,9 +4,6 @@ using System.Collections.Generic; using System.IO; using System.Text; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting.Parsers { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/QueryStringMappingTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/QueryStringMappingTests.cs index 7cb02465..cb2a9bae 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/QueryStringMappingTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/QueryStringMappingTests.cs @@ -6,9 +6,6 @@ using System.Net.Http.Formatting.DataSets; using System.Net.Http.Headers; using System.Web.Http; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/RequestHeaderMappingTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/RequestHeaderMappingTests.cs index 6bd8d2ef..c84e1d46 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/RequestHeaderMappingTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/RequestHeaderMappingTests.cs @@ -3,9 +3,6 @@ using System.Net.Http.Formatting.DataSets; using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/SerializerConsistencyTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/SerializerConsistencyTests.cs index 22a25df4..45f61b2f 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/SerializerConsistencyTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/SerializerConsistencyTests.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Net.Http.Formatting; using System.Runtime.Serialization; -using Xunit; +using Microsoft.TestCommon; namespace System.Net.Formatting.Tests { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/StringComparisonHelperTest.cs b/test/System.Net.Http.Formatting.Test/Formatting/StringComparisonHelperTest.cs index 3ada86fa..90670d59 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/StringComparisonHelperTest.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/StringComparisonHelperTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/StringWithQualityHeaderValueComparerTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/StringWithQualityHeaderValueComparerTests.cs index a72ee6cf..8cf48f0b 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/StringWithQualityHeaderValueComparerTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/StringWithQualityHeaderValueComparerTests.cs @@ -4,9 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/XmlHttpRequestHeaderMappingTest.cs b/test/System.Net.Http.Formatting.Test/Formatting/XmlHttpRequestHeaderMappingTest.cs index 3f3216df..cbbafe65 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/XmlHttpRequestHeaderMappingTest.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/XmlHttpRequestHeaderMappingTest.cs @@ -2,9 +2,6 @@ using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/XmlMediaTypeFormatterTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/XmlMediaTypeFormatterTests.cs index 60257029..b853c03c 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/XmlMediaTypeFormatterTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/XmlMediaTypeFormatterTests.cs @@ -10,9 +10,6 @@ using System.Text; using System.Threading.Tasks; using System.Xml.Serialization; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/Formatting/XmlSerializerMediaTypeFormatterTests.cs b/test/System.Net.Http.Formatting.Test/Formatting/XmlSerializerMediaTypeFormatterTests.cs index e0d41122..12095d76 100644 --- a/test/System.Net.Http.Formatting.Test/Formatting/XmlSerializerMediaTypeFormatterTests.cs +++ b/test/System.Net.Http.Formatting.Test/Formatting/XmlSerializerMediaTypeFormatterTests.cs @@ -10,9 +10,6 @@ using System.Text; using System.Threading.Tasks; using System.Xml.Serialization; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Net.Http.Formatting.Test/FormattingUtilitiesTests.cs b/test/System.Net.Http.Formatting.Test/FormattingUtilitiesTests.cs index 4e0f00f1..ed1aa87f 100644 --- a/test/System.Net.Http.Formatting.Test/FormattingUtilitiesTests.cs +++ b/test/System.Net.Http.Formatting.Test/FormattingUtilitiesTests.cs @@ -4,9 +4,6 @@ using System.Linq; using System.Net.Http.Headers; using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/Handlers/HttpProgressEventArgsTest.cs b/test/System.Net.Http.Formatting.Test/Handlers/HttpProgressEventArgsTest.cs index 1b194bcc..3ad76a0c 100644 --- a/test/System.Net.Http.Formatting.Test/Handlers/HttpProgressEventArgsTest.cs +++ b/test/System.Net.Http.Formatting.Test/Handlers/HttpProgressEventArgsTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http.Handlers { diff --git a/test/System.Net.Http.Formatting.Test/Handlers/ProgressContentTest.cs b/test/System.Net.Http.Formatting.Test/Handlers/ProgressContentTest.cs index ebb764d3..0111d65c 100644 --- a/test/System.Net.Http.Formatting.Test/Handlers/ProgressContentTest.cs +++ b/test/System.Net.Http.Formatting.Test/Handlers/ProgressContentTest.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http.Handlers { diff --git a/test/System.Net.Http.Formatting.Test/Handlers/ProgressMessageHandlerTest.cs b/test/System.Net.Http.Formatting.Test/Handlers/ProgressMessageHandlerTest.cs index 29a6bce0..520449d7 100644 --- a/test/System.Net.Http.Formatting.Test/Handlers/ProgressMessageHandlerTest.cs +++ b/test/System.Net.Http.Formatting.Test/Handlers/ProgressMessageHandlerTest.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Net.Http.Handlers { diff --git a/test/System.Net.Http.Formatting.Test/Handlers/ProgressStreamTest.cs b/test/System.Net.Http.Formatting.Test/Handlers/ProgressStreamTest.cs index 994ff2ba..0b29d933 100644 --- a/test/System.Net.Http.Formatting.Test/Handlers/ProgressStreamTest.cs +++ b/test/System.Net.Http.Formatting.Test/Handlers/ProgressStreamTest.cs @@ -3,8 +3,8 @@ using System.IO; using System.Text; using System.Threading; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Net.Http.Handlers { diff --git a/test/System.Net.Http.Formatting.Test/Handlers/ProgressWriteAsyncResultTest.cs b/test/System.Net.Http.Formatting.Test/Handlers/ProgressWriteAsyncResultTest.cs index d02080d9..842286cc 100644 --- a/test/System.Net.Http.Formatting.Test/Handlers/ProgressWriteAsyncResultTest.cs +++ b/test/System.Net.Http.Formatting.Test/Handlers/ProgressWriteAsyncResultTest.cs @@ -2,10 +2,8 @@ using System.IO; using System.Text; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Handlers { diff --git a/test/System.Net.Http.Formatting.Test/Headers/CookieHeaderValueTest.cs b/test/System.Net.Http.Formatting.Test/Headers/CookieHeaderValueTest.cs index b6ee44eb..7abbbd32 100644 --- a/test/System.Net.Http.Formatting.Test/Headers/CookieHeaderValueTest.cs +++ b/test/System.Net.Http.Formatting.Test/Headers/CookieHeaderValueTest.cs @@ -2,9 +2,6 @@ using System.Collections.Specialized; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Headers { diff --git a/test/System.Net.Http.Formatting.Test/Headers/CookieStateTest.cs b/test/System.Net.Http.Formatting.Test/Headers/CookieStateTest.cs index cfee172c..d04e6b16 100644 --- a/test/System.Net.Http.Formatting.Test/Headers/CookieStateTest.cs +++ b/test/System.Net.Http.Formatting.Test/Headers/CookieStateTest.cs @@ -2,9 +2,6 @@ using System.Collections.Specialized; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Headers { diff --git a/test/System.Net.Http.Formatting.Test/HttpClientExtensionsTest.cs b/test/System.Net.Http.Formatting.Test/HttpClientExtensionsTest.cs index 4d5d1bb7..d793ddfa 100644 --- a/test/System.Net.Http.Formatting.Test/HttpClientExtensionsTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpClientExtensionsTest.cs @@ -6,9 +6,8 @@ using System.Net.Http.Headers; using System.Net.Http.Mocks; using System.Threading; using System.Threading.Tasks; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpClientFactoryTest.cs b/test/System.Net.Http.Formatting.Test/HttpClientFactoryTest.cs index 17dd9aab..d2791686 100644 --- a/test/System.Net.Http.Formatting.Test/HttpClientFactoryTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpClientFactoryTest.cs @@ -3,9 +3,6 @@ using System.Collections.Generic; using System.Net.Http.Mocks; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpContentExtensionsTest.cs b/test/System.Net.Http.Formatting.Test/HttpContentExtensionsTest.cs index 0ce10a62..429b3d85 100644 --- a/test/System.Net.Http.Formatting.Test/HttpContentExtensionsTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpContentExtensionsTest.cs @@ -6,9 +6,8 @@ using System.Linq; using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Threading.Tasks; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpContentFormDataExtensionsTest.cs b/test/System.Net.Http.Formatting.Test/HttpContentFormDataExtensionsTest.cs index c59a4931..d61048c3 100644 --- a/test/System.Net.Http.Formatting.Test/HttpContentFormDataExtensionsTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpContentFormDataExtensionsTest.cs @@ -6,9 +6,6 @@ using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpContentMessageExtensionsTests.cs b/test/System.Net.Http.Formatting.Test/HttpContentMessageExtensionsTests.cs index 0fd1c84f..14cec1fc 100644 --- a/test/System.Net.Http.Formatting.Test/HttpContentMessageExtensionsTests.cs +++ b/test/System.Net.Http.Formatting.Test/HttpContentMessageExtensionsTests.cs @@ -5,9 +5,6 @@ using System.IO; using System.Linq; using System.Text; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpContentMultipartExtensionsTests.cs b/test/System.Net.Http.Formatting.Test/HttpContentMultipartExtensionsTests.cs index cc9d56df..c8dcf60e 100644 --- a/test/System.Net.Http.Formatting.Test/HttpContentMultipartExtensionsTests.cs +++ b/test/System.Net.Http.Formatting.Test/HttpContentMultipartExtensionsTests.cs @@ -7,10 +7,6 @@ using System.Net.Http.Formatting.Parsers; using System.Net.Http.Headers; using System.Text; using Microsoft.TestCommon; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; -using FactAttribute = Microsoft.TestCommon.WsrFactAttribute; -using TheoryAttribute = Microsoft.TestCommon.WsrTheoryAttribute; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpHeaderExtensionsTest.cs b/test/System.Net.Http.Formatting.Test/HttpHeaderExtensionsTest.cs index 57c2df03..05b6b037 100644 --- a/test/System.Net.Http.Formatting.Test/HttpHeaderExtensionsTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpHeaderExtensionsTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http.Headers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpMessageContentTests.cs b/test/System.Net.Http.Formatting.Test/HttpMessageContentTests.cs index 6e049391..2220863b 100644 --- a/test/System.Net.Http.Formatting.Test/HttpMessageContentTests.cs +++ b/test/System.Net.Http.Formatting.Test/HttpMessageContentTests.cs @@ -3,8 +3,6 @@ using System.Net.Http.Headers; using System.Threading.Tasks; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpRequestHeadersExtensionsTest.cs b/test/System.Net.Http.Formatting.Test/HttpRequestHeadersExtensionsTest.cs index 4bba2354..6fa931de 100644 --- a/test/System.Net.Http.Formatting.Test/HttpRequestHeadersExtensionsTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpRequestHeadersExtensionsTest.cs @@ -4,10 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; -using FactAttribute = Microsoft.TestCommon.WsrFactAttribute; -using TheoryAttribute = Microsoft.TestCommon.WsrTheoryAttribute; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpRequestMessageCommonExtensionsTest.cs b/test/System.Net.Http.Formatting.Test/HttpRequestMessageCommonExtensionsTest.cs index 7cdb49f2..2eb80b66 100644 --- a/test/System.Net.Http.Formatting.Test/HttpRequestMessageCommonExtensionsTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpRequestMessageCommonExtensionsTest.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpResponseHeadersExtensionsTest.cs b/test/System.Net.Http.Formatting.Test/HttpResponseHeadersExtensionsTest.cs index 2b54124e..2da750ff 100644 --- a/test/System.Net.Http.Formatting.Test/HttpResponseHeadersExtensionsTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpResponseHeadersExtensionsTest.cs @@ -3,10 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http.Headers; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; -using FactAttribute = Microsoft.TestCommon.WsrFactAttribute; -using TheoryAttribute = Microsoft.TestCommon.WsrTheoryAttribute; +using Microsoft.TestCommon; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpUnsortedRequestTest.cs b/test/System.Net.Http.Formatting.Test/HttpUnsortedRequestTest.cs index 7b61382f..f897b176 100644 --- a/test/System.Net.Http.Formatting.Test/HttpUnsortedRequestTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpUnsortedRequestTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/HttpUnsortedResponseTest.cs b/test/System.Net.Http.Formatting.Test/HttpUnsortedResponseTest.cs index 2afc75ad..301e47a6 100644 --- a/test/System.Net.Http.Formatting.Test/HttpUnsortedResponseTest.cs +++ b/test/System.Net.Http.Formatting.Test/HttpUnsortedResponseTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/Internal/AsyncResultTest.cs b/test/System.Net.Http.Formatting.Test/Internal/AsyncResultTest.cs index 31a63577..bb6a5790 100644 --- a/test/System.Net.Http.Formatting.Test/Internal/AsyncResultTest.cs +++ b/test/System.Net.Http.Formatting.Test/Internal/AsyncResultTest.cs @@ -1,11 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http.Internal; -using System.Threading; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Net.Http.Formatting.Test/Internal/DelegatingStreamTest.cs b/test/System.Net.Http.Formatting.Test/Internal/DelegatingStreamTest.cs index 32e16809..304de047 100644 --- a/test/System.Net.Http.Formatting.Test/Internal/DelegatingStreamTest.cs +++ b/test/System.Net.Http.Formatting.Test/Internal/DelegatingStreamTest.cs @@ -2,10 +2,9 @@ using System.IO; using System.Net.Http.Mocks; +using Microsoft.TestCommon; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Internal { diff --git a/test/System.Net.Http.Formatting.Test/Internal/HttpValueCollectionTest.cs b/test/System.Net.Http.Formatting.Test/Internal/HttpValueCollectionTest.cs index 076ad46e..5e2a0582 100644 --- a/test/System.Net.Http.Formatting.Test/Internal/HttpValueCollectionTest.cs +++ b/test/System.Net.Http.Formatting.Test/Internal/HttpValueCollectionTest.cs @@ -5,9 +5,6 @@ using System.Collections.Specialized; using System.Linq; using System.Net.Http.Formatting.Internal; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Internal { diff --git a/test/System.Net.Http.Formatting.Test/Internal/NonClosingDelegatingStreamTest.cs b/test/System.Net.Http.Formatting.Test/Internal/NonClosingDelegatingStreamTest.cs index f6af0fe6..b3024f3e 100644 --- a/test/System.Net.Http.Formatting.Test/Internal/NonClosingDelegatingStreamTest.cs +++ b/test/System.Net.Http.Formatting.Test/Internal/NonClosingDelegatingStreamTest.cs @@ -2,10 +2,9 @@ using System.IO; using System.Net.Http.Mocks; +using Microsoft.TestCommon; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Internal { diff --git a/test/System.Net.Http.Formatting.Test/Internal/ReadOnlyStreamWithEncodingPreambleTest.cs b/test/System.Net.Http.Formatting.Test/Internal/ReadOnlyStreamWithEncodingPreambleTest.cs index c713d4a2..4ccb2455 100644 --- a/test/System.Net.Http.Formatting.Test/Internal/ReadOnlyStreamWithEncodingPreambleTest.cs +++ b/test/System.Net.Http.Formatting.Test/Internal/ReadOnlyStreamWithEncodingPreambleTest.cs @@ -5,8 +5,6 @@ using System.IO; using System.Reflection; using System.Text; using Microsoft.TestCommon; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Internal { diff --git a/test/System.Net.Http.Formatting.Test/MimeBodyPartTest.cs b/test/System.Net.Http.Formatting.Test/MimeBodyPartTest.cs index 4e201d93..a5b6d1c0 100644 --- a/test/System.Net.Http.Formatting.Test/MimeBodyPartTest.cs +++ b/test/System.Net.Http.Formatting.Test/MimeBodyPartTest.cs @@ -4,9 +4,6 @@ using System.IO; using System.Net.Http.Headers; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/MultipartFileDataTest.cs b/test/System.Net.Http.Formatting.Test/MultipartFileDataTest.cs index 4ee56387..2dff2830 100644 --- a/test/System.Net.Http.Formatting.Test/MultipartFileDataTest.cs +++ b/test/System.Net.Http.Formatting.Test/MultipartFileDataTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http.Headers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/MultipartFileStreamProviderTests.cs b/test/System.Net.Http.Formatting.Test/MultipartFileStreamProviderTests.cs index 7c5f35af..ae8b9360 100644 --- a/test/System.Net.Http.Formatting.Test/MultipartFileStreamProviderTests.cs +++ b/test/System.Net.Http.Formatting.Test/MultipartFileStreamProviderTests.cs @@ -3,9 +3,6 @@ using System.IO; using System.Linq; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/MultipartFormDataStreamProviderTests.cs b/test/System.Net.Http.Formatting.Test/MultipartFormDataStreamProviderTests.cs index ce88521a..88266e7b 100644 --- a/test/System.Net.Http.Formatting.Test/MultipartFormDataStreamProviderTests.cs +++ b/test/System.Net.Http.Formatting.Test/MultipartFormDataStreamProviderTests.cs @@ -4,8 +4,7 @@ using System.IO; using System.Linq; using System.Net.Http.Headers; using System.Threading.Tasks; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/MultipartMemoryStreamProviderTests.cs b/test/System.Net.Http.Formatting.Test/MultipartMemoryStreamProviderTests.cs index 8678416d..d8790dc7 100644 --- a/test/System.Net.Http.Formatting.Test/MultipartMemoryStreamProviderTests.cs +++ b/test/System.Net.Http.Formatting.Test/MultipartMemoryStreamProviderTests.cs @@ -2,8 +2,7 @@ using System.IO; using System.Net.Http.Headers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/MultipartRelatedStreamProviderTests.cs b/test/System.Net.Http.Formatting.Test/MultipartRelatedStreamProviderTests.cs index 7babd001..89fd7ba3 100644 --- a/test/System.Net.Http.Formatting.Test/MultipartRelatedStreamProviderTests.cs +++ b/test/System.Net.Http.Formatting.Test/MultipartRelatedStreamProviderTests.cs @@ -2,9 +2,6 @@ using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/MultipartStreamProviderTestBase.cs b/test/System.Net.Http.Formatting.Test/MultipartStreamProviderTestBase.cs index 65773094..b327ba56 100644 --- a/test/System.Net.Http.Formatting.Test/MultipartStreamProviderTestBase.cs +++ b/test/System.Net.Http.Formatting.Test/MultipartStreamProviderTestBase.cs @@ -3,8 +3,7 @@ using System.Collections.ObjectModel; using System.Net.Http.Headers; using System.Threading.Tasks; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/ObjectContentOfTTests.cs b/test/System.Net.Http.Formatting.Test/ObjectContentOfTTests.cs index 60ca96a1..bd8e5ecc 100644 --- a/test/System.Net.Http.Formatting.Test/ObjectContentOfTTests.cs +++ b/test/System.Net.Http.Formatting.Test/ObjectContentOfTTests.cs @@ -2,9 +2,8 @@ using System.Net.Http.Formatting; using System.Net.Http.Headers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/ObjectContentTests.cs b/test/System.Net.Http.Formatting.Test/ObjectContentTests.cs index 459d3175..aae05560 100644 --- a/test/System.Net.Http.Formatting.Test/ObjectContentTests.cs +++ b/test/System.Net.Http.Formatting.Test/ObjectContentTests.cs @@ -7,9 +7,6 @@ using System.Net.Http.Headers; using System.Threading.Tasks; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/PushStreamContentTest.cs b/test/System.Net.Http.Formatting.Test/PushStreamContentTest.cs index 2dbcf9b2..17c895c1 100644 --- a/test/System.Net.Http.Formatting.Test/PushStreamContentTest.cs +++ b/test/System.Net.Http.Formatting.Test/PushStreamContentTest.cs @@ -3,10 +3,9 @@ using System.IO; using System.Net.Http.Formatting; using System.Threading.Tasks; +using Microsoft.TestCommon; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Net.Http.Formatting.Test/UriExtensionsTests.cs b/test/System.Net.Http.Formatting.Test/UriExtensionsTests.cs index f467e370..335c6c30 100644 --- a/test/System.Net.Http.Formatting.Test/UriExtensionsTests.cs +++ b/test/System.Net.Http.Formatting.Test/UriExtensionsTests.cs @@ -4,9 +4,6 @@ using System.Collections.Specialized; using System.Net.Http.Formatting.DataSets; using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Web.Helpers.Test/ChartTest.cs b/test/System.Web.Helpers.Test/ChartTest.cs index 5fa7d9a4..0d295a94 100644 --- a/test/System.Web.Helpers.Test/ChartTest.cs +++ b/test/System.Web.Helpers.Test/ChartTest.cs @@ -5,9 +5,8 @@ using System.Drawing; using System.IO; using System.Web.Hosting; using System.Web.UI.DataVisualization.Charting; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/ConversionUtilTest.cs b/test/System.Web.Helpers.Test/ConversionUtilTest.cs index 171ac92d..b2181a24 100644 --- a/test/System.Web.Helpers.Test/ConversionUtilTest.cs +++ b/test/System.Web.Helpers.Test/ConversionUtilTest.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Globalization; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/CryptoTest.cs b/test/System.Web.Helpers.Test/CryptoTest.cs index 3f09282d..05ecf93e 100644 --- a/test/System.Web.Helpers.Test/CryptoTest.cs +++ b/test/System.Web.Helpers.Test/CryptoTest.cs @@ -3,8 +3,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/DynamicHelperTest.cs b/test/System.Web.Helpers.Test/DynamicHelperTest.cs index 07393f27..72b82962 100644 --- a/test/System.Web.Helpers.Test/DynamicHelperTest.cs +++ b/test/System.Web.Helpers.Test/DynamicHelperTest.cs @@ -2,7 +2,7 @@ using System.Dynamic; using Microsoft.Internal.Web.Utils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/HelperResultTest.cs b/test/System.Web.Helpers.Test/HelperResultTest.cs index cb0d11ce..b5d42b31 100644 --- a/test/System.Web.Helpers.Test/HelperResultTest.cs +++ b/test/System.Web.Helpers.Test/HelperResultTest.cs @@ -2,8 +2,7 @@ using System.IO; using System.Web.WebPages; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/JsonTest.cs b/test/System.Web.Helpers.Test/JsonTest.cs index f81ebbe1..a5f3d99f 100644 --- a/test/System.Web.Helpers.Test/JsonTest.cs +++ b/test/System.Web.Helpers.Test/JsonTest.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Dynamic; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/ObjectInfoTest.cs b/test/System.Web.Helpers.Test/ObjectInfoTest.cs index 56ef566e..34bccffc 100644 --- a/test/System.Web.Helpers.Test/ObjectInfoTest.cs +++ b/test/System.Web.Helpers.Test/ObjectInfoTest.cs @@ -6,8 +6,7 @@ using System.Collections.Specialized; using System.Dynamic; using System.Linq; using System.Web.TestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/PreComputedGridDataSourceTest.cs b/test/System.Web.Helpers.Test/PreComputedGridDataSourceTest.cs index 482d48a1..d8641401 100644 --- a/test/System.Web.Helpers.Test/PreComputedGridDataSourceTest.cs +++ b/test/System.Web.Helpers.Test/PreComputedGridDataSourceTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/ServerInfoTest.cs b/test/System.Web.Helpers.Test/ServerInfoTest.cs index 4004b8e9..fc8214b2 100644 --- a/test/System.Web.Helpers.Test/ServerInfoTest.cs +++ b/test/System.Web.Helpers.Test/ServerInfoTest.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Web.WebPages.TestUtils; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/WebCacheTest.cs b/test/System.Web.Helpers.Test/WebCacheTest.cs index 430e8b3b..26d16848 100644 --- a/test/System.Web.Helpers.Test/WebCacheTest.cs +++ b/test/System.Web.Helpers.Test/WebCacheTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/WebGridDataSourceTest.cs b/test/System.Web.Helpers.Test/WebGridDataSourceTest.cs index 3a6ae3d2..cd850ea5 100644 --- a/test/System.Web.Helpers.Test/WebGridDataSourceTest.cs +++ b/test/System.Web.Helpers.Test/WebGridDataSourceTest.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Dynamic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/WebGridTest.cs b/test/System.Web.Helpers.Test/WebGridTest.cs index e1e461c8..17587a17 100644 --- a/test/System.Web.Helpers.Test/WebGridTest.cs +++ b/test/System.Web.Helpers.Test/WebGridTest.cs @@ -10,8 +10,6 @@ using System.Web.TestUtil; using System.Web.WebPages; using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/WebImageTest.cs b/test/System.Web.Helpers.Test/WebImageTest.cs index 81b024cd..94b4f9e6 100644 --- a/test/System.Web.Helpers.Test/WebImageTest.cs +++ b/test/System.Web.Helpers.Test/WebImageTest.cs @@ -4,9 +4,8 @@ using System.Drawing; using System.Drawing.Imaging; using System.IO; using System.Web.WebPages.TestUtils; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/WebMailTest.cs b/test/System.Web.Helpers.Test/WebMailTest.cs index 86f46dc4..499d098e 100644 --- a/test/System.Web.Helpers.Test/WebMailTest.cs +++ b/test/System.Web.Helpers.Test/WebMailTest.cs @@ -6,8 +6,7 @@ using System.Net.Mail; using System.Text; using System.Web.WebPages.Scope; using System.Web.WebPages.TestUtils; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Helpers.Test/XhtmlAssert.cs b/test/System.Web.Helpers.Test/XhtmlAssert.cs index 6bd3f404..21dd5fe5 100644 --- a/test/System.Web.Helpers.Test/XhtmlAssert.cs +++ b/test/System.Web.Helpers.Test/XhtmlAssert.cs @@ -7,7 +7,7 @@ using System.Text.RegularExpressions; using System.Web.WebPages; using System.Xml; using System.Xml.Resolvers; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.Http.Integration.Test/ApiExplorer/ApiExplorerSettingsTest.cs b/test/System.Web.Http.Integration.Test/ApiExplorer/ApiExplorerSettingsTest.cs index c677bcdb..0c34bed3 100644 --- a/test/System.Web.Http.Integration.Test/ApiExplorer/ApiExplorerSettingsTest.cs +++ b/test/System.Web.Http.Integration.Test/ApiExplorer/ApiExplorerSettingsTest.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Net.Http; using System.Web.Http.Description; using System.Web.Http.Dispatcher; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.ApiExplorer { diff --git a/test/System.Web.Http.Integration.Test/ApiExplorer/DocumentationTest.cs b/test/System.Web.Http.Integration.Test/ApiExplorer/DocumentationTest.cs index c28af30e..47bfafa4 100644 --- a/test/System.Web.Http.Integration.Test/ApiExplorer/DocumentationTest.cs +++ b/test/System.Web.Http.Integration.Test/ApiExplorer/DocumentationTest.cs @@ -3,7 +3,7 @@ using System.Web.Http.Description; using System.Web.Http.Dispatcher; using System.Web.Http.Properties; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ApiExplorer { diff --git a/test/System.Web.Http.Integration.Test/ApiExplorer/FormattersTest.cs b/test/System.Web.Http.Integration.Test/ApiExplorer/FormattersTest.cs index 2294fd8b..a2e5199b 100644 --- a/test/System.Web.Http.Integration.Test/ApiExplorer/FormattersTest.cs +++ b/test/System.Web.Http.Integration.Test/ApiExplorer/FormattersTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Web.Http.Description; using System.Web.Http.Dispatcher; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ApiExplorer { diff --git a/test/System.Web.Http.Integration.Test/ApiExplorer/ParameterSourceTest.cs b/test/System.Web.Http.Integration.Test/ApiExplorer/ParameterSourceTest.cs index d0101393..4970365e 100644 --- a/test/System.Web.Http.Integration.Test/ApiExplorer/ParameterSourceTest.cs +++ b/test/System.Web.Http.Integration.Test/ApiExplorer/ParameterSourceTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Web.Http.Description; using System.Web.Http.Dispatcher; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ApiExplorer { diff --git a/test/System.Web.Http.Integration.Test/ApiExplorer/RouteConstraintsTest.cs b/test/System.Web.Http.Integration.Test/ApiExplorer/RouteConstraintsTest.cs index 1b730b80..998f9e4c 100644 --- a/test/System.Web.Http.Integration.Test/ApiExplorer/RouteConstraintsTest.cs +++ b/test/System.Web.Http.Integration.Test/ApiExplorer/RouteConstraintsTest.cs @@ -5,7 +5,7 @@ using System.Net.Http; using System.Web.Http.Description; using System.Web.Http.Dispatcher; using System.Web.Http.Routing; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.ApiExplorer { diff --git a/test/System.Web.Http.Integration.Test/ApiExplorer/RoutesTest.cs b/test/System.Web.Http.Integration.Test/ApiExplorer/RoutesTest.cs index 401fb9f1..d72e09e6 100644 --- a/test/System.Web.Http.Integration.Test/ApiExplorer/RoutesTest.cs +++ b/test/System.Web.Http.Integration.Test/ApiExplorer/RoutesTest.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Net.Http; using System.Web.Http.Description; using System.Web.Http.Dispatcher; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.ApiExplorer { diff --git a/test/System.Web.Http.Integration.Test/ContentNegotiation/AcceptHeaderTests.cs b/test/System.Web.Http.Integration.Test/ContentNegotiation/AcceptHeaderTests.cs index 537646c0..11fdeb03 100644 --- a/test/System.Web.Http.Integration.Test/ContentNegotiation/AcceptHeaderTests.cs +++ b/test/System.Web.Http.Integration.Test/ContentNegotiation/AcceptHeaderTests.cs @@ -2,8 +2,7 @@ using System.Net.Http; using System.Net.Http.Headers; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.ContentNegotiation { diff --git a/test/System.Web.Http.Integration.Test/ContentNegotiation/CustomFormatterTests.cs b/test/System.Web.Http.Integration.Test/ContentNegotiation/CustomFormatterTests.cs index 78a97582..6e9875fe 100644 --- a/test/System.Web.Http.Integration.Test/ContentNegotiation/CustomFormatterTests.cs +++ b/test/System.Web.Http.Integration.Test/ContentNegotiation/CustomFormatterTests.cs @@ -10,7 +10,7 @@ using System.Net.Http.Headers; using System.Threading.Tasks; using System.Web.Http.SelfHost; using System.Web.Http.Util; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ContentNegotiation { diff --git a/test/System.Web.Http.Integration.Test/ContentNegotiation/DefaultContentNegotiatorTests.cs b/test/System.Web.Http.Integration.Test/ContentNegotiation/DefaultContentNegotiatorTests.cs index 1757d091..e4f0f941 100644 --- a/test/System.Web.Http.Integration.Test/ContentNegotiation/DefaultContentNegotiatorTests.cs +++ b/test/System.Web.Http.Integration.Test/ContentNegotiation/DefaultContentNegotiatorTests.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.Net.Http; using System.Net.Http.Formatting; using System.Net.Http.Headers; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ContentNegotiation { diff --git a/test/System.Web.Http.Integration.Test/ContentNegotiation/HttpResponseReturnTests.cs b/test/System.Web.Http.Integration.Test/ContentNegotiation/HttpResponseReturnTests.cs index 8ef79f55..6afe1854 100644 --- a/test/System.Web.Http.Integration.Test/ContentNegotiation/HttpResponseReturnTests.cs +++ b/test/System.Web.Http.Integration.Test/ContentNegotiation/HttpResponseReturnTests.cs @@ -7,8 +7,7 @@ using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Web.Http.SelfHost; using System.Web.Http.Util; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.ContentNegotiation { diff --git a/test/System.Web.Http.Integration.Test/Controllers/ActionAttributesTest.cs b/test/System.Web.Http.Integration.Test/Controllers/ActionAttributesTest.cs index fe06c142..02a77a51 100644 --- a/test/System.Web.Http.Integration.Test/Controllers/ActionAttributesTest.cs +++ b/test/System.Web.Http.Integration.Test/Controllers/ActionAttributesTest.cs @@ -3,8 +3,7 @@ using System.Net; using System.Net.Http; using System.Web.Http.Controllers; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http { diff --git a/test/System.Web.Http.Integration.Test/Controllers/ActionReachabilityTest.cs b/test/System.Web.Http.Integration.Test/Controllers/ActionReachabilityTest.cs index 5436d761..cccb14f3 100644 --- a/test/System.Web.Http.Integration.Test/Controllers/ActionReachabilityTest.cs +++ b/test/System.Web.Http.Integration.Test/Controllers/ActionReachabilityTest.cs @@ -2,8 +2,7 @@ using System.Net; using System.Net.Http; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http { diff --git a/test/System.Web.Http.Integration.Test/Controllers/ApiControllerActionSelectorTest.cs b/test/System.Web.Http.Integration.Test/Controllers/ApiControllerActionSelectorTest.cs index 603d7ede..5fc522af 100644 --- a/test/System.Web.Http.Integration.Test/Controllers/ApiControllerActionSelectorTest.cs +++ b/test/System.Web.Http.Integration.Test/Controllers/ApiControllerActionSelectorTest.cs @@ -4,9 +4,7 @@ using System.Net; using System.Net.Http; using System.Web.Http.Controllers; using System.Web.Http.ValueProviders; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http { diff --git a/test/System.Web.Http.Integration.Test/Controllers/ControllerConfigurationTest.cs b/test/System.Web.Http.Integration.Test/Controllers/ControllerConfigurationTest.cs index 62e40d30..819df9f5 100644 --- a/test/System.Web.Http.Integration.Test/Controllers/ControllerConfigurationTest.cs +++ b/test/System.Web.Http.Integration.Test/Controllers/ControllerConfigurationTest.cs @@ -2,8 +2,7 @@ using System.Net; using System.Net.Http; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http { diff --git a/test/System.Web.Http.Integration.Test/ExceptionHandling/ExceptionHandlingTest.cs b/test/System.Web.Http.Integration.Test/ExceptionHandling/ExceptionHandlingTest.cs index 272eef05..0988d771 100644 --- a/test/System.Web.Http.Integration.Test/ExceptionHandling/ExceptionHandlingTest.cs +++ b/test/System.Web.Http.Integration.Test/ExceptionHandling/ExceptionHandlingTest.cs @@ -2,11 +2,9 @@ using System.Net; using System.Net.Http; -using System.Web.Http.Dispatcher; using System.Web.Http.Properties; +using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http { diff --git a/test/System.Web.Http.Integration.Test/ExceptionHandling/HttpResponseExceptionTest.cs b/test/System.Web.Http.Integration.Test/ExceptionHandling/HttpResponseExceptionTest.cs index 99f4790b..fa24b7ad 100644 --- a/test/System.Web.Http.Integration.Test/ExceptionHandling/HttpResponseExceptionTest.cs +++ b/test/System.Web.Http.Integration.Test/ExceptionHandling/HttpResponseExceptionTest.cs @@ -11,8 +11,7 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.ExceptionHandling { diff --git a/test/System.Web.Http.Integration.Test/ExceptionHandling/IncludeErrorDetailTest.cs b/test/System.Web.Http.Integration.Test/ExceptionHandling/IncludeErrorDetailTest.cs index 9013d8a3..5fd6b69b 100644 --- a/test/System.Web.Http.Integration.Test/ExceptionHandling/IncludeErrorDetailTest.cs +++ b/test/System.Web.Http.Integration.Test/ExceptionHandling/IncludeErrorDetailTest.cs @@ -4,8 +4,6 @@ using System.Net; using System.Net.Http; using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http { diff --git a/test/System.Web.Http.Integration.Test/ModelBinding/BodyBindingTests.cs b/test/System.Web.Http.Integration.Test/ModelBinding/BodyBindingTests.cs index b82ecfb5..4893939f 100644 --- a/test/System.Web.Http.Integration.Test/ModelBinding/BodyBindingTests.cs +++ b/test/System.Web.Http.Integration.Test/ModelBinding/BodyBindingTests.cs @@ -6,8 +6,7 @@ using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Text; using System.Web.Http.Properties; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Integration.Test/ModelBinding/CustomBindingTests.cs b/test/System.Web.Http.Integration.Test/ModelBinding/CustomBindingTests.cs index 7c972b01..a3a1f34a 100644 --- a/test/System.Web.Http.Integration.Test/ModelBinding/CustomBindingTests.cs +++ b/test/System.Web.Http.Integration.Test/ModelBinding/CustomBindingTests.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Integration.Test/ModelBinding/DefaultActionValueBinderTest.cs b/test/System.Web.Http.Integration.Test/ModelBinding/DefaultActionValueBinderTest.cs index ddf11699..c093fab8 100644 --- a/test/System.Web.Http.Integration.Test/ModelBinding/DefaultActionValueBinderTest.cs +++ b/test/System.Web.Http.Integration.Test/ModelBinding/DefaultActionValueBinderTest.cs @@ -16,7 +16,6 @@ using System.Web.Http.ValueProviders; using Microsoft.TestCommon; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Xunit; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Integration.Test/ModelBinding/HttpContentBindingTests.cs b/test/System.Web.Http.Integration.Test/ModelBinding/HttpContentBindingTests.cs index 79753af9..89e334a3 100644 --- a/test/System.Web.Http.Integration.Test/ModelBinding/HttpContentBindingTests.cs +++ b/test/System.Web.Http.Integration.Test/ModelBinding/HttpContentBindingTests.cs @@ -6,8 +6,7 @@ using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Web.Http.SelfHost; using System.Web.Http.Util; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Integration.Test/ModelBinding/ModelBindingController.cs b/test/System.Web.Http.Integration.Test/ModelBinding/ModelBindingController.cs index bbe2434a..5ec9353b 100644 --- a/test/System.Web.Http.Integration.Test/ModelBinding/ModelBindingController.cs +++ b/test/System.Web.Http.Integration.Test/ModelBinding/ModelBindingController.cs @@ -11,7 +11,7 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.ValueProviders; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Integration.Test/ModelBinding/QueryStringBindingTests.cs b/test/System.Web.Http.Integration.Test/ModelBinding/QueryStringBindingTests.cs index e11f32cd..a2c22594 100644 --- a/test/System.Web.Http.Integration.Test/ModelBinding/QueryStringBindingTests.cs +++ b/test/System.Web.Http.Integration.Test/ModelBinding/QueryStringBindingTests.cs @@ -2,8 +2,7 @@ using System.Linq; using System.Net.Http; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Integration.Test/ModelBinding/RouteBindingTests.cs b/test/System.Web.Http.Integration.Test/ModelBinding/RouteBindingTests.cs index 48577e4c..d9dc05d1 100644 --- a/test/System.Web.Http.Integration.Test/ModelBinding/RouteBindingTests.cs +++ b/test/System.Web.Http.Integration.Test/ModelBinding/RouteBindingTests.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Integration.Test/PartialTrust/BasicScenarioTest.cs b/test/System.Web.Http.Integration.Test/PartialTrust/BasicScenarioTest.cs index 0134af0c..737160cd 100644 --- a/test/System.Web.Http.Integration.Test/PartialTrust/BasicScenarioTest.cs +++ b/test/System.Web.Http.Integration.Test/PartialTrust/BasicScenarioTest.cs @@ -3,8 +3,6 @@ using System.Net.Http; using System.Net.Http.Headers; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http.PartialTrust { @@ -46,7 +44,7 @@ namespace System.Web.Http.PartialTrust } } - [RunWith(typeof(PartialTrustRunner))] + [PartialTrustRunner] public class PartialTrustBasicScenarioTest : BasicScenarioTest { } public class EchoController : ApiController diff --git a/test/System.Web.Http.Integration.Test/Tracing/TracingTest.cs b/test/System.Web.Http.Integration.Test/Tracing/TracingTest.cs index aa1f950a..4f144724 100644 --- a/test/System.Web.Http.Integration.Test/Tracing/TracingTest.cs +++ b/test/System.Web.Http.Integration.Test/Tracing/TracingTest.cs @@ -6,8 +6,6 @@ using System.Net; using System.Net.Http; using System.Web.Http.Tracing; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Integration.Test/Util/ApiExplorerHelper.cs b/test/System.Web.Http.Integration.Test/Util/ApiExplorerHelper.cs index dae1226c..5855c2d8 100644 --- a/test/System.Web.Http.Integration.Test/Util/ApiExplorerHelper.cs +++ b/test/System.Web.Http.Integration.Test/Util/ApiExplorerHelper.cs @@ -7,8 +7,8 @@ using System.Net.Http; using System.Web.Http.Controllers; using System.Web.Http.Description; using System.Web.Http.Dispatcher; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ApiExplorer { diff --git a/test/System.Web.Http.OData.Test/BaselineResource.Designer.cs b/test/System.Web.Http.OData.Test/BaselineResource.Designer.cs index b30d0814..793806aa 100644 --- a/test/System.Web.Http.OData.Test/BaselineResource.Designer.cs +++ b/test/System.Web.Http.OData.Test/BaselineResource.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace System.Web.Http.OData { - using System; - - +namespace System.Web.Http.OData +{ + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// diff --git a/test/System.Web.Http.OData.Test/HttpConfigurationExtensionTests.cs b/test/System.Web.Http.OData.Test/HttpConfigurationExtensionTests.cs index 81f1dd74..320138d5 100644 --- a/test/System.Web.Http.OData.Test/HttpConfigurationExtensionTests.cs +++ b/test/System.Web.Http.OData.Test/HttpConfigurationExtensionTests.cs @@ -3,7 +3,7 @@ using System.Web.Http.OData.Builder; using System.Web.Http.OData.TestCommon.Models; using Microsoft.Data.Edm; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/ComplexTypeTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/ComplexTypeTest.cs index 14a7348b..97cebc79 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/ComplexTypeTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/ComplexTypeTest.cs @@ -4,8 +4,7 @@ using System.IO; using System.Linq; using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.Edm; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/Conventions/ConventionsHelpersTests.cs b/test/System.Web.Http.OData.Test/OData/Builder/Conventions/ConventionsHelpersTests.cs index 129d2fe2..9ae6d4bd 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/Conventions/ConventionsHelpersTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/Conventions/ConventionsHelpersTests.cs @@ -5,8 +5,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http.OData.Builder.Conventions { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/Conventions/EntityKeyConventionTests.cs b/test/System.Web.Http.OData.Test/OData/Builder/Conventions/EntityKeyConventionTests.cs index 5acdb782..d3615ffc 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/Conventions/EntityKeyConventionTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/Conventions/EntityKeyConventionTests.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.OData.Builder.Conventions { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/Conventions/ODataConventionModelBuilderTests.cs b/test/System.Web.Http.OData.Test/OData/Builder/Conventions/ODataConventionModelBuilderTests.cs index db62bcad..88894fad 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/Conventions/ODataConventionModelBuilderTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/Conventions/ODataConventionModelBuilderTests.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Http.OData.Formatter; using Microsoft.Data.Edm; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder.Conventions { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/EntitySetLinkConfigurationTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/EntitySetLinkConfigurationTest.cs index d7d1d070..2c24ba7a 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/EntitySetLinkConfigurationTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/EntitySetLinkConfigurationTest.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Net.Http; using System.Web.Http.Routing; using Microsoft.Data.Edm; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/EntitySetTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/EntitySetTest.cs index 1834c863..824dc102 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/EntitySetTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/EntitySetTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.Edm; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/EntityTypeTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/EntityTypeTest.cs index 5b68bbfb..7f5aa2d1 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/EntityTypeTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/EntityTypeTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.Edm; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/MetadataTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/MetadataTest.cs index 101d8e90..9b475d2a 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/MetadataTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/MetadataTest.cs @@ -7,7 +7,7 @@ using System.Xml; using Microsoft.Data.Edm; using Microsoft.Data.Edm.Csdl; using Microsoft.Data.Edm.Validation; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/ODataModelBuilderTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/ODataModelBuilderTest.cs index 5b7019c3..238720fb 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/ODataModelBuilderTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/ODataModelBuilderTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Http.OData.TestCommon.Models; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/PrimitiveTypeTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/PrimitiveTypeTest.cs index 0329654f..aec13aad 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/PrimitiveTypeTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/PrimitiveTypeTest.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using Microsoft.Data.Edm; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/ProgrammableBuilderApiTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/ProgrammableBuilderApiTest.cs index 1ff8aa39..99d86b3d 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/ProgrammableBuilderApiTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/ProgrammableBuilderApiTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.Edm; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/PropertySelectorVisitorTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/PropertySelectorVisitorTest.cs index aa03c5ab..336ce95b 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/PropertySelectorVisitorTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/PropertySelectorVisitorTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Linq.Expressions; using System.Web.Http.OData.TestCommon.Models; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Builder/RoutingTest.cs b/test/System.Web.Http.OData.Test/OData/Builder/RoutingTest.cs index cc8830a5..6eb8a7a6 100644 --- a/test/System.Web.Http.OData.Test/OData/Builder/RoutingTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Builder/RoutingTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Http.OData.Builder.TestModels; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/DeltaTest.cs b/test/System.Web.Http.OData.Test/OData/DeltaTest.cs index ee7f7f78..50f50117 100644 --- a/test/System.Web.Http.OData.Test/OData/DeltaTest.cs +++ b/test/System.Web.Http.OData.Test/OData/DeltaTest.cs @@ -2,8 +2,7 @@ using System.Linq; using System.Web.Http.OData.TestCommon.Models; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/DefaultODataDeserializerProviderTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/DefaultODataDeserializerProviderTests.cs index c0265eae..eb1ffc9f 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/DefaultODataDeserializerProviderTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/DefaultODataDeserializerProviderTests.cs @@ -2,9 +2,7 @@ using Microsoft.Data.Edm; using Microsoft.Data.OData; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Deserialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataComplexTypeDeserializerTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataComplexTypeDeserializerTests.cs index bbc65338..9d1b447c 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataComplexTypeDeserializerTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataComplexTypeDeserializerTests.cs @@ -2,9 +2,8 @@ using Microsoft.Data.Edm; using Microsoft.Data.OData; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Formatter.Deserialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataEntityDeserializerTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataEntityDeserializerTests.cs index 255751fd..dd4790f7 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataEntityDeserializerTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataEntityDeserializerTests.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Net.Http.Headers; using Microsoft.Data.Edm; using Microsoft.Data.OData; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Deserialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataEntityReferenceLinkDeserializerTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataEntityReferenceLinkDeserializerTests.cs index 562e96cd..5d22700a 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataEntityReferenceLinkDeserializerTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Deserialization/ODataEntityReferenceLinkDeserializerTests.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using Microsoft.Data.OData; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Deserialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/ODataFormatterConstantsTest.cs b/test/System.Web.Http.OData.Test/OData/Formatter/ODataFormatterConstantsTest.cs index b3d17c6d..8a3bbf92 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/ODataFormatterConstantsTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/ODataFormatterConstantsTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/ODataFormatterTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/ODataFormatterTests.cs index 538c61fc..e83c37f6 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/ODataFormatterTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/ODataFormatterTests.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Web.Http.OData.Builder.Conventions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/ODataMediaTypeFormatterTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/ODataMediaTypeFormatterTests.cs index 866ea76d..fda4910d 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/ODataMediaTypeFormatterTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/ODataMediaTypeFormatterTests.cs @@ -1,12 +1,10 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; -using System.IO; using System.Linq; using System.Net.Http; using System.Net.Http.Formatting; using System.Net.Http.Headers; -using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Web.Http.Hosting; @@ -15,10 +13,6 @@ using System.Web.Http.OData.Builder.Conventions; using System.Web.Http.OData.TestCommon.Models; using System.Web.Http.Routing; using Microsoft.TestCommon; -using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Formatter { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/ODataTestUtil.cs b/test/System.Web.Http.OData.Test/OData/Formatter/ODataTestUtil.cs index 6f0d0195..e6d221a2 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/ODataTestUtil.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/ODataTestUtil.cs @@ -10,7 +10,7 @@ using System.Text.RegularExpressions; using System.Web.Http.OData.Builder; using System.Web.Http.OData.Builder.Conventions; using Microsoft.Data.Edm; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/CollectionTest.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/CollectionTest.cs index 22cd0369..8fd735d2 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/CollectionTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/CollectionTest.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Net.Http; -using System.Web.Http.OData.TestCommon; using System.Web.Http.OData.TestCommon.Models; using Microsoft.Data.OData; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ComplexTypeTest.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ComplexTypeTest.cs index 1c00f62c..7ee926c9 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ComplexTypeTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ComplexTypeTest.cs @@ -2,10 +2,8 @@ using System.Net.Http; using System.Web.Http.OData.Builder; -using System.Web.Http.OData.TestCommon; using System.Web.Http.OData.TestCommon.Models; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/DefaultODataSerializerProviderTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/DefaultODataSerializerProviderTests.cs index 15ce8ec7..63e204da 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/DefaultODataSerializerProviderTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/DefaultODataSerializerProviderTests.cs @@ -7,9 +7,6 @@ using Microsoft.Data.Edm; using Microsoft.Data.Edm.Library; using Microsoft.Data.OData; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/EntityTypeTest.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/EntityTypeTest.cs index 2102fe9a..1745f621 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/EntityTypeTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/EntityTypeTest.cs @@ -1,11 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http; -using System.Web.Http.OData.TestCommon; using System.Web.Http.OData.TestCommon.Models; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/EnumHelperTestBase.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/EnumHelperTestBase.cs index 78e56d3c..0e71a562 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/EnumHelperTestBase.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/EnumHelperTestBase.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/FeedTest.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/FeedTest.cs index 3daf4759..4b18a73d 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/FeedTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/FeedTest.cs @@ -3,11 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Net.Http; -using System.Web.Http.OData.TestCommon; using System.Web.Http.OData.TestCommon.Models; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataCollectionSerializerTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataCollectionSerializerTests.cs index 10ed85bd..066a026c 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataCollectionSerializerTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataCollectionSerializerTests.cs @@ -5,8 +5,7 @@ using System.Web.Http.OData.Formatter.Serialization.Models; using Microsoft.Data.Edm; using Microsoft.Data.Edm.Library; using Microsoft.Data.OData; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataComplexTypeSerializerTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataComplexTypeSerializerTests.cs index b5c77461..a7b1f07d 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataComplexTypeSerializerTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataComplexTypeSerializerTests.cs @@ -5,7 +5,7 @@ using System.Web.Http.OData.Formatter.Serialization.Models; using Microsoft.Data.Edm; using Microsoft.Data.Edm.Library; using Microsoft.Data.OData; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataEntityTypeSerializerTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataEntityTypeSerializerTests.cs index b2c98feb..30ebd73c 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataEntityTypeSerializerTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataEntityTypeSerializerTests.cs @@ -8,9 +8,8 @@ using System.Web.Http.Routing; using Microsoft.Data.Edm; using Microsoft.Data.Edm.Library; using Microsoft.Data.OData; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataFeedSerializerTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataFeedSerializerTests.cs index 792f0706..b271825e 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataFeedSerializerTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataFeedSerializerTests.cs @@ -6,8 +6,8 @@ using System.Web.Http.Routing; using Microsoft.Data.Edm; using Microsoft.Data.Edm.Library; using Microsoft.Data.OData; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataPayloadKindHelperTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataPayloadKindHelperTests.cs index 0bcc8511..1dbfb702 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataPayloadKindHelperTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataPayloadKindHelperTests.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using Microsoft.Data.OData; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataPrimitiveSerializerTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataPrimitiveSerializerTests.cs index 7f515905..ff2c5e77 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataPrimitiveSerializerTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataPrimitiveSerializerTests.cs @@ -5,9 +5,6 @@ using Microsoft.Data.Edm; using Microsoft.Data.Edm.Library; using Microsoft.Data.OData; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataUriHelperTest.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataUriHelperTest.cs index 3bc8fe6b..dc73efea 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataUriHelperTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/ODataUriHelperTest.cs @@ -3,8 +3,7 @@ using System.Linq; using Microsoft.Data.Edm; using Microsoft.Data.Edm.Library; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/PrimitiveTypesTest.cs b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/PrimitiveTypesTest.cs index c05184f8..5bb455c5 100644 --- a/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/PrimitiveTypesTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Formatter/Serialization/PrimitiveTypesTest.cs @@ -5,9 +5,6 @@ using System.Web.Http.Hosting; using System.Web.Http.OData.Builder; using System.Web.Http.OData.TestCommon.Models; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Formatter.Serialization { diff --git a/test/System.Web.Http.OData.Test/OData/ODataMetaDataControllerTests.cs b/test/System.Web.Http.OData.Test/OData/ODataMetaDataControllerTests.cs index 73cf914a..b1b07b41 100644 --- a/test/System.Web.Http.OData.Test/OData/ODataMetaDataControllerTests.cs +++ b/test/System.Web.Http.OData.Test/OData/ODataMetaDataControllerTests.cs @@ -3,7 +3,7 @@ using System.Net.Http; using System.Web.Http.OData.Builder.Conventions; using System.Web.Http.OData.Formatter; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Builder { diff --git a/test/System.Web.Http.OData.Test/OData/Query/Expressions/FilterBinderTests.cs b/test/System.Web.Http.OData.Test/OData/Query/Expressions/FilterBinderTests.cs index a297ce55..a1a30ad7 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/Expressions/FilterBinderTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/Expressions/FilterBinderTests.cs @@ -7,9 +7,7 @@ using Microsoft.Data.Edm; using Microsoft.Data.OData; using Microsoft.Data.OData.Query; using Microsoft.Data.OData.Query.SemanticAst; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Query.Expressions { diff --git a/test/System.Web.Http.OData.Test/OData/Query/FilterQueryOptionTest.cs b/test/System.Web.Http.OData.Test/OData/Query/FilterQueryOptionTest.cs index a587bb49..efb0ce19 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/FilterQueryOptionTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/FilterQueryOptionTest.cs @@ -4,8 +4,7 @@ using System.Web.Http.OData.Builder; using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.OData.Query; using Microsoft.Data.OData.Query.SemanticAst; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Query { diff --git a/test/System.Web.Http.OData.Test/OData/Query/HttpActionDescriptorExtensionTests.cs b/test/System.Web.Http.OData.Test/OData/Query/HttpActionDescriptorExtensionTests.cs index 623a2214..5c03c6a2 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/HttpActionDescriptorExtensionTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/HttpActionDescriptorExtensionTests.cs @@ -5,8 +5,7 @@ using System.Web.Http.Controllers; using System.Web.Http.OData.Query.Controllers; using System.Web.Http.OData.TestCommon.Models; using Microsoft.Data.Edm; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Query { diff --git a/test/System.Web.Http.OData.Test/OData/Query/ODataQueryContextTests.cs b/test/System.Web.Http.OData.Test/OData/Query/ODataQueryContextTests.cs index b429c19a..67306906 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/ODataQueryContextTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/ODataQueryContextTests.cs @@ -6,9 +6,6 @@ using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.Edm; using Microsoft.TestCommon; using Microsoft.TestCommon.Types; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Query { @@ -76,7 +73,7 @@ namespace System.Web.Http.OData.Query { // Arrange & Act & Assert Assert.ThrowsArgumentNull( - () => new ODataQueryContext(null), + () => new ODataQueryContext(null), "clrType"); } @@ -146,7 +143,7 @@ namespace System.Web.Http.OData.Query { // Act && Assert Assert.ThrowsArgumentNull( - () => new ODataQueryContext(null, typeof(Customer)), + () => new ODataQueryContext(null, typeof(Customer)), "model"); } @@ -157,7 +154,7 @@ namespace System.Web.Http.OData.Query IEdmEntitySet entitySet = model.EntityContainers().Single().FindEntitySet("Customers"); Assert.ThrowsArgumentNull( - () => new ODataQueryContext(null, typeof(Customer), entitySet), + () => new ODataQueryContext(null, typeof(Customer), entitySet), "model"); } @@ -165,7 +162,7 @@ namespace System.Web.Http.OData.Query public void ContructorWithNullModelAndTypeAndEntitySetNameThrows() { Assert.ThrowsArgumentNull(() => - new ODataQueryContext(null, typeof(Customer), "Customers"), + new ODataQueryContext(null, typeof(Customer), "Customers"), "model"); } @@ -194,7 +191,7 @@ namespace System.Web.Http.OData.Query IEdmEntitySet entitySet = model.EntityContainers().Single().FindEntitySet("Customers"); Assert.ThrowsArgumentNull(() => - new ODataQueryContext(model, null, entitySet), + new ODataQueryContext(model, null, entitySet), "entityClrType"); } diff --git a/test/System.Web.Http.OData.Test/OData/Query/ODataQueryOptionTest.cs b/test/System.Web.Http.OData.Test/OData/Query/ODataQueryOptionTest.cs index 20c20f83..512ad908 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/ODataQueryOptionTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/ODataQueryOptionTest.cs @@ -8,9 +8,6 @@ using System.Web.Http.OData.Builder; using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.OData; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData.Query { diff --git a/test/System.Web.Http.OData.Test/OData/Query/ODataQueryParameterBindingAttributeTests.cs b/test/System.Web.Http.OData.Test/OData/Query/ODataQueryParameterBindingAttributeTests.cs index c9017f92..1e3ff056 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/ODataQueryParameterBindingAttributeTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/ODataQueryParameterBindingAttributeTests.cs @@ -15,8 +15,6 @@ using System.Web.Http.OData.Query.Controllers; using System.Web.Http.OData.TestCommon.Models; using System.Web.Http.Routing; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http.OData.Query { diff --git a/test/System.Web.Http.OData.Test/OData/Query/OrderByQueryOptionTest.cs b/test/System.Web.Http.OData.Test/OData/Query/OrderByQueryOptionTest.cs index 5081f568..e8d1092e 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/OrderByQueryOptionTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/OrderByQueryOptionTest.cs @@ -7,8 +7,7 @@ using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.OData; using Microsoft.Data.OData.Query; using Microsoft.Data.OData.Query.SemanticAst; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Query { diff --git a/test/System.Web.Http.OData.Test/OData/Query/QueryCompositionTests.cs b/test/System.Web.Http.OData.Test/OData/Query/QueryCompositionTests.cs index 2e1418d0..bd11382b 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/QueryCompositionTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/QueryCompositionTests.cs @@ -7,8 +7,6 @@ using System.Net.Http; using System.Web.Http.OData.Builder; using Microsoft.Data.Edm; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http.OData.Query { diff --git a/test/System.Web.Http.OData.Test/OData/Query/SkipQueryOptionTests.cs b/test/System.Web.Http.OData.Test/OData/Query/SkipQueryOptionTests.cs index 010b6ee9..31e9098e 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/SkipQueryOptionTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/SkipQueryOptionTests.cs @@ -5,8 +5,7 @@ using System.Linq; using System.Web.Http.OData.Builder; using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.OData; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Query { diff --git a/test/System.Web.Http.OData.Test/OData/Query/TopQueryOptionTests.cs b/test/System.Web.Http.OData.Test/OData/Query/TopQueryOptionTests.cs index fb2d6a85..a8c147d3 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/TopQueryOptionTests.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/TopQueryOptionTests.cs @@ -5,8 +5,7 @@ using System.Linq; using System.Web.Http.OData.Builder; using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.OData; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Query { diff --git a/test/System.Web.Http.OData.Test/OData/Query/UriParserTest.cs b/test/System.Web.Http.OData.Test/OData/Query/UriParserTest.cs index e2ebb5b0..52538a10 100644 --- a/test/System.Web.Http.OData.Test/OData/Query/UriParserTest.cs +++ b/test/System.Web.Http.OData.Test/OData/Query/UriParserTest.cs @@ -6,7 +6,7 @@ using System.Web.Http.OData.Builder.TestModels; using Microsoft.Data.Edm; using Microsoft.Data.OData.Query; using Microsoft.Data.OData.Query.SemanticAst; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.OData.Query { diff --git a/test/System.Web.Http.OData.Test/QueryableAttributeTests.cs b/test/System.Web.Http.OData.Test/QueryableAttributeTests.cs index fe2fde93..6679ad55 100644 --- a/test/System.Web.Http.OData.Test/QueryableAttributeTests.cs +++ b/test/System.Web.Http.OData.Test/QueryableAttributeTests.cs @@ -14,9 +14,6 @@ using System.Web.Http.OData.TestCommon.Models; using System.Web.Http.Routing; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.OData { @@ -187,9 +184,9 @@ namespace System.Web.Http.OData { // Arrange QueryableAttribute attribute = new QueryableAttribute(); - + // Act & Assert - Assert.ThrowsArgumentNull(() => attribute.ValidateQuery(null), "request"); + Assert.ThrowsArgumentNull(() => attribute.ValidateQuery(null), "request"); } [Theory] diff --git a/test/System.Web.Http.OData.Test/System.Web.Http.OData.Test.csproj b/test/System.Web.Http.OData.Test/System.Web.Http.OData.Test.csproj index d9bd8a0d..6a2592a6 100644 --- a/test/System.Web.Http.OData.Test/System.Web.Http.OData.Test.csproj +++ b/test/System.Web.Http.OData.Test/System.Web.Http.OData.Test.csproj @@ -52,7 +52,7 @@ ..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - ..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll diff --git a/test/System.Web.Http.SelfHost.Test/Authentication/BasicOverHttpTest.cs b/test/System.Web.Http.SelfHost.Test/Authentication/BasicOverHttpTest.cs index fa00e693..66475909 100644 --- a/test/System.Web.Http.SelfHost.Test/Authentication/BasicOverHttpTest.cs +++ b/test/System.Web.Http.SelfHost.Test/Authentication/BasicOverHttpTest.cs @@ -3,7 +3,7 @@ using System.Net; using System.Net.Http; using System.Web.Http.SelfHost; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http { diff --git a/test/System.Web.Http.SelfHost.Test/Authentication/CustomMessageHandler.cs b/test/System.Web.Http.SelfHost.Test/Authentication/CustomMessageHandler.cs index ba0186a4..3e5ab3f4 100644 --- a/test/System.Web.Http.SelfHost.Test/Authentication/CustomMessageHandler.cs +++ b/test/System.Web.Http.SelfHost.Test/Authentication/CustomMessageHandler.cs @@ -6,7 +6,6 @@ using System.ServiceModel; using System.ServiceModel.Security; using System.Threading; using System.Threading.Tasks; -using System.Web.Http.SelfHost; namespace System.Web.Http { diff --git a/test/System.Web.Http.SelfHost.Test/Channels/HttpBindingSecurityModeHelperTest.cs b/test/System.Web.Http.SelfHost.Test/Channels/HttpBindingSecurityModeHelperTest.cs index 1351d214..bbf23e8c 100644 --- a/test/System.Web.Http.SelfHost.Test/Channels/HttpBindingSecurityModeHelperTest.cs +++ b/test/System.Web.Http.SelfHost.Test/Channels/HttpBindingSecurityModeHelperTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Http.SelfHost.Channels; -using Xunit; +using Microsoft.TestCommon; namespace System.Net.Http.Formatting { diff --git a/test/System.Web.Http.SelfHost.Test/DeeplyNestedTypeTests.cs b/test/System.Web.Http.SelfHost.Test/DeeplyNestedTypeTests.cs index 02d219f5..62e2191c 100644 --- a/test/System.Web.Http.SelfHost.Test/DeeplyNestedTypeTests.cs +++ b/test/System.Web.Http.SelfHost.Test/DeeplyNestedTypeTests.cs @@ -5,10 +5,9 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using System.Xml; using System.Xml.Linq; +using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; namespace System.Web.Http.SelfHost { diff --git a/test/System.Web.Http.SelfHost.Test/HttpSelfHostConfigurationTest.cs b/test/System.Web.Http.SelfHost.Test/HttpSelfHostConfigurationTest.cs index 639a52b1..01283b65 100644 --- a/test/System.Web.Http.SelfHost.Test/HttpSelfHostConfigurationTest.cs +++ b/test/System.Web.Http.SelfHost.Test/HttpSelfHostConfigurationTest.cs @@ -7,9 +7,6 @@ using System.ServiceModel.Description; using System.Web.Http.SelfHost.Channels; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.SelfHost { diff --git a/test/System.Web.Http.SelfHost.Test/HttpSelfHostResponseTest.cs b/test/System.Web.Http.SelfHost.Test/HttpSelfHostResponseTest.cs index 3d9b880d..1cf94d2b 100644 --- a/test/System.Web.Http.SelfHost.Test/HttpSelfHostResponseTest.cs +++ b/test/System.Web.Http.SelfHost.Test/HttpSelfHostResponseTest.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Threading.Tasks; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.SelfHost { diff --git a/test/System.Web.Http.SelfHost.Test/HttpSelfHostServerTest.cs b/test/System.Web.Http.SelfHost.Test/HttpSelfHostServerTest.cs index f70a89b8..095a93cb 100644 --- a/test/System.Web.Http.SelfHost.Test/HttpSelfHostServerTest.cs +++ b/test/System.Web.Http.SelfHost.Test/HttpSelfHostServerTest.cs @@ -9,8 +9,7 @@ using System.Net.Http.Formatting; using System.ServiceModel; using System.Text; using System.Threading.Tasks; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.SelfHost { diff --git a/test/System.Web.Http.SelfHost.Test/MaxHttpCollectionKeyTests.cs b/test/System.Web.Http.SelfHost.Test/MaxHttpCollectionKeyTests.cs index 641b934a..519dcd8f 100644 --- a/test/System.Web.Http.SelfHost.Test/MaxHttpCollectionKeyTests.cs +++ b/test/System.Web.Http.SelfHost.Test/MaxHttpCollectionKeyTests.cs @@ -9,9 +9,8 @@ using System.Net.Http; using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Text; +using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http.SelfHost { diff --git a/test/System.Web.Http.SelfHost.Test/ServiceModel/HostNameComparisonModeHelperTest.cs b/test/System.Web.Http.SelfHost.Test/ServiceModel/HostNameComparisonModeHelperTest.cs index 95f8f018..b4025e1c 100644 --- a/test/System.Web.Http.SelfHost.Test/ServiceModel/HostNameComparisonModeHelperTest.cs +++ b/test/System.Web.Http.SelfHost.Test/ServiceModel/HostNameComparisonModeHelperTest.cs @@ -2,7 +2,7 @@ using System.ServiceModel; using System.Web.Http.SelfHost.ServiceModel; -using Xunit; +using Microsoft.TestCommon; namespace System.Net.Http.Formatting { diff --git a/test/System.Web.Http.SelfHost.Test/ServiceModel/TransferModeHelperTest.cs b/test/System.Web.Http.SelfHost.Test/ServiceModel/TransferModeHelperTest.cs index e8f756c0..8a526eef 100644 --- a/test/System.Web.Http.SelfHost.Test/ServiceModel/TransferModeHelperTest.cs +++ b/test/System.Web.Http.SelfHost.Test/ServiceModel/TransferModeHelperTest.cs @@ -2,7 +2,7 @@ using System.ServiceModel; using System.Web.Http.SelfHost.ServiceModel; -using Xunit; +using Microsoft.TestCommon; namespace System.Net.Http.Formatting { diff --git a/test/System.Web.Http.Test/AuthorizeAttributeTest.cs b/test/System.Web.Http.Test/AuthorizeAttributeTest.cs index 51a4b145..6fed9191 100644 --- a/test/System.Web.Http.Test/AuthorizeAttributeTest.cs +++ b/test/System.Web.Http.Test/AuthorizeAttributeTest.cs @@ -10,9 +10,6 @@ using System.Threading; using System.Web.Http.Controllers; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/ApiControllerActionInvokerTest.cs b/test/System.Web.Http.Test/Controllers/ApiControllerActionInvokerTest.cs index 3161e512..b941d035 100644 --- a/test/System.Web.Http.Test/Controllers/ApiControllerActionInvokerTest.cs +++ b/test/System.Web.Http.Test/Controllers/ApiControllerActionInvokerTest.cs @@ -5,9 +5,8 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/ApiControllerActionSelectorTest.cs b/test/System.Web.Http.Test/Controllers/ApiControllerActionSelectorTest.cs index 2705432c..4a957b4e 100644 --- a/test/System.Web.Http.Test/Controllers/ApiControllerActionSelectorTest.cs +++ b/test/System.Web.Http.Test/Controllers/ApiControllerActionSelectorTest.cs @@ -2,8 +2,7 @@ using System.Net.Http; using System.Web.Http.Controllers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/ApiControllerTest.cs b/test/System.Web.Http.Test/Controllers/ApiControllerTest.cs index e0b484ce..53eb1533 100644 --- a/test/System.Web.Http.Test/Controllers/ApiControllerTest.cs +++ b/test/System.Web.Http.Test/Controllers/ApiControllerTest.cs @@ -19,8 +19,6 @@ using System.Web.Http.Routing; using System.Web.Http.Services; using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/HttpActionContextTest.cs b/test/System.Web.Http.Test/Controllers/HttpActionContextTest.cs index d973cb2b..7862af0e 100644 --- a/test/System.Web.Http.Test/Controllers/HttpActionContextTest.cs +++ b/test/System.Web.Http.Test/Controllers/HttpActionContextTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/HttpActionDescriptorTest.cs b/test/System.Web.Http.Test/Controllers/HttpActionDescriptorTest.cs index 8bc50d85..361f238f 100644 --- a/test/System.Web.Http.Test/Controllers/HttpActionDescriptorTest.cs +++ b/test/System.Web.Http.Test/Controllers/HttpActionDescriptorTest.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Controllers { diff --git a/test/System.Web.Http.Test/Controllers/HttpConfigurationTest.cs b/test/System.Web.Http.Test/Controllers/HttpConfigurationTest.cs index 3ac75ea8..3cf3eff9 100644 --- a/test/System.Web.Http.Test/Controllers/HttpConfigurationTest.cs +++ b/test/System.Web.Http.Test/Controllers/HttpConfigurationTest.cs @@ -9,8 +9,6 @@ using System.Web.Http.Services; using System.Web.Http.Tracing; using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { @@ -181,7 +179,7 @@ namespace System.Web.Http HttpConfiguration config2 = new HttpConfiguration(); HttpConfiguration configPassedToAction2 = null; - config2.Initializer = (c) => { config1.Initializer(config1); configPassedToAction2 = c;}; + config2.Initializer = (c) => { config1.Initializer(config1); configPassedToAction2 = c; }; // Act config2.Initializer(config2); @@ -287,7 +285,7 @@ namespace System.Web.Http // Act HttpConfiguration clonedConfig = HttpConfiguration.ApplyControllerSettings(settings, config); - clonedConfig.Formatters[0].GetPerRequestFormatterInstance(typeof(string), new HttpRequestMessage(), new MediaTypeHeaderValue("application/mine")); + clonedConfig.Formatters[0].GetPerRequestFormatterInstance(typeof(string), new HttpRequestMessage(), new MediaTypeHeaderValue("application/mine")); // Assert Assert.True(calledTrace); diff --git a/test/System.Web.Http.Test/Controllers/HttpControllerContextTest.cs b/test/System.Web.Http.Test/Controllers/HttpControllerContextTest.cs index 63dc467f..bfad041b 100644 --- a/test/System.Web.Http.Test/Controllers/HttpControllerContextTest.cs +++ b/test/System.Web.Http.Test/Controllers/HttpControllerContextTest.cs @@ -3,9 +3,8 @@ using System.Net.Http; using System.Web.Http.Controllers; using System.Web.Http.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/HttpControllerDescriptorTest.cs b/test/System.Web.Http.Test/Controllers/HttpControllerDescriptorTest.cs index 8dc51ef4..c349074e 100644 --- a/test/System.Web.Http.Test/Controllers/HttpControllerDescriptorTest.cs +++ b/test/System.Web.Http.Test/Controllers/HttpControllerDescriptorTest.cs @@ -5,9 +5,8 @@ using System.Collections.ObjectModel; using System.Net.Http.Formatting; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/HttpParameterBindingTest.cs b/test/System.Web.Http.Test/Controllers/HttpParameterBindingTest.cs index aa10e4b4..cfea6bf4 100644 --- a/test/System.Web.Http.Test/Controllers/HttpParameterBindingTest.cs +++ b/test/System.Web.Http.Test/Controllers/HttpParameterBindingTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/HttpParameterDescriptorTest.cs b/test/System.Web.Http.Test/Controllers/HttpParameterDescriptorTest.cs index 9de445ca..c116403c 100644 --- a/test/System.Web.Http.Test/Controllers/HttpParameterDescriptorTest.cs +++ b/test/System.Web.Http.Test/Controllers/HttpParameterDescriptorTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/ParameterBindingExtensionsTest.cs b/test/System.Web.Http.Test/Controllers/ParameterBindingExtensionsTest.cs index 6dad8cdf..945b8924 100644 --- a/test/System.Web.Http.Test/Controllers/ParameterBindingExtensionsTest.cs +++ b/test/System.Web.Http.Test/Controllers/ParameterBindingExtensionsTest.cs @@ -6,9 +6,8 @@ using System.Net.Http.Formatting; using System.Web.Http.ModelBinding; using System.Web.Http.Validation; using System.Web.Http.ValueProviders; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Controllers { diff --git a/test/System.Web.Http.Test/Controllers/ReflectedHttpActionDescriptorTest.cs b/test/System.Web.Http.Test/Controllers/ReflectedHttpActionDescriptorTest.cs index e16e5b04..e8b61795 100644 --- a/test/System.Web.Http.Test/Controllers/ReflectedHttpActionDescriptorTest.cs +++ b/test/System.Web.Http.Test/Controllers/ReflectedHttpActionDescriptorTest.cs @@ -10,10 +10,8 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/ReflectedHttpParameterDescriptorTest.cs b/test/System.Web.Http.Test/Controllers/ReflectedHttpParameterDescriptorTest.cs index 0042dfd3..dee02258 100644 --- a/test/System.Web.Http.Test/Controllers/ReflectedHttpParameterDescriptorTest.cs +++ b/test/System.Web.Http.Test/Controllers/ReflectedHttpParameterDescriptorTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Controllers/ResponseMessageResultConverterTest.cs b/test/System.Web.Http.Test/Controllers/ResponseMessageResultConverterTest.cs index 14f8c2e7..32d98061 100644 --- a/test/System.Web.Http.Test/Controllers/ResponseMessageResultConverterTest.cs +++ b/test/System.Web.Http.Test/Controllers/ResponseMessageResultConverterTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Controllers { diff --git a/test/System.Web.Http.Test/Controllers/ValueResultConverterTest.cs b/test/System.Web.Http.Test/Controllers/ValueResultConverterTest.cs index 7e0598e3..029dfcd2 100644 --- a/test/System.Web.Http.Test/Controllers/ValueResultConverterTest.cs +++ b/test/System.Web.Http.Test/Controllers/ValueResultConverterTest.cs @@ -3,8 +3,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Formatting; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Controllers { diff --git a/test/System.Web.Http.Test/Controllers/VoidResultConverterTest.cs b/test/System.Web.Http.Test/Controllers/VoidResultConverterTest.cs index 34b6fdee..09fe9d5b 100644 --- a/test/System.Web.Http.Test/Controllers/VoidResultConverterTest.cs +++ b/test/System.Web.Http.Test/Controllers/VoidResultConverterTest.cs @@ -2,8 +2,7 @@ using System.Net; using System.Net.Http; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Controllers { diff --git a/test/System.Web.Http.Test/Dispatcher/DefaultAssembliesResolverTest.cs b/test/System.Web.Http.Test/Dispatcher/DefaultAssembliesResolverTest.cs index c03dd224..ca9f1678 100644 --- a/test/System.Web.Http.Test/Dispatcher/DefaultAssembliesResolverTest.cs +++ b/test/System.Web.Http.Test/Dispatcher/DefaultAssembliesResolverTest.cs @@ -2,8 +2,7 @@ using System.Reflection; using System.Web.Http.Services; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Dispatcher { diff --git a/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerActivatorTest.cs b/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerActivatorTest.cs index 69fabbca..c14ba948 100644 --- a/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerActivatorTest.cs +++ b/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerActivatorTest.cs @@ -4,9 +4,8 @@ using System.Net.Http; using System.Web.Http.Controllers; using System.Web.Http.Dependencies; using System.Web.Http.Hosting; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Dispatcher { diff --git a/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerSelectorTest.cs b/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerSelectorTest.cs index ea0ee6ac..31aff5f3 100644 --- a/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerSelectorTest.cs +++ b/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerSelectorTest.cs @@ -7,10 +7,8 @@ using System.Net.Http; using System.Web.Http.Controllers; using System.Web.Http.Hosting; using System.Web.Http.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Dispatcher { diff --git a/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerTypeResolverTest.cs b/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerTypeResolverTest.cs index ddab9a31..4a0cafd5 100644 --- a/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerTypeResolverTest.cs +++ b/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerTypeResolverTest.cs @@ -4,9 +4,6 @@ using System.Collections.Generic; using System.Reflection; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Dispatcher { diff --git a/test/System.Web.Http.Test/Dispatcher/HttpControllerDispatcherTest.cs b/test/System.Web.Http.Test/Dispatcher/HttpControllerDispatcherTest.cs index 98bd666a..3be39804 100644 --- a/test/System.Web.Http.Test/Dispatcher/HttpControllerDispatcherTest.cs +++ b/test/System.Web.Http.Test/Dispatcher/HttpControllerDispatcherTest.cs @@ -7,9 +7,8 @@ using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Hosting; using System.Web.Http.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Dispatcher { diff --git a/test/System.Web.Http.Test/Dispatcher/HttpErrorTest.cs b/test/System.Web.Http.Test/Dispatcher/HttpErrorTest.cs index 9b17a2bf..f2b00284 100644 --- a/test/System.Web.Http.Test/Dispatcher/HttpErrorTest.cs +++ b/test/System.Web.Http.Test/Dispatcher/HttpErrorTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.IO; using System.Net.Http.Formatting; using System.Web.Http.ModelBinding; +using Microsoft.TestCommon; using Newtonsoft.Json.Linq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Dispatcher { diff --git a/test/System.Web.Http.Test/Dispatcher/HttpRoutingDispatcherTest.cs b/test/System.Web.Http.Test/Dispatcher/HttpRoutingDispatcherTest.cs index 653352c7..7356c574 100644 --- a/test/System.Web.Http.Test/Dispatcher/HttpRoutingDispatcherTest.cs +++ b/test/System.Web.Http.Test/Dispatcher/HttpRoutingDispatcherTest.cs @@ -7,10 +7,9 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using System.Web.Http.Hosting; +using Microsoft.TestCommon; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Dispatcher { diff --git a/test/System.Web.Http.Test/Filters/ActionDescriptorFilterProviderTest.cs b/test/System.Web.Http.Test/Filters/ActionDescriptorFilterProviderTest.cs index b519c946..a844bdb6 100644 --- a/test/System.Web.Http.Test/Filters/ActionDescriptorFilterProviderTest.cs +++ b/test/System.Web.Http.Test/Filters/ActionDescriptorFilterProviderTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Filters/ActionFilterAttributeTest.cs b/test/System.Web.Http.Test/Filters/ActionFilterAttributeTest.cs index 3461dd2d..9913cb9e 100644 --- a/test/System.Web.Http.Test/Filters/ActionFilterAttributeTest.cs +++ b/test/System.Web.Http.Test/Filters/ActionFilterAttributeTest.cs @@ -4,9 +4,8 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Filters/AuthorizationFilterAttributeTest.cs b/test/System.Web.Http.Test/Filters/AuthorizationFilterAttributeTest.cs index ff867002..8bf74acf 100644 --- a/test/System.Web.Http.Test/Filters/AuthorizationFilterAttributeTest.cs +++ b/test/System.Web.Http.Test/Filters/AuthorizationFilterAttributeTest.cs @@ -4,9 +4,8 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Filters/ConfigurationFilterProviderTest.cs b/test/System.Web.Http.Test/Filters/ConfigurationFilterProviderTest.cs index 9785b06b..0e92b210 100644 --- a/test/System.Web.Http.Test/Filters/ConfigurationFilterProviderTest.cs +++ b/test/System.Web.Http.Test/Filters/ConfigurationFilterProviderTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Filters/ExceptionFilterAttributeTest.cs b/test/System.Web.Http.Test/Filters/ExceptionFilterAttributeTest.cs index 0f651f11..06e08693 100644 --- a/test/System.Web.Http.Test/Filters/ExceptionFilterAttributeTest.cs +++ b/test/System.Web.Http.Test/Filters/ExceptionFilterAttributeTest.cs @@ -2,9 +2,8 @@ using System.Threading; using System.Threading.Tasks; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Filters/FilterAttributeTest.cs b/test/System.Web.Http.Test/Filters/FilterAttributeTest.cs index 038ba294..8a6c440c 100644 --- a/test/System.Web.Http.Test/Filters/FilterAttributeTest.cs +++ b/test/System.Web.Http.Test/Filters/FilterAttributeTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Filters/FilterInfoComparerTest.cs b/test/System.Web.Http.Test/Filters/FilterInfoComparerTest.cs index 44567d1d..f68d489f 100644 --- a/test/System.Web.Http.Test/Filters/FilterInfoComparerTest.cs +++ b/test/System.Web.Http.Test/Filters/FilterInfoComparerTest.cs @@ -2,8 +2,6 @@ using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Filters/FilterInfoTest.cs b/test/System.Web.Http.Test/Filters/FilterInfoTest.cs index f2677c59..95b2fb17 100644 --- a/test/System.Web.Http.Test/Filters/FilterInfoTest.cs +++ b/test/System.Web.Http.Test/Filters/FilterInfoTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Filters/HttpActionExecutedContextTest.cs b/test/System.Web.Http.Test/Filters/HttpActionExecutedContextTest.cs index 4f3b9317..5ce49770 100644 --- a/test/System.Web.Http.Test/Filters/HttpActionExecutedContextTest.cs +++ b/test/System.Web.Http.Test/Filters/HttpActionExecutedContextTest.cs @@ -2,8 +2,7 @@ using System.Net.Http; using System.Web.Http.Controllers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Filters/HttpFilterCollectionTest.cs b/test/System.Web.Http.Test/Filters/HttpFilterCollectionTest.cs index 0b26d531..07cf481b 100644 --- a/test/System.Web.Http.Test/Filters/HttpFilterCollectionTest.cs +++ b/test/System.Web.Http.Test/Filters/HttpFilterCollectionTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Filters { diff --git a/test/System.Web.Http.Test/Hosting/HttpRouteTest.cs b/test/System.Web.Http.Test/Hosting/HttpRouteTest.cs index 0994f24e..f894514e 100644 --- a/test/System.Web.Http.Test/Hosting/HttpRouteTest.cs +++ b/test/System.Web.Http.Test/Hosting/HttpRouteTest.cs @@ -4,8 +4,6 @@ using System.Collections.Generic; using System.Net.Http; using System.Web.Http.Routing; using Microsoft.TestCommon; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Hosting { diff --git a/test/System.Web.Http.Test/HttpRequestMessageExtensionsTest.cs b/test/System.Web.Http.Test/HttpRequestMessageExtensionsTest.cs index 01b43d11..ada433a8 100644 --- a/test/System.Web.Http.Test/HttpRequestMessageExtensionsTest.cs +++ b/test/System.Web.Http.Test/HttpRequestMessageExtensionsTest.cs @@ -9,9 +9,8 @@ using System.Web.Http; using System.Web.Http.Hosting; using System.Web.Http.Routing; using System.Web.Http.Services; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Web.Http.Test/HttpResponseExceptionTest.cs b/test/System.Web.Http.Test/HttpResponseExceptionTest.cs index e9c5b7d0..c386f16a 100644 --- a/test/System.Web.Http.Test/HttpResponseExceptionTest.cs +++ b/test/System.Web.Http.Test/HttpResponseExceptionTest.cs @@ -2,8 +2,7 @@ using System.Net; using System.Net.Http; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/HttpResponseMessageExtensionsTest.cs b/test/System.Web.Http.Test/HttpResponseMessageExtensionsTest.cs index 04abb666..cb5ba8ff 100644 --- a/test/System.Web.Http.Test/HttpResponseMessageExtensionsTest.cs +++ b/test/System.Web.Http.Test/HttpResponseMessageExtensionsTest.cs @@ -2,10 +2,8 @@ using System.Collections.Generic; using System.Net.Http.Formatting; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http { diff --git a/test/System.Web.Http.Test/HttpRouteCollectionExtensionsTest.cs b/test/System.Web.Http.Test/HttpRouteCollectionExtensionsTest.cs index b4b0dcef..0f203143 100644 --- a/test/System.Web.Http.Test/HttpRouteCollectionExtensionsTest.cs +++ b/test/System.Web.Http.Test/HttpRouteCollectionExtensionsTest.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Web.Http.Routing; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/HttpServerTest.cs b/test/System.Web.Http.Test/HttpServerTest.cs index d93c5de7..9b3152b2 100644 --- a/test/System.Web.Http.Test/HttpServerTest.cs +++ b/test/System.Web.Http.Test/HttpServerTest.cs @@ -9,8 +9,6 @@ using System.Web.Http.Dispatcher; using Microsoft.TestCommon; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.Test/Internal/CollectionModelBinderUtilTest.cs b/test/System.Web.Http.Test/Internal/CollectionModelBinderUtilTest.cs index 2aeeee8a..0f3c71bf 100644 --- a/test/System.Web.Http.Test/Internal/CollectionModelBinderUtilTest.cs +++ b/test/System.Web.Http.Test/Internal/CollectionModelBinderUtilTest.cs @@ -6,8 +6,7 @@ using System.Linq; using System.Web.Http.Metadata.Providers; using System.Web.Http.ModelBinding; using System.Web.Http.ValueProviders; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Internal { diff --git a/test/System.Web.Http.Test/Internal/TypeActivatorTest.cs b/test/System.Web.Http.Test/Internal/TypeActivatorTest.cs index 2af83c11..3f77b463 100644 --- a/test/System.Web.Http.Test/Internal/TypeActivatorTest.cs +++ b/test/System.Web.Http.Test/Internal/TypeActivatorTest.cs @@ -6,9 +6,6 @@ using System.Net.Http; using System.Reflection; using System.Web.Http.Controllers; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Internal { diff --git a/test/System.Web.Http.Test/Metadata/ModelMetadataTest.cs b/test/System.Web.Http.Test/Metadata/ModelMetadataTest.cs index bff53b36..d71e992a 100644 --- a/test/System.Web.Http.Test/Metadata/ModelMetadataTest.cs +++ b/test/System.Web.Http.Test/Metadata/ModelMetadataTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Web.Http.Metadata.Providers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Metadata { diff --git a/test/System.Web.Http.Test/Metadata/Providers/AssociatedMetadataProviderTest.cs b/test/System.Web.Http.Test/Metadata/Providers/AssociatedMetadataProviderTest.cs index 9e329fdc..3aa5e3a0 100644 --- a/test/System.Web.Http.Test/Metadata/Providers/AssociatedMetadataProviderTest.cs +++ b/test/System.Web.Http.Test/Metadata/Providers/AssociatedMetadataProviderTest.cs @@ -5,8 +5,6 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Metadata.Providers { @@ -279,6 +277,6 @@ namespace System.Web.Http.Metadata.Providers } } - [RunWith(typeof(PartialTrustRunner))] + [PartialTrustRunner] public class PartialTrustAssociatedMetadataProviderTest : AssociatedMetadataProviderTest { } } diff --git a/test/System.Web.Http.Test/Metadata/Providers/DataAnnotationsModelMetadataProviderTest.cs b/test/System.Web.Http.Test/Metadata/Providers/DataAnnotationsModelMetadataProviderTest.cs index 966a158b..2b9f546c 100644 --- a/test/System.Web.Http.Test/Metadata/Providers/DataAnnotationsModelMetadataProviderTest.cs +++ b/test/System.Web.Http.Test/Metadata/Providers/DataAnnotationsModelMetadataProviderTest.cs @@ -5,8 +5,6 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Metadata.Providers { @@ -115,6 +113,6 @@ namespace System.Web.Http.Metadata.Providers } } - [RunWith(typeof(PartialTrustRunner))] + [PartialTrustRunner] public class CachedDataAnnotationsModelMetadataProviderPartialTrustTest : DataAnnotationsModelMetadataProviderTest { } } diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs index f9b6e407..26336b30 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/ArrayModelBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/ArrayModelBinderTest.cs index c4f3c259..a7aae73d 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/ArrayModelBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/ArrayModelBinderTest.cs @@ -3,8 +3,8 @@ using System.Web.Http.Controllers; using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs index 6f27f5b6..04f2915b 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Web.Http.Metadata.Providers; using System.Web.Http.ModelBinding.Binders; using System.Web.Http.Util; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/CollectionModelBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/CollectionModelBinderTest.cs index de0b692f..97e83612 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/CollectionModelBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/CollectionModelBinderTest.cs @@ -8,8 +8,8 @@ using System.Web.Http.Metadata.Providers; using System.Web.Http.ModelBinding.Binders; using System.Web.Http.Util; using System.Web.Http.Validation; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoModelBinderProviderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoModelBinderProviderTest.cs index 346357b8..01c52c4d 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoModelBinderProviderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoModelBinderProviderTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Http.Metadata.Providers; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoModelBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoModelBinderTest.cs index 6aba50d0..350f3ed8 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoModelBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoModelBinderTest.cs @@ -5,8 +5,8 @@ using System.Web.Http.Controllers; using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; using System.Web.Http.Validation; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoResultTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoResultTest.cs index dc85e8c2..70479412 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoResultTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoResultTest.cs @@ -3,8 +3,7 @@ using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; using System.Web.Http.Validation; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoTest.cs index f6ea6ff9..83fc3ca4 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/ComplexModelDtoTest.cs @@ -3,8 +3,7 @@ using System.Linq; using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs index b38c5be4..62d0110e 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs index 4ec366a0..001d6387 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.Web.Http.Controllers; using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs index 4b6edfee..a54a87ca 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs index 4cdff6eb..9940874e 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs @@ -5,8 +5,8 @@ using System.Linq; using System.Web.Http.Controllers; using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderUtilTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderUtilTest.cs index 18173102..50d4a8bf 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderUtilTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/KeyValuePairModelBinderUtilTest.cs @@ -3,8 +3,8 @@ using System.Web.Http.Controllers; using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/MutableObjectModelBinderProviderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/MutableObjectModelBinderProviderTest.cs index 147675d4..a7d97cf4 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/MutableObjectModelBinderProviderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/MutableObjectModelBinderProviderTest.cs @@ -2,7 +2,7 @@ using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/MutableObjectModelBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/MutableObjectModelBinderTest.cs index 7cb529b9..2c0a8a91 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/MutableObjectModelBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/MutableObjectModelBinderTest.cs @@ -9,9 +9,8 @@ using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; using System.Web.Http.Validation; using System.Web.Http.ValueProviders; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/SimpleModelBinderProviderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/SimpleModelBinderProviderTest.cs index 3c51c0c9..07f6c783 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/SimpleModelBinderProviderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/SimpleModelBinderProviderTest.cs @@ -2,9 +2,8 @@ using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/TypeConverterModelBinderProviderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/TypeConverterModelBinderProviderTest.cs index c6e2907f..925c3968 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/TypeConverterModelBinderProviderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/TypeConverterModelBinderProviderTest.cs @@ -2,7 +2,7 @@ using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/TypeConverterModelBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/TypeConverterModelBinderTest.cs index 8ce8da4d..28f9f468 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/TypeConverterModelBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/TypeConverterModelBinderTest.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using System.Globalization; using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/TypeMatchModelBinderProviderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/TypeMatchModelBinderProviderTest.cs index 49000671..fb00de46 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/TypeMatchModelBinderProviderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/TypeMatchModelBinderProviderTest.cs @@ -2,7 +2,7 @@ using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/Binders/TypeMatchModelBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/Binders/TypeMatchModelBinderTest.cs index 97caceda..9e770bae 100644 --- a/test/System.Web.Http.Test/ModelBinding/Binders/TypeMatchModelBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/Binders/TypeMatchModelBinderTest.cs @@ -3,7 +3,7 @@ using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; using System.Web.Http.ValueProviders; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding.Binders { diff --git a/test/System.Web.Http.Test/ModelBinding/CompositeModelBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/CompositeModelBinderTest.cs index 717dd15f..b4e53f56 100644 --- a/test/System.Web.Http.Test/ModelBinding/CompositeModelBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/CompositeModelBinderTest.cs @@ -6,8 +6,8 @@ using System.Web.Http.Controllers; using System.Web.Http.Metadata.Providers; using System.Web.Http.ModelBinding.Binders; using System.Web.Http.ValueProviders; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/DefaultActionValueBinderTest.cs b/test/System.Web.Http.Test/ModelBinding/DefaultActionValueBinderTest.cs index 5c2a47c2..63e3c5eb 100644 --- a/test/System.Web.Http.Test/ModelBinding/DefaultActionValueBinderTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/DefaultActionValueBinderTest.cs @@ -7,9 +7,8 @@ using System.Reflection; using System.Threading; using System.Web.Http.Controllers; using System.Web.Http.ValueProviders; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/FormDataCollectionExtensionsTest.cs b/test/System.Web.Http.Test/ModelBinding/FormDataCollectionExtensionsTest.cs index 591b7a4e..0ab80975 100644 --- a/test/System.Web.Http.Test/ModelBinding/FormDataCollectionExtensionsTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/FormDataCollectionExtensionsTest.cs @@ -4,10 +4,8 @@ using System.Net.Http; using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Text; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/HttpBindingBehaviorAttributeTest.cs b/test/System.Web.Http.Test/ModelBinding/HttpBindingBehaviorAttributeTest.cs index 24d78599..06ddb27e 100644 --- a/test/System.Web.Http.Test/ModelBinding/HttpBindingBehaviorAttributeTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/HttpBindingBehaviorAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/HttpParameterBindingExtensionsTest.cs b/test/System.Web.Http.Test/ModelBinding/HttpParameterBindingExtensionsTest.cs index 0cc776a2..e83d8763 100644 --- a/test/System.Web.Http.Test/ModelBinding/HttpParameterBindingExtensionsTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/HttpParameterBindingExtensionsTest.cs @@ -6,9 +6,8 @@ using System.Web.Http.Controllers; using System.Web.Http.Internal; using System.Web.Http.ValueProviders; using System.Web.Http.ValueProviders.Providers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/ModelBinderAttributeTest.cs b/test/System.Web.Http.Test/ModelBinding/ModelBinderAttributeTest.cs index 8f0fd100..e660feb3 100644 --- a/test/System.Web.Http.Test/ModelBinding/ModelBinderAttributeTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/ModelBinderAttributeTest.cs @@ -5,9 +5,8 @@ using System.Linq; using System.Web.Http.Controllers; using System.Web.Http.Dependencies; using System.Web.Http.ValueProviders; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/ModelBinderConfigTest.cs b/test/System.Web.Http.Test/ModelBinding/ModelBinderConfigTest.cs index 67a1d343..049d3049 100644 --- a/test/System.Web.Http.Test/ModelBinding/ModelBinderConfigTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/ModelBinderConfigTest.cs @@ -3,8 +3,8 @@ using System.Web.Http.Controllers; using System.Web.Http.Metadata; using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/ModelBindingContextTest.cs b/test/System.Web.Http.Test/ModelBinding/ModelBindingContextTest.cs index 351eeaa1..3232ba7e 100644 --- a/test/System.Web.Http.Test/ModelBinding/ModelBindingContextTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/ModelBindingContextTest.cs @@ -4,8 +4,7 @@ using System.Web.Http.Metadata.Providers; using System.Web.Http.Util; using System.Web.Http.Validation; using System.Web.TestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/ModelBindingUtilTest.cs b/test/System.Web.Http.Test/ModelBinding/ModelBindingUtilTest.cs index 0e79888a..e4528329 100644 --- a/test/System.Web.Http.Test/ModelBinding/ModelBindingUtilTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/ModelBindingUtilTest.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Web.Http.Controllers; using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/ModelBinding/ParameterBindingProvidersTest.cs b/test/System.Web.Http.Test/ModelBinding/ParameterBindingProvidersTest.cs index 5d050e19..561c7196 100644 --- a/test/System.Web.Http.Test/ModelBinding/ParameterBindingProvidersTest.cs +++ b/test/System.Web.Http.Test/ModelBinding/ParameterBindingProvidersTest.cs @@ -3,9 +3,8 @@ using System.Collections.ObjectModel; using System.Web.Http.Controllers; using System.Web.Http.Metadata; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.ModelBinding { diff --git a/test/System.Web.Http.Test/Routing/HttpRouteTest.cs b/test/System.Web.Http.Test/Routing/HttpRouteTest.cs index ecf45f25..aff085e5 100644 --- a/test/System.Web.Http.Test/Routing/HttpRouteTest.cs +++ b/test/System.Web.Http.Test/Routing/HttpRouteTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.Routing { diff --git a/test/System.Web.Http.Test/Routing/HttpRouteValueDictionaryTest.cs b/test/System.Web.Http.Test/Routing/HttpRouteValueDictionaryTest.cs index 3bf31206..55bfbf31 100644 --- a/test/System.Web.Http.Test/Routing/HttpRouteValueDictionaryTest.cs +++ b/test/System.Web.Http.Test/Routing/HttpRouteValueDictionaryTest.cs @@ -3,9 +3,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Routing { diff --git a/test/System.Web.Http.Test/Routing/MediaTypeFormatterExtensionsTests.cs b/test/System.Web.Http.Test/Routing/MediaTypeFormatterExtensionsTests.cs index a03de629..3035b756 100644 --- a/test/System.Web.Http.Test/Routing/MediaTypeFormatterExtensionsTests.cs +++ b/test/System.Web.Http.Test/Routing/MediaTypeFormatterExtensionsTests.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http.Headers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Web.Http.Test/Routing/UriPathExtensionMappingTests.cs b/test/System.Web.Http.Test/Routing/UriPathExtensionMappingTests.cs index 6140b2e3..672b1d9c 100644 --- a/test/System.Web.Http.Test/Routing/UriPathExtensionMappingTests.cs +++ b/test/System.Web.Http.Test/Routing/UriPathExtensionMappingTests.cs @@ -6,9 +6,6 @@ using System.Web.Http.Hosting; using System.Web.Http.Routing; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Net.Http.Formatting { diff --git a/test/System.Web.Http.Test/Routing/UrlHelperTest.cs b/test/System.Web.Http.Test/Routing/UrlHelperTest.cs index 4f2252b5..16ab4684 100644 --- a/test/System.Web.Http.Test/Routing/UrlHelperTest.cs +++ b/test/System.Web.Http.Test/Routing/UrlHelperTest.cs @@ -4,9 +4,6 @@ using System.Collections.Generic; using System.Net.Http; using System.Web.Http.Hosting; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Routing { diff --git a/test/System.Web.Http.Test/Services/ControllerServicesTests.cs b/test/System.Web.Http.Test/Services/ControllerServicesTests.cs index 2482a94a..92498a75 100644 --- a/test/System.Web.Http.Test/Services/ControllerServicesTests.cs +++ b/test/System.Web.Http.Test/Services/ControllerServicesTests.cs @@ -5,9 +5,8 @@ using System.Linq; using System.Web.Http.Controllers; using System.Web.Http.Dependencies; using System.Web.Http.ValueProviders; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Services { diff --git a/test/System.Web.Http.Test/Services/DefaultServicesTests.cs b/test/System.Web.Http.Test/Services/DefaultServicesTests.cs index c5c487ec..b9f4268e 100644 --- a/test/System.Web.Http.Test/Services/DefaultServicesTests.cs +++ b/test/System.Web.Http.Test/Services/DefaultServicesTests.cs @@ -17,9 +17,8 @@ using System.Web.Http.Validation; using System.Web.Http.Validation.Providers; using System.Web.Http.ValueProviders; using System.Web.Http.ValueProviders.Providers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Services { diff --git a/test/System.Web.Http.Test/Services/ServicesExtensionsTests.cs b/test/System.Web.Http.Test/Services/ServicesExtensionsTests.cs index 16890378..9c6cf00b 100644 --- a/test/System.Web.Http.Test/Services/ServicesExtensionsTests.cs +++ b/test/System.Web.Http.Test/Services/ServicesExtensionsTests.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Http.Controllers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Services { diff --git a/test/System.Web.Http.Test/Tracing/FormattingUtilitiesTest.cs b/test/System.Web.Http.Test/Tracing/FormattingUtilitiesTest.cs index c643dd90..4a324c9d 100644 --- a/test/System.Web.Http.Test/Tracing/FormattingUtilitiesTest.cs +++ b/test/System.Web.Http.Test/Tracing/FormattingUtilitiesTest.cs @@ -13,9 +13,6 @@ using System.Web.Http.ValueProviders; using System.Web.Http.ValueProviders.Providers; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing { diff --git a/test/System.Web.Http.Test/Tracing/HttpRequestMessageExtensionsTest.cs b/test/System.Web.Http.Test/Tracing/HttpRequestMessageExtensionsTest.cs index 13c8e1a9..daffe47f 100644 --- a/test/System.Web.Http.Test/Tracing/HttpRequestMessageExtensionsTest.cs +++ b/test/System.Web.Http.Test/Tracing/HttpRequestMessageExtensionsTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net.Http; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Tracing { diff --git a/test/System.Web.Http.Test/Tracing/ITraceWriterExtensionsTest.cs b/test/System.Web.Http.Test/Tracing/ITraceWriterExtensionsTest.cs index 0a956f34..057c2a9e 100644 --- a/test/System.Web.Http.Test/Tracing/ITraceWriterExtensionsTest.cs +++ b/test/System.Web.Http.Test/Tracing/ITraceWriterExtensionsTest.cs @@ -2,8 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Tracing { diff --git a/test/System.Web.Http.Test/Tracing/TraceManagerTest.cs b/test/System.Web.Http.Test/Tracing/TraceManagerTest.cs index 9dbb8a35..8f159f4e 100644 --- a/test/System.Web.Http.Test/Tracing/TraceManagerTest.cs +++ b/test/System.Web.Http.Test/Tracing/TraceManagerTest.cs @@ -5,10 +5,8 @@ using System.Net.Http.Formatting; using System.Web.Http.Controllers; using System.Web.Http.Dispatcher; using System.Web.Http.Tracing.Tracers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing { diff --git a/test/System.Web.Http.Test/Tracing/TracerCorrectnessTest.cs b/test/System.Web.Http.Test/Tracing/TracerCorrectnessTest.cs index b7f017a5..9582dcfe 100644 --- a/test/System.Web.Http.Test/Tracing/TracerCorrectnessTest.cs +++ b/test/System.Web.Http.Test/Tracing/TracerCorrectnessTest.cs @@ -11,9 +11,6 @@ using System.Web.Http.Filters; using System.Web.Http.ModelBinding; using System.Web.Http.Tracing.Tracers; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/ActionFilterAttributeTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/ActionFilterAttributeTracerTest.cs index d181b09e..62813fa3 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/ActionFilterAttributeTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/ActionFilterAttributeTracerTest.cs @@ -6,9 +6,8 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/ActionFilterTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/ActionFilterTracerTest.cs index 6d42ab2c..8c5d8fe6 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/ActionFilterTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/ActionFilterTracerTest.cs @@ -6,9 +6,8 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/ActionValueBinderTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/ActionValueBinderTracerTest.cs index d7128000..8d156370 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/ActionValueBinderTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/ActionValueBinderTracerTest.cs @@ -5,9 +5,8 @@ using System.Net.Http; using System.Net.Http.Formatting; using System.Web.Http.Controllers; using System.Web.Http.ModelBinding; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/AuthorizationFilterAttributeTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/AuthorizationFilterAttributeTracerTest.cs index 02fde364..9e0dfb7a 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/AuthorizationFilterAttributeTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/AuthorizationFilterAttributeTracerTest.cs @@ -6,9 +6,8 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/AuthorizationFilterTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/AuthorizationFilterTracerTest.cs index 8ecccbd4..d70bd02c 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/AuthorizationFilterTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/AuthorizationFilterTracerTest.cs @@ -6,9 +6,8 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/BufferedMediaTypeFormatterTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/BufferedMediaTypeFormatterTracerTest.cs index 39258621..59fdc8f0 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/BufferedMediaTypeFormatterTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/BufferedMediaTypeFormatterTracerTest.cs @@ -3,9 +3,8 @@ using System.IO; using System.Net.Http; using System.Net.Http.Formatting; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/ContentNegotiatorTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/ContentNegotiatorTracerTest.cs index 12e2f5d5..5c231835 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/ContentNegotiatorTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/ContentNegotiatorTracerTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Net.Http; using System.Net.Http.Formatting; using System.Net.Http.Headers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/ExceptionFilterAttributeTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/ExceptionFilterAttributeTracerTest.cs index df1b1270..84d5e89c 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/ExceptionFilterAttributeTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/ExceptionFilterAttributeTracerTest.cs @@ -6,9 +6,8 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/ExceptionFilterTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/ExceptionFilterTracerTest.cs index ed26b00c..959dee88 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/ExceptionFilterTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/ExceptionFilterTracerTest.cs @@ -4,9 +4,8 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/FilterTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/FilterTracerTest.cs index 333b5623..bfbee4dc 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/FilterTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/FilterTracerTest.cs @@ -6,9 +6,8 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/FormUrlEncodedMediaTypeFormatterTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/FormUrlEncodedMediaTypeFormatterTracerTest.cs index 4aba3dbe..3ef6924e 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/FormUrlEncodedMediaTypeFormatterTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/FormUrlEncodedMediaTypeFormatterTracerTest.cs @@ -2,8 +2,7 @@ using System.Net.Http; using System.Net.Http.Formatting; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/FormatterParameterBindingTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/FormatterParameterBindingTracerTest.cs index c80b0c7a..1b706690 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/FormatterParameterBindingTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/FormatterParameterBindingTracerTest.cs @@ -10,9 +10,8 @@ using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; using System.Web.Http.ModelBinding; using System.Web.Http.Validation; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/HttpActionBindingTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/HttpActionBindingTracerTest.cs index e6ef9cb5..ca6a55ab 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/HttpActionBindingTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/HttpActionBindingTracerTest.cs @@ -5,9 +5,8 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/HttpActionDescriptorTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/HttpActionDescriptorTracerTest.cs index 2ee08106..e46e07c6 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/HttpActionDescriptorTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/HttpActionDescriptorTracerTest.cs @@ -9,9 +9,8 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/HttpActionInvokerTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/HttpActionInvokerTracerTest.cs index 216baf97..27b7d77b 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/HttpActionInvokerTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/HttpActionInvokerTracerTest.cs @@ -4,9 +4,8 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/HttpActionSelectorTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/HttpActionSelectorTracerTest.cs index 805c31d2..0c74f437 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/HttpActionSelectorTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/HttpActionSelectorTracerTest.cs @@ -3,9 +3,8 @@ using System.Collections.ObjectModel; using System.Net.Http; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerActivatorTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerActivatorTracerTest.cs index e979bf20..01cefe93 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerActivatorTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerActivatorTracerTest.cs @@ -3,9 +3,8 @@ using System.Net.Http; using System.Web.Http.Controllers; using System.Web.Http.Dispatcher; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerDescriptorTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerDescriptorTracerTest.cs index 919ff015..1163c471 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerDescriptorTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerDescriptorTracerTest.cs @@ -3,8 +3,8 @@ using System.Collections.Concurrent; using System.Net.Http; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerSelectorTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerSelectorTracerTest.cs index 71b528db..769465a3 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerSelectorTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerSelectorTracerTest.cs @@ -3,9 +3,8 @@ using System.Net.Http; using System.Web.Http.Controllers; using System.Web.Http.Dispatcher; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerTracerTest.cs index cd17cf85..11f46a7e 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/HttpControllerTracerTest.cs @@ -7,9 +7,8 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Hosting; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/HttpParameterBindingTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/HttpParameterBindingTracerTest.cs index 781ab8bf..f42869d6 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/HttpParameterBindingTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/HttpParameterBindingTracerTest.cs @@ -9,9 +9,8 @@ using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; using System.Web.Http.ModelBinding; using System.Web.Http.ValueProviders; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/JsonMediaTypeFormatterTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/JsonMediaTypeFormatterTracerTest.cs index cdba101e..6dfc63ef 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/JsonMediaTypeFormatterTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/JsonMediaTypeFormatterTracerTest.cs @@ -2,9 +2,8 @@ using System.Net.Http; using System.Net.Http.Formatting; +using Microsoft.TestCommon; using Newtonsoft.Json; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/MediaTypeFormatterTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/MediaTypeFormatterTracerTest.cs index 9ffc9ef1..99b3fb95 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/MediaTypeFormatterTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/MediaTypeFormatterTracerTest.cs @@ -4,8 +4,6 @@ using System.Net.Http; using System.Net.Http.Formatting; using Microsoft.TestCommon; using Moq; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/MediaTypeFormatterTracerTestBase.cs b/test/System.Web.Http.Test/Tracing/Tracers/MediaTypeFormatterTracerTestBase.cs index 909d9def..ca84b90e 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/MediaTypeFormatterTracerTestBase.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/MediaTypeFormatterTracerTestBase.cs @@ -4,9 +4,8 @@ using System.Net.Http; using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Text; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/MessageHandlerTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/MessageHandlerTracerTest.cs index cb164978..14fa4ced 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/MessageHandlerTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/MessageHandlerTracerTest.cs @@ -4,8 +4,7 @@ using System.Net.Http; using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/ReadWriteMediaTypeFormatterTracerTestBase.cs b/test/System.Web.Http.Test/Tracing/Tracers/ReadWriteMediaTypeFormatterTracerTestBase.cs index 09f769da..a4a17890 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/ReadWriteMediaTypeFormatterTracerTestBase.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/ReadWriteMediaTypeFormatterTracerTestBase.cs @@ -5,9 +5,8 @@ using System.Net; using System.Net.Http; using System.Net.Http.Formatting; using System.Threading.Tasks; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/RequestMessageHandlerTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/RequestMessageHandlerTracerTest.cs index 1d25525a..add1e30d 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/RequestMessageHandlerTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/RequestMessageHandlerTracerTest.cs @@ -4,8 +4,7 @@ using System.Net.Http; using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Tracing/Tracers/XmlMediaTypeFormatterTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/XmlMediaTypeFormatterTracerTest.cs index 13cbd2bd..3c145d3a 100644 --- a/test/System.Web.Http.Test/Tracing/Tracers/XmlMediaTypeFormatterTracerTest.cs +++ b/test/System.Web.Http.Test/Tracing/Tracers/XmlMediaTypeFormatterTracerTest.cs @@ -2,8 +2,7 @@ using System.Net.Http; using System.Net.Http.Formatting; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Tracing.Tracers { diff --git a/test/System.Web.Http.Test/Validation/DefaultBodyModelValidatorTest.cs b/test/System.Web.Http.Test/Validation/DefaultBodyModelValidatorTest.cs index 617f37f5..66ae0f95 100644 --- a/test/System.Web.Http.Test/Validation/DefaultBodyModelValidatorTest.cs +++ b/test/System.Web.Http.Test/Validation/DefaultBodyModelValidatorTest.cs @@ -7,9 +7,6 @@ using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; using System.Web.Http.ModelBinding; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Validation { diff --git a/test/System.Web.Http.Test/Validation/ModelStateFormatterLoggerTest.cs b/test/System.Web.Http.Test/Validation/ModelStateFormatterLoggerTest.cs index ac2863b1..1c14cc71 100644 --- a/test/System.Web.Http.Test/Validation/ModelStateFormatterLoggerTest.cs +++ b/test/System.Web.Http.Test/Validation/ModelStateFormatterLoggerTest.cs @@ -2,8 +2,7 @@ using System.Net.Http.Formatting; using System.Web.Http.ModelBinding; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Validation { diff --git a/test/System.Web.Http.Test/Validation/ModelValidationNodeTest.cs b/test/System.Web.Http.Test/Validation/ModelValidationNodeTest.cs index 6342e4ab..b30a6ebd 100644 --- a/test/System.Web.Http.Test/Validation/ModelValidationNodeTest.cs +++ b/test/System.Web.Http.Test/Validation/ModelValidationNodeTest.cs @@ -6,8 +6,7 @@ using System.Linq; using System.Web.Http.Controllers; using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Validation { diff --git a/test/System.Web.Http.Test/Validation/ModelValidationRequiredMemberSelectorTest.cs b/test/System.Web.Http.Test/Validation/ModelValidationRequiredMemberSelectorTest.cs index 5c0f2d16..02224285 100644 --- a/test/System.Web.Http.Test/Validation/ModelValidationRequiredMemberSelectorTest.cs +++ b/test/System.Web.Http.Test/Validation/ModelValidationRequiredMemberSelectorTest.cs @@ -4,8 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Net.Http.Formatting; using System.Reflection; using System.Runtime.Serialization; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Validation { diff --git a/test/System.Web.Http.Test/Validation/ModelValidationResultTest.cs b/test/System.Web.Http.Test/Validation/ModelValidationResultTest.cs index 26de687f..723f5ede 100644 --- a/test/System.Web.Http.Test/Validation/ModelValidationResultTest.cs +++ b/test/System.Web.Http.Test/Validation/ModelValidationResultTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.TestUtil; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.Validation { diff --git a/test/System.Web.Http.Test/Validation/ModelValidatorTest.cs b/test/System.Web.Http.Test/Validation/ModelValidatorTest.cs index 3d333d4c..ca4aaa6f 100644 --- a/test/System.Web.Http.Test/Validation/ModelValidatorTest.cs +++ b/test/System.Web.Http.Test/Validation/ModelValidatorTest.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Validation { diff --git a/test/System.Web.Http.Test/Validation/Providers/AssociatedValidatorProviderTest.cs b/test/System.Web.Http.Test/Validation/Providers/AssociatedValidatorProviderTest.cs index cff07713..0b25bdf1 100644 --- a/test/System.Web.Http.Test/Validation/Providers/AssociatedValidatorProviderTest.cs +++ b/test/System.Web.Http.Test/Validation/Providers/AssociatedValidatorProviderTest.cs @@ -5,9 +5,8 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Validation.Providers { diff --git a/test/System.Web.Http.Test/Validation/Providers/DataAnnotationsModelValidatorProviderTest.cs b/test/System.Web.Http.Test/Validation/Providers/DataAnnotationsModelValidatorProviderTest.cs index 057fd84d..5cca4562 100644 --- a/test/System.Web.Http.Test/Validation/Providers/DataAnnotationsModelValidatorProviderTest.cs +++ b/test/System.Web.Http.Test/Validation/Providers/DataAnnotationsModelValidatorProviderTest.cs @@ -6,9 +6,8 @@ using System.Linq; using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; using System.Web.Http.Validation.Validators; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Validation.Providers { diff --git a/test/System.Web.Http.Test/Validation/Providers/DataMemberModelValidatorProviderTest.cs b/test/System.Web.Http.Test/Validation/Providers/DataMemberModelValidatorProviderTest.cs index 217046d2..0b8c773a 100644 --- a/test/System.Web.Http.Test/Validation/Providers/DataMemberModelValidatorProviderTest.cs +++ b/test/System.Web.Http.Test/Validation/Providers/DataMemberModelValidatorProviderTest.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using System.Web.Http.Metadata.Providers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Validation.Providers { diff --git a/test/System.Web.Http.Test/Validation/Providers/InvalidModelValidatorProviderTest.cs b/test/System.Web.Http.Test/Validation/Providers/InvalidModelValidatorProviderTest.cs index 497ee441..3d2a4ae0 100644 --- a/test/System.Web.Http.Test/Validation/Providers/InvalidModelValidatorProviderTest.cs +++ b/test/System.Web.Http.Test/Validation/Providers/InvalidModelValidatorProviderTest.cs @@ -5,8 +5,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Runtime.Serialization; using System.Web.Http.Metadata.Providers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Validation.Providers { diff --git a/test/System.Web.Http.Test/Validation/Validators/DataAnnotationsModelValidatorTest.cs b/test/System.Web.Http.Test/Validation/Validators/DataAnnotationsModelValidatorTest.cs index 42bfa8d3..156c1c0d 100644 --- a/test/System.Web.Http.Test/Validation/Validators/DataAnnotationsModelValidatorTest.cs +++ b/test/System.Web.Http.Test/Validation/Validators/DataAnnotationsModelValidatorTest.cs @@ -5,10 +5,9 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Http.Metadata; using System.Web.Http.Metadata.Providers; +using Microsoft.TestCommon; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.Validation.Validators { diff --git a/test/System.Web.Http.Test/Validation/Validators/ErrorModelValidatorTest.cs b/test/System.Web.Http.Test/Validation/Validators/ErrorModelValidatorTest.cs index df5ce823..763b90cd 100644 --- a/test/System.Web.Http.Test/Validation/Validators/ErrorModelValidatorTest.cs +++ b/test/System.Web.Http.Test/Validation/Validators/ErrorModelValidatorTest.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.Http.Metadata.Providers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.Validation.Validators { diff --git a/test/System.Web.Http.Test/ValueProviders/Providers/NameValuePairsValueProviderTest.cs b/test/System.Web.Http.Test/ValueProviders/Providers/NameValuePairsValueProviderTest.cs index bd978872..7b685e49 100644 --- a/test/System.Web.Http.Test/ValueProviders/Providers/NameValuePairsValueProviderTest.cs +++ b/test/System.Web.Http.Test/ValueProviders/Providers/NameValuePairsValueProviderTest.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.ValueProviders.Providers { diff --git a/test/System.Web.Http.Test/ValueProviders/Providers/QueryStringValueProviderFactoryTest.cs b/test/System.Web.Http.Test/ValueProviders/Providers/QueryStringValueProviderFactoryTest.cs index 76d6e58e..66fafc96 100644 --- a/test/System.Web.Http.Test/ValueProviders/Providers/QueryStringValueProviderFactoryTest.cs +++ b/test/System.Web.Http.Test/ValueProviders/Providers/QueryStringValueProviderFactoryTest.cs @@ -3,8 +3,7 @@ using System.Globalization; using System.Net.Http; using System.Web.Http.Controllers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.ValueProviders.Providers { diff --git a/test/System.Web.Http.Test/ValueProviders/Providers/QueryStringValueProviderTest.cs b/test/System.Web.Http.Test/ValueProviders/Providers/QueryStringValueProviderTest.cs index 2acee728..d140dd4a 100644 --- a/test/System.Web.Http.Test/ValueProviders/Providers/QueryStringValueProviderTest.cs +++ b/test/System.Web.Http.Test/ValueProviders/Providers/QueryStringValueProviderTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Net.Http; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Http.ValueProviders.Providers { diff --git a/test/System.Web.Http.Test/ValueProviders/Providers/RouteDataValueProviderFactoryTest.cs b/test/System.Web.Http.Test/ValueProviders/Providers/RouteDataValueProviderFactoryTest.cs index 0fc80356..b8bfda0e 100644 --- a/test/System.Web.Http.Test/ValueProviders/Providers/RouteDataValueProviderFactoryTest.cs +++ b/test/System.Web.Http.Test/ValueProviders/Providers/RouteDataValueProviderFactoryTest.cs @@ -3,8 +3,7 @@ using System.Globalization; using System.Net.Http; using System.Web.Http.Controllers; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Http.ValueProviders.Providers { diff --git a/test/System.Web.Http.Tracing.Test/System.Web.Http.Tracing.Test.csproj b/test/System.Web.Http.Tracing.Test/System.Web.Http.Tracing.Test.csproj index b97d0245..3c5b3dd9 100644 --- a/test/System.Web.Http.Tracing.Test/System.Web.Http.Tracing.Test.csproj +++ b/test/System.Web.Http.Tracing.Test/System.Web.Http.Tracing.Test.csproj @@ -49,7 +49,7 @@ - ..\..\packages\Newtonsoft.Json.4.5.7\lib\net40\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll ..\..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll @@ -79,6 +79,10 @@ {6E81EF98-8F5C-4EED-8B37-456991CA56FD} System.Web.Http.Tracing + + {fccc4cb7-baf7-4a57-9f89-e5766fe536c0} + Microsoft.TestCommon + diff --git a/test/System.Web.Http.Tracing.Test/SystemDiagnosticsTraceWriterTest.cs b/test/System.Web.Http.Tracing.Test/SystemDiagnosticsTraceWriterTest.cs index fe99e8aa..96d94815 100644 --- a/test/System.Web.Http.Tracing.Test/SystemDiagnosticsTraceWriterTest.cs +++ b/test/System.Web.Http.Tracing.Test/SystemDiagnosticsTraceWriterTest.cs @@ -6,8 +6,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Formatting; using System.Web.Http.ModelBinding; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Http.Tracing.Diagnostics.Test { @@ -99,9 +98,9 @@ namespace System.Web.Http.Tracing.Diagnostics.Test // Act & Assert ArgumentNullException exception = Assert.Throws( - () => writer.Trace(new HttpRequestMessage(), - null, - TraceLevel.Info, + () => writer.Trace(new HttpRequestMessage(), + null, + TraceLevel.Info, (tr) => { })); Assert.Equal("category", exception.ParamName); } @@ -132,7 +131,7 @@ namespace System.Web.Http.Tracing.Diagnostics.Test // Act & Assert ArgumentOutOfRangeException exception = Assert.Throws( () => writer.Trace(new HttpRequestMessage(), - "MyCategory", + "MyCategory", level, (tr) => { })); Assert.Equal("level", exception.ParamName); @@ -161,8 +160,8 @@ namespace System.Web.Http.Tracing.Diagnostics.Test [Theory] [InlineData(TraceLevel.Debug, TraceEventType.Verbose)] - [InlineData(TraceLevel.Info, TraceEventType.Information)] - [InlineData(TraceLevel.Warn, TraceEventType.Warning)] + [InlineData(TraceLevel.Info, TraceEventType.Information)] + [InlineData(TraceLevel.Warn, TraceEventType.Warning)] [InlineData(TraceLevel.Error, TraceEventType.Error)] [InlineData(TraceLevel.Fatal, TraceEventType.Critical)] public void Trace_Writes_Correct_EventType_To_TraceListeners(TraceLevel level, TraceEventType diagnosticLevel) @@ -181,7 +180,7 @@ namespace System.Web.Http.Tracing.Diagnostics.Test writer.Trace(request, "TestCategory", level, (tr) => { tr.Message = "TestMessage"; }); // Assert - Assert.Equal(diagnosticLevel, ((TestTraceListener) writer.TraceSource.Listeners[0]).TraceEventType); + Assert.Equal(diagnosticLevel, ((TestTraceListener)writer.TraceSource.Listeners[0]).TraceEventType); } [Theory] @@ -206,7 +205,8 @@ namespace System.Web.Http.Tracing.Diagnostics.Test InvalidOperationException exception = new InvalidOperationException("TestException"); // Act - writer.Trace(request, "TestCategory", level, (tr) => { + writer.Trace(request, "TestCategory", level, (tr) => + { tr.Message = "TestMessage"; tr.Operation = "TestOperation"; tr.Operator = "TestOperator"; @@ -220,7 +220,7 @@ namespace System.Web.Http.Tracing.Diagnostics.Test request.GetCorrelationId().ToString(), exception.ToString()); - string actual = ((TestTraceListener) writer.TraceSource.Listeners[0]).Messages[0].Trim(); + string actual = ((TestTraceListener)writer.TraceSource.Listeners[0]).Messages[0].Trim(); string timePrefix = "] "; actual = actual.Substring(actual.IndexOf(timePrefix) + timePrefix.Length); Assert.Equal(expected, actual); @@ -375,7 +375,7 @@ namespace System.Web.Http.Tracing.Diagnostics.Test InvalidOperationException exception = new InvalidOperationException("TestException"); // Act - writer.Trace(request, "TestCategory", level-1, (tr) => {}); + writer.Trace(request, "TestCategory", level - 1, (tr) => { }); // Assert Assert.Equal(0, ((TestTraceListener)writer.TraceSource.Listeners[0]).Messages.Count); diff --git a/test/System.Web.Http.WebHost.Test/HttpControllerHandlerTest.cs b/test/System.Web.Http.WebHost.Test/HttpControllerHandlerTest.cs index 6662d53f..a1ade589 100644 --- a/test/System.Web.Http.WebHost.Test/HttpControllerHandlerTest.cs +++ b/test/System.Web.Http.WebHost.Test/HttpControllerHandlerTest.cs @@ -16,9 +16,6 @@ using System.Web.Http.Hosting; using Microsoft.TestCommon; using Moq; using Newtonsoft.Json.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.WebHost { @@ -189,7 +186,8 @@ namespace System.Web.Http.WebHost } [Fact] - public void SuppressFormsAuthenticationRedirect_DoesntRequireSuppressRedirect() { + public void SuppressFormsAuthenticationRedirect_DoesntRequireSuppressRedirect() + { // Arrange Mock contextMock = new Mock() { DefaultValue = DefaultValue.Mock }; IDictionary contextItems = new Hashtable(); @@ -202,18 +200,21 @@ namespace System.Web.Http.WebHost HttpControllerHandler.EnsureSuppressFormsAuthenticationRedirect(contextMock.Object); // Assert - if (suppressRedirect == null) { + if (suppressRedirect == null) + { // .NET 4.0 Assert.False(contextItems.Contains(SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey)); } - else { + else + { // .NET 4.5 Assert.False((bool)suppressRedirect.GetValue(contextMock.Object.Response, null)); } } [Fact] - public void SuppressFormsAuthenticationRedirect_RequireSuppressRedirect() { + public void SuppressFormsAuthenticationRedirect_RequireSuppressRedirect() + { // Arrange Mock contextMock = new Mock() { DefaultValue = DefaultValue.Mock }; IDictionary contextItems = new Hashtable(); @@ -226,12 +227,14 @@ namespace System.Web.Http.WebHost HttpControllerHandler.EnsureSuppressFormsAuthenticationRedirect(contextMock.Object); // Assert - if (suppressRedirect == null) { + if (suppressRedirect == null) + { // .NET 4.0 Assert.True(contextItems.Contains(SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey)); Assert.True((bool)contextItems[SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey]); } - else { + else + { // .NET 4.5 Assert.True((bool)suppressRedirect.GetValue(contextMock.Object.Response, null)); } @@ -412,7 +415,7 @@ namespace System.Web.Http.WebHost HttpResponseMessage errorResponse = new HttpResponseMessage(HttpStatusCode.MethodNotAllowed); errorResponse.Headers.Add("myHeader", "myValue"); errorResponse.Content = new StringContent("user message", Encoding.UTF8, "application/fake"); - + Mock formatterMock = new Mock() { CallBase = true }; formatterMock.Setup(m => m.WriteToStreamAsync(It.IsAny(), It.IsAny(), @@ -433,7 +436,7 @@ namespace System.Web.Http.WebHost task.Wait(); // Assert preparation -- deserialize the response - + memoryStream.Seek(0L, SeekOrigin.Begin); string responseContent = null; using (var streamReader = new StreamReader(memoryStream)) @@ -499,7 +502,7 @@ namespace System.Web.Http.WebHost It.IsAny(), It.IsAny(), It.IsAny(), - It.IsAny())).Throws(new NotSupportedException("Expected error")); + It.IsAny())).Throws(new NotSupportedException("Expected error")); // Create a local config to hook to the request to condition // the formatter selection for the error response @@ -652,7 +655,7 @@ namespace System.Web.Http.WebHost HttpResponseBase responseBase = responseBaseMock.Object; Mock contextMock = new Mock() { DefaultValue = DefaultValue.Mock }; contextMock.SetupGet(m => m.Response).Returns(responseBase); - + HttpRequestMessage request = new HttpRequestMessage(); request.Properties.Add(HttpPropertyKeys.IsLocalKey, new Lazy(() => true)); HttpResponseMessage response = new HttpResponseMessage() { RequestMessage = request }; diff --git a/test/System.Web.Http.WebHost.Test/RouteCollectionExtensionsTest.cs b/test/System.Web.Http.WebHost.Test/RouteCollectionExtensionsTest.cs index f035a1e3..957cac1d 100644 --- a/test/System.Web.Http.WebHost.Test/RouteCollectionExtensionsTest.cs +++ b/test/System.Web.Http.WebHost.Test/RouteCollectionExtensionsTest.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Web.Routing; using Microsoft.TestCommon; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http { diff --git a/test/System.Web.Http.WebHost.Test/Routing/HostedHttpRouteCollectionTest.cs b/test/System.Web.Http.WebHost.Test/Routing/HostedHttpRouteCollectionTest.cs index 28641608..99eba00a 100644 --- a/test/System.Web.Http.WebHost.Test/Routing/HostedHttpRouteCollectionTest.cs +++ b/test/System.Web.Http.WebHost.Test/Routing/HostedHttpRouteCollectionTest.cs @@ -5,9 +5,8 @@ using System.Net.Http; using System.Web.Http.Hosting; using System.Web.Http.Routing; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.WebHost.Routing { diff --git a/test/System.Web.Http.WebHost.Test/Routing/HostedUrlHelperTest.cs b/test/System.Web.Http.WebHost.Test/Routing/HostedUrlHelperTest.cs index 4e40069e..9ff7e8f6 100644 --- a/test/System.Web.Http.WebHost.Test/Routing/HostedUrlHelperTest.cs +++ b/test/System.Web.Http.WebHost.Test/Routing/HostedUrlHelperTest.cs @@ -5,9 +5,8 @@ using System.Net.Http; using System.Web.Http.Hosting; using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; using UrlHelper = System.Web.Http.Routing.UrlHelper; namespace System.Web.Http.WebHost.Routing diff --git a/test/System.Web.Http.WebHost.Test/Routing/HttpRequestMessageWrapperTest.cs b/test/System.Web.Http.WebHost.Test/Routing/HttpRequestMessageWrapperTest.cs index 768ebd96..35c17659 100644 --- a/test/System.Web.Http.WebHost.Test/Routing/HttpRequestMessageWrapperTest.cs +++ b/test/System.Web.Http.WebHost.Test/Routing/HttpRequestMessageWrapperTest.cs @@ -3,9 +3,6 @@ using System.Collections.Specialized; using System.Net.Http; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.WebHost.Routing { diff --git a/test/System.Web.Http.WebHost.Test/SuppressFormsAuthRedirectModuleTest.cs b/test/System.Web.Http.WebHost.Test/SuppressFormsAuthRedirectModuleTest.cs index 0d1b2edf..352af4f7 100644 --- a/test/System.Web.Http.WebHost.Test/SuppressFormsAuthRedirectModuleTest.cs +++ b/test/System.Web.Http.WebHost.Test/SuppressFormsAuthRedirectModuleTest.cs @@ -5,8 +5,6 @@ using System.Collections.Specialized; using System.Web.WebPages.TestUtils; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; namespace System.Web.Http.WebHost { @@ -16,7 +14,7 @@ namespace System.Web.Http.WebHost public void DisableAuthenticationRedirect_SetTheFlagToTrue() { // Arrange - Mock contextMock = new Mock() {DefaultValue = DefaultValue.Mock}; + Mock contextMock = new Mock() { DefaultValue = DefaultValue.Mock }; IDictionary contextItems = new Hashtable(); contextMock.SetupGet(hcb => hcb.Items).Returns(contextItems); @@ -24,8 +22,8 @@ namespace System.Web.Http.WebHost SuppressFormsAuthRedirectModule.DisableAuthenticationRedirect(contextMock.Object); // Assert - AssertEx.True(contextItems.Contains(SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey)); - AssertEx.True((bool) contextItems[SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey]); + Assert.True(contextItems.Contains(SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey)); + Assert.True((bool)contextItems[SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey]); } [Fact] @@ -40,8 +38,8 @@ namespace System.Web.Http.WebHost SuppressFormsAuthRedirectModule.AllowAuthenticationRedirect(contextMock.Object); // Assert - AssertEx.True(contextItems.Contains(SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey)); - AssertEx.False((bool) contextItems[SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey]); + Assert.True(contextItems.Contains(SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey)); + Assert.False((bool)contextItems[SuppressFormsAuthRedirectModule.DisableAuthenticationRedirectKey]); } [Fact] @@ -61,7 +59,7 @@ namespace System.Web.Http.WebHost SuppressFormsAuthRedirectModule.EnsureRestoreUnauthorized(disableRedirectStub); // Assert - AssertEx.Equal(401, response.StatusCode); + Assert.Equal(401, response.StatusCode); } [Fact] @@ -81,7 +79,7 @@ namespace System.Web.Http.WebHost SuppressFormsAuthRedirectModule.EnsureRestoreUnauthorized(disableRedirectStub); // Assert - AssertEx.Equal(200, response.StatusCode); + Assert.Equal(200, response.StatusCode); } [Fact] @@ -101,12 +99,13 @@ namespace System.Web.Http.WebHost SuppressFormsAuthRedirectModule.EnsureRestoreUnauthorized(disableRedirectStub); // Assert - AssertEx.Equal(302, response.StatusCode); + Assert.Equal(302, response.StatusCode); } [Fact] - public void OnEndRequest_IfWebApiControllerReturnsARedirect_DoNothing() { + public void OnEndRequest_IfWebApiControllerReturnsARedirect_DoNothing() + { // Arrange HttpResponse response = new HttpResponse(null); IDictionary contextItems = new Hashtable(); @@ -123,7 +122,7 @@ namespace System.Web.Http.WebHost SuppressFormsAuthRedirectModule.EnsureRestoreUnauthorized(disableRedirectStub); // Assert - AssertEx.Equal(302, response.StatusCode); + Assert.Equal(302, response.StatusCode); } [Fact] @@ -143,7 +142,7 @@ namespace System.Web.Http.WebHost SuppressFormsAuthRedirectModule.EnsureRestoreUnauthorized(disableRedirectStub); // Assert - AssertEx.Equal(200, response.StatusCode); + Assert.Equal(200, response.StatusCode); } [Theory] @@ -153,31 +152,35 @@ namespace System.Web.Http.WebHost [InlineData("foo", true)] public void GetDisabled_ParsesAppSettings(string setting, bool expected) { - AssertEx.Equal(expected, SuppressFormsAuthRedirectModule.GetEnabled(new NameValueCollection() { { SuppressFormsAuthRedirectModule.AppSettingsSuppressFormsAuthenticationRedirectKey, setting } })); + Assert.Equal(expected, SuppressFormsAuthRedirectModule.GetEnabled(new NameValueCollection() { { SuppressFormsAuthRedirectModule.AppSettingsSuppressFormsAuthenticationRedirectKey, setting } })); } - + [Fact] - public void PreApplicationStartCode_IsValid() + public void PreApplicationStartCode_IsValid() { PreAppStartTestHelper.TestPreAppStartClass(typeof(PreApplicationStartCode)); } } - internal class DisableRedirectStub : SuppressFormsAuthRedirectModule.IDisableRedirect { + internal class DisableRedirectStub : SuppressFormsAuthRedirectModule.IDisableRedirect + { private readonly IDictionary _contextItems; private readonly HttpResponse _response; - public DisableRedirectStub(IDictionary contextItems, HttpResponse response) { + public DisableRedirectStub(IDictionary contextItems, HttpResponse response) + { _contextItems = contextItems; _response = response; } - public IDictionary ContextItems { + public IDictionary ContextItems + { get { return _contextItems; } } - public HttpResponse Response { + public HttpResponse Response + { get { return _response; } } } diff --git a/test/System.Web.Http.WebHost.Test/WebHostBufferPolicySelectorTest.cs b/test/System.Web.Http.WebHost.Test/WebHostBufferPolicySelectorTest.cs index 2d80d039..aadb76b7 100644 --- a/test/System.Web.Http.WebHost.Test/WebHostBufferPolicySelectorTest.cs +++ b/test/System.Web.Http.WebHost.Test/WebHostBufferPolicySelectorTest.cs @@ -9,9 +9,6 @@ using System.Net.Http.Formatting; using System.Text; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Http.WebHost { diff --git a/test/System.Web.Mvc.Test/Ajax/Test/AjaxExtensionsTest.cs b/test/System.Web.Mvc.Test/Ajax/Test/AjaxExtensionsTest.cs index 6047d991..687a0ebd 100644 --- a/test/System.Web.Mvc.Test/Ajax/Test/AjaxExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Ajax/Test/AjaxExtensionsTest.cs @@ -7,10 +7,9 @@ using System.IO; using System.Threading; using System.Web.Mvc.Html; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Ajax.Test { diff --git a/test/System.Web.Mvc.Test/Ajax/Test/AjaxOptionsTest.cs b/test/System.Web.Mvc.Test/Ajax/Test/AjaxOptionsTest.cs index 2c944f17..179f6d65 100644 --- a/test/System.Web.Mvc.Test/Ajax/Test/AjaxOptionsTest.cs +++ b/test/System.Web.Mvc.Test/Ajax/Test/AjaxOptionsTest.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Web.TestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Ajax.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/AsyncActionDescriptorTest.cs b/test/System.Web.Mvc.Test/Async/Test/AsyncActionDescriptorTest.cs index 4725910f..cd118d97 100644 --- a/test/System.Web.Mvc.Test/Async/Test/AsyncActionDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/AsyncActionDescriptorTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/AsyncActionMethodSelectorTest.cs b/test/System.Web.Mvc.Test/Async/Test/AsyncActionMethodSelectorTest.cs index 6d9f648d..b41fdd9e 100644 --- a/test/System.Web.Mvc.Test/Async/Test/AsyncActionMethodSelectorTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/AsyncActionMethodSelectorTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/AsyncControllerActionInvokerTest.cs b/test/System.Web.Mvc.Test/Async/Test/AsyncControllerActionInvokerTest.cs index 916b2fde..da365068 100644 --- a/test/System.Web.Mvc.Test/Async/Test/AsyncControllerActionInvokerTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/AsyncControllerActionInvokerTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Threading; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/AsyncManagerTest.cs b/test/System.Web.Mvc.Test/Async/Test/AsyncManagerTest.cs index d5e3d09e..2eced42e 100644 --- a/test/System.Web.Mvc.Test/Async/Test/AsyncManagerTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/AsyncManagerTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Threading; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/AsyncResultWrapperTest.cs b/test/System.Web.Mvc.Test/Async/Test/AsyncResultWrapperTest.cs index e2d59b13..1b3cd13a 100644 --- a/test/System.Web.Mvc.Test/Async/Test/AsyncResultWrapperTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/AsyncResultWrapperTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Threading; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/AsyncUtilTest.cs b/test/System.Web.Mvc.Test/Async/Test/AsyncUtilTest.cs index 45377d2a..59730ff6 100644 --- a/test/System.Web.Mvc.Test/Async/Test/AsyncUtilTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/AsyncUtilTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Threading; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/OperationCounterTest.cs b/test/System.Web.Mvc.Test/Async/Test/OperationCounterTest.cs index 7dc23be9..8ce52438 100644 --- a/test/System.Web.Mvc.Test/Async/Test/OperationCounterTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/OperationCounterTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/ReflectedAsyncActionDescriptorTest.cs b/test/System.Web.Mvc.Test/Async/Test/ReflectedAsyncActionDescriptorTest.cs index 3824d5e6..f6fbe220 100644 --- a/test/System.Web.Mvc.Test/Async/Test/ReflectedAsyncActionDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/ReflectedAsyncActionDescriptorTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Reflection; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/ReflectedAsyncControllerDescriptorTest.cs b/test/System.Web.Mvc.Test/Async/Test/ReflectedAsyncControllerDescriptorTest.cs index 20415e2a..bb4e62d1 100644 --- a/test/System.Web.Mvc.Test/Async/Test/ReflectedAsyncControllerDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/ReflectedAsyncControllerDescriptorTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Reflection; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/SimpleAsyncResultTest.cs b/test/System.Web.Mvc.Test/Async/Test/SimpleAsyncResultTest.cs index cd55a9a2..ad684874 100644 --- a/test/System.Web.Mvc.Test/Async/Test/SimpleAsyncResultTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/SimpleAsyncResultTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Threading; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/SingleEntryGateTest.cs b/test/System.Web.Mvc.Test/Async/Test/SingleEntryGateTest.cs index f05445f4..4d6a3acd 100644 --- a/test/System.Web.Mvc.Test/Async/Test/SingleEntryGateTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/SingleEntryGateTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/SynchronizationContextUtilTest.cs b/test/System.Web.Mvc.Test/Async/Test/SynchronizationContextUtilTest.cs index d1738c5a..b62b0c2b 100644 --- a/test/System.Web.Mvc.Test/Async/Test/SynchronizationContextUtilTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/SynchronizationContextUtilTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Threading; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/SynchronousOperationExceptionTest.cs b/test/System.Web.Mvc.Test/Async/Test/SynchronousOperationExceptionTest.cs index 79744af5..359463da 100644 --- a/test/System.Web.Mvc.Test/Async/Test/SynchronousOperationExceptionTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/SynchronousOperationExceptionTest.cs @@ -2,8 +2,7 @@ using System.IO; using System.Runtime.Serialization.Formatters.Binary; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/TaskAsyncActionDescriptorTest.cs b/test/System.Web.Mvc.Test/Async/Test/TaskAsyncActionDescriptorTest.cs index ea5a9303..eea6bc10 100644 --- a/test/System.Web.Mvc.Test/Async/Test/TaskAsyncActionDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/TaskAsyncActionDescriptorTest.cs @@ -5,9 +5,8 @@ using System.Linq; using System.Reflection; using System.Threading; using System.Threading.Tasks; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/TaskWrapperAsyncResultTest.cs b/test/System.Web.Mvc.Test/Async/Test/TaskWrapperAsyncResultTest.cs index 0943daf2..6db097b9 100644 --- a/test/System.Web.Mvc.Test/Async/Test/TaskWrapperAsyncResultTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/TaskWrapperAsyncResultTest.cs @@ -2,8 +2,8 @@ using System.Threading; using System.Threading.Tasks; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/Async/Test/TriggerListenerTest.cs b/test/System.Web.Mvc.Test/Async/Test/TriggerListenerTest.cs index 42340afb..0c85b0b0 100644 --- a/test/System.Web.Mvc.Test/Async/Test/TriggerListenerTest.cs +++ b/test/System.Web.Mvc.Test/Async/Test/TriggerListenerTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Async.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/BinaryExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/BinaryExpressionFingerprintTest.cs index a70a457b..352f672d 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/BinaryExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/BinaryExpressionFingerprintTest.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/CachedExpressionCompilerTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/CachedExpressionCompilerTest.cs index 721069e5..3b960940 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/CachedExpressionCompilerTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/CachedExpressionCompilerTest.cs @@ -3,7 +3,7 @@ using System.Linq.Expressions; using System.Reflection; using System.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/ConditionalExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/ConditionalExpressionFingerprintTest.cs index 554cf10d..4fcd6e66 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/ConditionalExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/ConditionalExpressionFingerprintTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq.Expressions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/ConstantExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/ConstantExpressionFingerprintTest.cs index 1cb1a5f1..12d58223 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/ConstantExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/ConstantExpressionFingerprintTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq.Expressions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/DefaultExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/DefaultExpressionFingerprintTest.cs index b05c4ccd..bf68a378 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/DefaultExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/DefaultExpressionFingerprintTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq.Expressions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/ExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/ExpressionFingerprintTest.cs index f6606889..05a858e2 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/ExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/ExpressionFingerprintTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq.Expressions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/FingerprintingExpressionVisitorTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/FingerprintingExpressionVisitorTest.cs index 7931b969..1965fb14 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/FingerprintingExpressionVisitorTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/FingerprintingExpressionVisitorTest.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; using System.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/HoistingExpressionVisitorTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/HoistingExpressionVisitorTest.cs index 0df227f9..da93ffe0 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/HoistingExpressionVisitorTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/HoistingExpressionVisitorTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq.Expressions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/IndexExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/IndexExpressionFingerprintTest.cs index b75344f2..c3e26d91 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/IndexExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/IndexExpressionFingerprintTest.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/LambdaExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/LambdaExpressionFingerprintTest.cs index 11d3db3d..ac02d0e6 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/LambdaExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/LambdaExpressionFingerprintTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq.Expressions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/MemberExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/MemberExpressionFingerprintTest.cs index 8fe6aae3..de6dd099 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/MemberExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/MemberExpressionFingerprintTest.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/MethodCallExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/MethodCallExpressionFingerprintTest.cs index 4357b6c4..a1bba473 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/MethodCallExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/MethodCallExpressionFingerprintTest.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/ParameterExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/ParameterExpressionFingerprintTest.cs index d85c6214..182d4cf2 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/ParameterExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/ParameterExpressionFingerprintTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq.Expressions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/TypeBinaryExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/TypeBinaryExpressionFingerprintTest.cs index 9e9261b9..dfc7975c 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/TypeBinaryExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/TypeBinaryExpressionFingerprintTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq.Expressions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/ExpressionUtil/Test/UnaryExpressionFingerprintTest.cs b/test/System.Web.Mvc.Test/ExpressionUtil/Test/UnaryExpressionFingerprintTest.cs index dbd4ea5a..99ddd7a1 100644 --- a/test/System.Web.Mvc.Test/ExpressionUtil/Test/UnaryExpressionFingerprintTest.cs +++ b/test/System.Web.Mvc.Test/ExpressionUtil/Test/UnaryExpressionFingerprintTest.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.ExpressionUtil.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/ChildActionExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/ChildActionExtensionsTest.cs index d5c60b4a..fbad0872 100644 --- a/test/System.Web.Mvc.Test/Html/Test/ChildActionExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/ChildActionExtensionsTest.cs @@ -3,9 +3,8 @@ using System.IO; using System.Web.Mvc.Properties; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/DefaultDisplayTemplatesTest.cs b/test/System.Web.Mvc.Test/Html/Test/DefaultDisplayTemplatesTest.cs index cc3daa67..d63260a6 100644 --- a/test/System.Web.Mvc.Test/Html/Test/DefaultDisplayTemplatesTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/DefaultDisplayTemplatesTest.cs @@ -6,10 +6,9 @@ using System.Data.Objects.DataClasses; using System.Globalization; using System.IO; using System.Web.UI.WebControls; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/DefaultEditorTemplatesTest.cs b/test/System.Web.Mvc.Test/Html/Test/DefaultEditorTemplatesTest.cs index d6762c50..8f05f00c 100644 --- a/test/System.Web.Mvc.Test/Html/Test/DefaultEditorTemplatesTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/DefaultEditorTemplatesTest.cs @@ -8,10 +8,9 @@ using System.Drawing; using System.Globalization; using System.IO; using System.Web.UI.WebControls; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/DisplayNameExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/DisplayNameExtensionsTest.cs index d3e18ee1..bb0b0d55 100644 --- a/test/System.Web.Mvc.Test/Html/Test/DisplayNameExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/DisplayNameExtensionsTest.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Linq.Expressions; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/FormExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/FormExtensionsTest.cs index 28ccd924..f716c72c 100644 --- a/test/System.Web.Mvc.Test/Html/Test/FormExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/FormExtensionsTest.cs @@ -4,9 +4,9 @@ using System.Collections; using System.Collections.Specialized; using System.IO; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/InputExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/InputExtensionsTest.cs index 603a25f8..4c446f04 100644 --- a/test/System.Web.Mvc.Test/Html/Test/InputExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/InputExtensionsTest.cs @@ -6,8 +6,6 @@ using System.Web.Mvc.Test; using System.Web.Routing; using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/LabelExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/LabelExtensionsTest.cs index 65b7d269..0848ae5f 100644 --- a/test/System.Web.Mvc.Test/Html/Test/LabelExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/LabelExtensionsTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq.Expressions; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/LinkExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/LinkExtensionsTest.cs index 8d33d1db..271289e3 100644 --- a/test/System.Web.Mvc.Test/Html/Test/LinkExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/LinkExtensionsTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/MvcFormTest.cs b/test/System.Web.Mvc.Test/Html/Test/MvcFormTest.cs index 33a386d3..f00b79fc 100644 --- a/test/System.Web.Mvc.Test/Html/Test/MvcFormTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/MvcFormTest.cs @@ -2,9 +2,8 @@ using System.Collections; using System.IO; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/NameExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/NameExtensionsTest.cs index 1e2c525a..90b30478 100644 --- a/test/System.Web.Mvc.Test/Html/Test/NameExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/NameExtensionsTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/PartialExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/PartialExtensionsTest.cs index c4c44c2c..42bc0411 100644 --- a/test/System.Web.Mvc.Test/Html/Test/PartialExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/PartialExtensionsTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.IO; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/RenderPartialExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/RenderPartialExtensionsTest.cs index e8f7566b..6ef8e8d2 100644 --- a/test/System.Web.Mvc.Test/Html/Test/RenderPartialExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/RenderPartialExtensionsTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.IO; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/SelectExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/SelectExtensionsTest.cs index 29b1da69..dbf0ca88 100644 --- a/test/System.Web.Mvc.Test/Html/Test/SelectExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/SelectExtensionsTest.cs @@ -8,8 +8,6 @@ using System.Linq; using System.Web.Mvc.Test; using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/TemplateHelpersTest.cs b/test/System.Web.Mvc.Test/Html/Test/TemplateHelpersTest.cs index 0600a0ef..4ffcd7d2 100644 --- a/test/System.Web.Mvc.Test/Html/Test/TemplateHelpersTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/TemplateHelpersTest.cs @@ -9,10 +9,9 @@ using System.Net; using System.Threading; using System.Web.Routing; using System.Web.UI.WebControls; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/TextAreaExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/TextAreaExtensionsTest.cs index 00d40d8a..42c53208 100644 --- a/test/System.Web.Mvc.Test/Html/Test/TextAreaExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/TextAreaExtensionsTest.cs @@ -2,9 +2,8 @@ using System.Web.Mvc.Test; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/ValidationExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/ValidationExtensionsTest.cs index 3d1e299c..577b396c 100644 --- a/test/System.Web.Mvc.Test/Html/Test/ValidationExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/ValidationExtensionsTest.cs @@ -3,10 +3,9 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Html/Test/ValueExtensionsTest.cs b/test/System.Web.Mvc.Test/Html/Test/ValueExtensionsTest.cs index 73eb9247..21079e6e 100644 --- a/test/System.Web.Mvc.Test/Html/Test/ValueExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Html/Test/ValueExtensionsTest.cs @@ -3,8 +3,6 @@ using System.Web.Mvc.Test; using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Html.Test { diff --git a/test/System.Web.Mvc.Test/Razor/Test/MvcCSharpRazorCodeGeneratorTest.cs b/test/System.Web.Mvc.Test/Razor/Test/MvcCSharpRazorCodeGeneratorTest.cs index 29c951c2..d72e954f 100644 --- a/test/System.Web.Mvc.Test/Razor/Test/MvcCSharpRazorCodeGeneratorTest.cs +++ b/test/System.Web.Mvc.Test/Razor/Test/MvcCSharpRazorCodeGeneratorTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Web.Razor; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Razor.Test { diff --git a/test/System.Web.Mvc.Test/Razor/Test/MvcCSharpRazorCodeParserTest.cs b/test/System.Web.Mvc.Test/Razor/Test/MvcCSharpRazorCodeParserTest.cs index 42a088d4..dd705f43 100644 --- a/test/System.Web.Mvc.Test/Razor/Test/MvcCSharpRazorCodeParserTest.cs +++ b/test/System.Web.Mvc.Test/Razor/Test/MvcCSharpRazorCodeParserTest.cs @@ -8,7 +8,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Razor.Test { diff --git a/test/System.Web.Mvc.Test/Razor/Test/MvcVBRazorCodeParserTest.cs b/test/System.Web.Mvc.Test/Razor/Test/MvcVBRazorCodeParserTest.cs index e3af4277..23df617b 100644 --- a/test/System.Web.Mvc.Test/Razor/Test/MvcVBRazorCodeParserTest.cs +++ b/test/System.Web.Mvc.Test/Razor/Test/MvcVBRazorCodeParserTest.cs @@ -8,7 +8,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Razor.Test { diff --git a/test/System.Web.Mvc.Test/Razor/Test/MvcWebPageRazorHostTest.cs b/test/System.Web.Mvc.Test/Razor/Test/MvcWebPageRazorHostTest.cs index ffb3fa53..21886ba2 100644 --- a/test/System.Web.Mvc.Test/Razor/Test/MvcWebPageRazorHostTest.cs +++ b/test/System.Web.Mvc.Test/Razor/Test/MvcWebPageRazorHostTest.cs @@ -2,8 +2,7 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Razor.Test { diff --git a/test/System.Web.Mvc.Test/Test/AcceptVerbsAttributeTest.cs b/test/System.Web.Mvc.Test/Test/AcceptVerbsAttributeTest.cs index aa6ad34c..de9416aa 100644 --- a/test/System.Web.Mvc.Test/Test/AcceptVerbsAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/AcceptVerbsAttributeTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ActionDescriptorTest.cs b/test/System.Web.Mvc.Test/Test/ActionDescriptorTest.cs index a0c6ac2f..969a3c8d 100644 --- a/test/System.Web.Mvc.Test/Test/ActionDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Test/ActionDescriptorTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Reflection; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ActionExecutedContextTest.cs b/test/System.Web.Mvc.Test/Test/ActionExecutedContextTest.cs index 4e4c8527..28f892d7 100644 --- a/test/System.Web.Mvc.Test/Test/ActionExecutedContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/ActionExecutedContextTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ActionExecutingContextTest.cs b/test/System.Web.Mvc.Test/Test/ActionExecutingContextTest.cs index 9e5dc786..328ce0f0 100644 --- a/test/System.Web.Mvc.Test/Test/ActionExecutingContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/ActionExecutingContextTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ActionFilterAttributeTest.cs b/test/System.Web.Mvc.Test/Test/ActionFilterAttributeTest.cs index 0d224025..2cb0a65b 100644 --- a/test/System.Web.Mvc.Test/Test/ActionFilterAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/ActionFilterAttributeTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ActionMethodDispatcherCacheTest.cs b/test/System.Web.Mvc.Test/Test/ActionMethodDispatcherCacheTest.cs index 29422886..0f60400f 100644 --- a/test/System.Web.Mvc.Test/Test/ActionMethodDispatcherCacheTest.cs +++ b/test/System.Web.Mvc.Test/Test/ActionMethodDispatcherCacheTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ActionMethodDispatcherTest.cs b/test/System.Web.Mvc.Test/Test/ActionMethodDispatcherTest.cs index fda3897b..7ce5310f 100644 --- a/test/System.Web.Mvc.Test/Test/ActionMethodDispatcherTest.cs +++ b/test/System.Web.Mvc.Test/Test/ActionMethodDispatcherTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ActionMethodSelectorTest.cs b/test/System.Web.Mvc.Test/Test/ActionMethodSelectorTest.cs index 938b73d8..3d91bd1a 100644 --- a/test/System.Web.Mvc.Test/Test/ActionMethodSelectorTest.cs +++ b/test/System.Web.Mvc.Test/Test/ActionMethodSelectorTest.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ActionNameAttributeTest.cs b/test/System.Web.Mvc.Test/Test/ActionNameAttributeTest.cs index 7d8de85f..2d691ce8 100644 --- a/test/System.Web.Mvc.Test/Test/ActionNameAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/ActionNameAttributeTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AdditionalMetadataAttributeTest.cs b/test/System.Web.Mvc.Test/Test/AdditionalMetadataAttributeTest.cs index 85ee4ac2..1c8be8a8 100644 --- a/test/System.Web.Mvc.Test/Test/AdditionalMetadataAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/AdditionalMetadataAttributeTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AjaxHelperTest.cs b/test/System.Web.Mvc.Test/Test/AjaxHelperTest.cs index f21e20e7..09a225ec 100644 --- a/test/System.Web.Mvc.Test/Test/AjaxHelperTest.cs +++ b/test/System.Web.Mvc.Test/Test/AjaxHelperTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AjaxHelper`1Test.cs b/test/System.Web.Mvc.Test/Test/AjaxHelper`1Test.cs index f98c1e0c..f239d232 100644 --- a/test/System.Web.Mvc.Test/Test/AjaxHelper`1Test.cs +++ b/test/System.Web.Mvc.Test/Test/AjaxHelper`1Test.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AjaxRequestExtensionsTest.cs b/test/System.Web.Mvc.Test/Test/AjaxRequestExtensionsTest.cs index a89f45eb..61c417df 100644 --- a/test/System.Web.Mvc.Test/Test/AjaxRequestExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Test/AjaxRequestExtensionsTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Specialized; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AllowHtmlAttributeTest.cs b/test/System.Web.Mvc.Test/Test/AllowHtmlAttributeTest.cs index 11dbafd0..5b557e9d 100644 --- a/test/System.Web.Mvc.Test/Test/AllowHtmlAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/AllowHtmlAttributeTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AreaHelpersTest.cs b/test/System.Web.Mvc.Test/Test/AreaHelpersTest.cs index c3ae0abb..a26fc3e0 100644 --- a/test/System.Web.Mvc.Test/Test/AreaHelpersTest.cs +++ b/test/System.Web.Mvc.Test/Test/AreaHelpersTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Routing; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AreaRegistrationContextTest.cs b/test/System.Web.Mvc.Test/Test/AreaRegistrationContextTest.cs index 5eeeb72c..b17d2d03 100644 --- a/test/System.Web.Mvc.Test/Test/AreaRegistrationContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/AreaRegistrationContextTest.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Web.Routing; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AreaRegistrationTest.cs b/test/System.Web.Mvc.Test/Test/AreaRegistrationTest.cs index 82622739..d2e9825e 100644 --- a/test/System.Web.Mvc.Test/Test/AreaRegistrationTest.cs +++ b/test/System.Web.Mvc.Test/Test/AreaRegistrationTest.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Web.Routing; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AssociatedMetadataProviderTest.cs b/test/System.Web.Mvc.Test/Test/AssociatedMetadataProviderTest.cs index 462a8323..b57fedac 100644 --- a/test/System.Web.Mvc.Test/Test/AssociatedMetadataProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/AssociatedMetadataProviderTest.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AssociatedValidatorProviderTest.cs b/test/System.Web.Mvc.Test/Test/AssociatedValidatorProviderTest.cs index 9763cf8c..1c946bd1 100644 --- a/test/System.Web.Mvc.Test/Test/AssociatedValidatorProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/AssociatedValidatorProviderTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AsyncControllerTest.cs b/test/System.Web.Mvc.Test/Test/AsyncControllerTest.cs index 2e359ab7..a09c2c93 100644 --- a/test/System.Web.Mvc.Test/Test/AsyncControllerTest.cs +++ b/test/System.Web.Mvc.Test/Test/AsyncControllerTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Web.Mvc.Async; using System.Web.Mvc.Async.Test; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AsyncTimeoutAttributeTest.cs b/test/System.Web.Mvc.Test/Test/AsyncTimeoutAttributeTest.cs index 51482226..aa5b41a5 100644 --- a/test/System.Web.Mvc.Test/Test/AsyncTimeoutAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/AsyncTimeoutAttributeTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AuthorizationContextTest.cs b/test/System.Web.Mvc.Test/Test/AuthorizationContextTest.cs index 371237f2..aca8c131 100644 --- a/test/System.Web.Mvc.Test/Test/AuthorizationContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/AuthorizationContextTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/AuthorizeAttributeTest.cs b/test/System.Web.Mvc.Test/Test/AuthorizeAttributeTest.cs index b284f47a..c04b115a 100644 --- a/test/System.Web.Mvc.Test/Test/AuthorizeAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/AuthorizeAttributeTest.cs @@ -7,9 +7,8 @@ using System.Linq; using System.Reflection; using System.Security.Principal; using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/BindAttributeTest.cs b/test/System.Web.Mvc.Test/Test/BindAttributeTest.cs index 36fd4a43..d55525db 100644 --- a/test/System.Web.Mvc.Test/Test/BindAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/BindAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/BuildManagerCompiledViewTest.cs b/test/System.Web.Mvc.Test/Test/BuildManagerCompiledViewTest.cs index a0aa6918..fc4e443d 100644 --- a/test/System.Web.Mvc.Test/Test/BuildManagerCompiledViewTest.cs +++ b/test/System.Web.Mvc.Test/Test/BuildManagerCompiledViewTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.IO; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/BuildManagerViewEngineTest.cs b/test/System.Web.Mvc.Test/Test/BuildManagerViewEngineTest.cs index a7b8b1e6..5264dadc 100644 --- a/test/System.Web.Mvc.Test/Test/BuildManagerViewEngineTest.cs +++ b/test/System.Web.Mvc.Test/Test/BuildManagerViewEngineTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ByteArrayModelBinderTest.cs b/test/System.Web.Mvc.Test/Test/ByteArrayModelBinderTest.cs index a74375e1..633089aa 100644 --- a/test/System.Web.Mvc.Test/Test/ByteArrayModelBinderTest.cs +++ b/test/System.Web.Mvc.Test/Test/ByteArrayModelBinderTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/CachedAssociatedMetadataProviderTest.cs b/test/System.Web.Mvc.Test/Test/CachedAssociatedMetadataProviderTest.cs index bdde472e..71c5f9a8 100644 --- a/test/System.Web.Mvc.Test/Test/CachedAssociatedMetadataProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/CachedAssociatedMetadataProviderTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.Caching; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/CancellationTokenModelBinderTest.cs b/test/System.Web.Mvc.Test/Test/CancellationTokenModelBinderTest.cs index e5f61755..be49c87f 100644 --- a/test/System.Web.Mvc.Test/Test/CancellationTokenModelBinderTest.cs +++ b/test/System.Web.Mvc.Test/Test/CancellationTokenModelBinderTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Threading; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ChildActionOnlyAttributeTest.cs b/test/System.Web.Mvc.Test/Test/ChildActionOnlyAttributeTest.cs index b5887df3..006cffc3 100644 --- a/test/System.Web.Mvc.Test/Test/ChildActionOnlyAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/ChildActionOnlyAttributeTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ChildActionValueProviderFactoryTest.cs b/test/System.Web.Mvc.Test/Test/ChildActionValueProviderFactoryTest.cs index 9ef8d8e8..3a258f53 100644 --- a/test/System.Web.Mvc.Test/Test/ChildActionValueProviderFactoryTest.cs +++ b/test/System.Web.Mvc.Test/Test/ChildActionValueProviderFactoryTest.cs @@ -2,8 +2,7 @@ using System.Globalization; using System.Web.Routing; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ClientDataTypeModelValidatorProviderTest.cs b/test/System.Web.Mvc.Test/Test/ClientDataTypeModelValidatorProviderTest.cs index 28ccff42..ae7c9c1b 100644 --- a/test/System.Web.Mvc.Test/Test/ClientDataTypeModelValidatorProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/ClientDataTypeModelValidatorProviderTest.cs @@ -3,9 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/CompareAttributeTest.cs b/test/System.Web.Mvc.Test/Test/CompareAttributeTest.cs index 56197d8b..cfc42fb8 100644 --- a/test/System.Web.Mvc.Test/Test/CompareAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/CompareAttributeTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ContentResultTest.cs b/test/System.Web.Mvc.Test/Test/ContentResultTest.cs index d6f890b0..c741dbc5 100644 --- a/test/System.Web.Mvc.Test/Test/ContentResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/ContentResultTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Text; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ControllerActionInvokerTest.cs b/test/System.Web.Mvc.Test/Test/ControllerActionInvokerTest.cs index cb6c9d0b..0c243701 100644 --- a/test/System.Web.Mvc.Test/Test/ControllerActionInvokerTest.cs +++ b/test/System.Web.Mvc.Test/Test/ControllerActionInvokerTest.cs @@ -6,10 +6,9 @@ using System.Globalization; using System.Linq; using System.Reflection; using System.Threading; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ControllerBaseTest.cs b/test/System.Web.Mvc.Test/Test/ControllerBaseTest.cs index c74014c0..c3a27d2f 100644 --- a/test/System.Web.Mvc.Test/Test/ControllerBaseTest.cs +++ b/test/System.Web.Mvc.Test/Test/ControllerBaseTest.cs @@ -3,10 +3,9 @@ using System.Linq; using System.Web.Routing; using System.Web.TestUtil; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ControllerBuilderTest.cs b/test/System.Web.Mvc.Test/Test/ControllerBuilderTest.cs index 234d847b..5a75a8bf 100644 --- a/test/System.Web.Mvc.Test/Test/ControllerBuilderTest.cs +++ b/test/System.Web.Mvc.Test/Test/ControllerBuilderTest.cs @@ -2,9 +2,8 @@ using System.Web.Routing; using System.Web.SessionState; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ControllerContextTest.cs b/test/System.Web.Mvc.Test/Test/ControllerContextTest.cs index f695936e..95a3b951 100644 --- a/test/System.Web.Mvc.Test/Test/ControllerContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/ControllerContextTest.cs @@ -4,9 +4,8 @@ using System.Collections; using System.Web.Routing; using System.Web.TestUtil; using System.Web.WebPages; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ControllerDescriptorCacheTest.cs b/test/System.Web.Mvc.Test/Test/ControllerDescriptorCacheTest.cs index 2ac46e17..a4699010 100644 --- a/test/System.Web.Mvc.Test/Test/ControllerDescriptorCacheTest.cs +++ b/test/System.Web.Mvc.Test/Test/ControllerDescriptorCacheTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ControllerDescriptorTest.cs b/test/System.Web.Mvc.Test/Test/ControllerDescriptorTest.cs index f05b585b..3231aebc 100644 --- a/test/System.Web.Mvc.Test/Test/ControllerDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Test/ControllerDescriptorTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ControllerInstanceFilterProviderTest.cs b/test/System.Web.Mvc.Test/Test/ControllerInstanceFilterProviderTest.cs index d8b109b2..82271f99 100644 --- a/test/System.Web.Mvc.Test/Test/ControllerInstanceFilterProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/ControllerInstanceFilterProviderTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ControllerTest.cs b/test/System.Web.Mvc.Test/Test/ControllerTest.cs index 4bc6e05d..aa9e3080 100644 --- a/test/System.Web.Mvc.Test/Test/ControllerTest.cs +++ b/test/System.Web.Mvc.Test/Test/ControllerTest.cs @@ -12,11 +12,10 @@ using System.Web.Mvc.Async; using System.Web.Profile; using System.Web.Routing; using System.Web.TestUtil; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DataAnnotationsModelMetadataProviderTestBase.cs b/test/System.Web.Mvc.Test/Test/DataAnnotationsModelMetadataProviderTestBase.cs index e166fca1..454e76e4 100644 --- a/test/System.Web.Mvc.Test/Test/DataAnnotationsModelMetadataProviderTestBase.cs +++ b/test/System.Web.Mvc.Test/Test/DataAnnotationsModelMetadataProviderTestBase.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorProviderTest.cs b/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorProviderTest.cs index 6f139407..451d3a31 100644 --- a/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorProviderTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorTest.cs b/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorTest.cs index 200a975d..fce4ab85 100644 --- a/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorTest.cs +++ b/test/System.Web.Mvc.Test/Test/DataAnnotationsModelValidatorTest.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using Microsoft.TestCommon; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DataErrorInfoModelValidatorProviderTest.cs b/test/System.Web.Mvc.Test/Test/DataErrorInfoModelValidatorProviderTest.cs index 4e3a62be..fa6f416c 100644 --- a/test/System.Web.Mvc.Test/Test/DataErrorInfoModelValidatorProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/DataErrorInfoModelValidatorProviderTest.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DataTypeUtilTest.cs b/test/System.Web.Mvc.Test/Test/DataTypeUtilTest.cs index b9f5daaf..3fa3a7a1 100644 --- a/test/System.Web.Mvc.Test/Test/DataTypeUtilTest.cs +++ b/test/System.Web.Mvc.Test/Test/DataTypeUtilTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.ComponentModel.DataAnnotations; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DefaultControllerFactoryTest.cs b/test/System.Web.Mvc.Test/Test/DefaultControllerFactoryTest.cs index 93478f56..04e834e5 100644 --- a/test/System.Web.Mvc.Test/Test/DefaultControllerFactoryTest.cs +++ b/test/System.Web.Mvc.Test/Test/DefaultControllerFactoryTest.cs @@ -3,10 +3,8 @@ using System.Reflection; using System.Web.Routing; using System.Web.SessionState; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DefaultModelBinderTest.cs b/test/System.Web.Mvc.Test/Test/DefaultModelBinderTest.cs index 886e9b4b..bbd048f2 100644 --- a/test/System.Web.Mvc.Test/Test/DefaultModelBinderTest.cs +++ b/test/System.Web.Mvc.Test/Test/DefaultModelBinderTest.cs @@ -6,11 +6,10 @@ using System.ComponentModel.DataAnnotations; using System.Globalization; using System.IO; using System.Linq; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DefaultViewLocationCacheTest.cs b/test/System.Web.Mvc.Test/Test/DefaultViewLocationCacheTest.cs index a273d5d8..11e681a3 100644 --- a/test/System.Web.Mvc.Test/Test/DefaultViewLocationCacheTest.cs +++ b/test/System.Web.Mvc.Test/Test/DefaultViewLocationCacheTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DependencyResolverTest.cs b/test/System.Web.Mvc.Test/Test/DependencyResolverTest.cs index ca5ee634..0acbe949 100644 --- a/test/System.Web.Mvc.Test/Test/DependencyResolverTest.cs +++ b/test/System.Web.Mvc.Test/Test/DependencyResolverTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DescriptorUtilTest.cs b/test/System.Web.Mvc.Test/Test/DescriptorUtilTest.cs index ad42f327..a374bb86 100644 --- a/test/System.Web.Mvc.Test/Test/DescriptorUtilTest.cs +++ b/test/System.Web.Mvc.Test/Test/DescriptorUtilTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DictionaryHelpersTest.cs b/test/System.Web.Mvc.Test/Test/DictionaryHelpersTest.cs index 7d73411b..0174a57c 100644 --- a/test/System.Web.Mvc.Test/Test/DictionaryHelpersTest.cs +++ b/test/System.Web.Mvc.Test/Test/DictionaryHelpersTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DictionaryValueProviderTest.cs b/test/System.Web.Mvc.Test/Test/DictionaryValueProviderTest.cs index 13fd1ae1..365685a7 100644 --- a/test/System.Web.Mvc.Test/Test/DictionaryValueProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/DictionaryValueProviderTest.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Globalization; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/DynamicViewDataDictionaryTest.cs b/test/System.Web.Mvc.Test/Test/DynamicViewDataDictionaryTest.cs index d7d063d7..660919a9 100644 --- a/test/System.Web.Mvc.Test/Test/DynamicViewDataDictionaryTest.cs +++ b/test/System.Web.Mvc.Test/Test/DynamicViewDataDictionaryTest.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Dynamic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/EmptyModelValidatorProviderTest.cs b/test/System.Web.Mvc.Test/Test/EmptyModelValidatorProviderTest.cs index 9ac99339..845d40f6 100644 --- a/test/System.Web.Mvc.Test/Test/EmptyModelValidatorProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/EmptyModelValidatorProviderTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ExceptionContextTest.cs b/test/System.Web.Mvc.Test/Test/ExceptionContextTest.cs index f94140e0..7c4c9344 100644 --- a/test/System.Web.Mvc.Test/Test/ExceptionContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/ExceptionContextTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ExpressionHelperTest.cs b/test/System.Web.Mvc.Test/Test/ExpressionHelperTest.cs index 9ffbb562..7435d267 100644 --- a/test/System.Web.Mvc.Test/Test/ExpressionHelperTest.cs +++ b/test/System.Web.Mvc.Test/Test/ExpressionHelperTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq.Expressions; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FieldValidationMetadataTest.cs b/test/System.Web.Mvc.Test/Test/FieldValidationMetadataTest.cs index 15ff0e46..cdfb0eb3 100644 --- a/test/System.Web.Mvc.Test/Test/FieldValidationMetadataTest.cs +++ b/test/System.Web.Mvc.Test/Test/FieldValidationMetadataTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Web.TestUtil; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FileContentResultTest.cs b/test/System.Web.Mvc.Test/Test/FileContentResultTest.cs index db6510ad..f9fcf10e 100644 --- a/test/System.Web.Mvc.Test/Test/FileContentResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/FileContentResultTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.IO; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FilePathResultTest.cs b/test/System.Web.Mvc.Test/Test/FilePathResultTest.cs index 54632881..fabc38fa 100644 --- a/test/System.Web.Mvc.Test/Test/FilePathResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/FilePathResultTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FileResultTest.cs b/test/System.Web.Mvc.Test/Test/FileResultTest.cs index 7421c2bf..64b475a4 100644 --- a/test/System.Web.Mvc.Test/Test/FileResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/FileResultTest.cs @@ -4,9 +4,6 @@ using System.Net.Mime; using System.Web.TestUtil; using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FileStreamResultTest.cs b/test/System.Web.Mvc.Test/Test/FileStreamResultTest.cs index 04bc456f..19392d09 100644 --- a/test/System.Web.Mvc.Test/Test/FileStreamResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/FileStreamResultTest.cs @@ -2,9 +2,8 @@ using System.IO; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FilterAttributeFilterProviderTest.cs b/test/System.Web.Mvc.Test/Test/FilterAttributeFilterProviderTest.cs index 994661eb..15418754 100644 --- a/test/System.Web.Mvc.Test/Test/FilterAttributeFilterProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/FilterAttributeFilterProviderTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FilterInfoTest.cs b/test/System.Web.Mvc.Test/Test/FilterInfoTest.cs index b75d670c..8fe28786 100644 --- a/test/System.Web.Mvc.Test/Test/FilterInfoTest.cs +++ b/test/System.Web.Mvc.Test/Test/FilterInfoTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FilterProviderCollectionTest.cs b/test/System.Web.Mvc.Test/Test/FilterProviderCollectionTest.cs index 4556eca9..47c5381a 100644 --- a/test/System.Web.Mvc.Test/Test/FilterProviderCollectionTest.cs +++ b/test/System.Web.Mvc.Test/Test/FilterProviderCollectionTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FilterProvidersTest.cs b/test/System.Web.Mvc.Test/Test/FilterProvidersTest.cs index b2bb1d62..8466d20d 100644 --- a/test/System.Web.Mvc.Test/Test/FilterProvidersTest.cs +++ b/test/System.Web.Mvc.Test/Test/FilterProvidersTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FilterTest.cs b/test/System.Web.Mvc.Test/Test/FilterTest.cs index 8db7d225..3b8a98a2 100644 --- a/test/System.Web.Mvc.Test/Test/FilterTest.cs +++ b/test/System.Web.Mvc.Test/Test/FilterTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FormCollectionTest.cs b/test/System.Web.Mvc.Test/Test/FormCollectionTest.cs index a0e1da5a..ae9c6fca 100644 --- a/test/System.Web.Mvc.Test/Test/FormCollectionTest.cs +++ b/test/System.Web.Mvc.Test/Test/FormCollectionTest.cs @@ -2,9 +2,8 @@ using System.Collections.Specialized; using System.Globalization; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FormContextTest.cs b/test/System.Web.Mvc.Test/Test/FormContextTest.cs index 6998645d..f902c74c 100644 --- a/test/System.Web.Mvc.Test/Test/FormContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/FormContextTest.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Web.TestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/FormValueProviderFactoryTest.cs b/test/System.Web.Mvc.Test/Test/FormValueProviderFactoryTest.cs index 9253a2ba..76a49a02 100644 --- a/test/System.Web.Mvc.Test/Test/FormValueProviderFactoryTest.cs +++ b/test/System.Web.Mvc.Test/Test/FormValueProviderFactoryTest.cs @@ -2,9 +2,8 @@ using System.Collections.Specialized; using System.Globalization; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/GlobalFilterCollectionTest.cs b/test/System.Web.Mvc.Test/Test/GlobalFilterCollectionTest.cs index 08bf5c56..5fee8aef 100644 --- a/test/System.Web.Mvc.Test/Test/GlobalFilterCollectionTest.cs +++ b/test/System.Web.Mvc.Test/Test/GlobalFilterCollectionTest.cs @@ -2,10 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HandleErrorAttributeTest.cs b/test/System.Web.Mvc.Test/Test/HandleErrorAttributeTest.cs index 0d417b10..40d3c8ed 100644 --- a/test/System.Web.Mvc.Test/Test/HandleErrorAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/HandleErrorAttributeTest.cs @@ -5,9 +5,8 @@ using System.ComponentModel; using System.Linq; using System.Web.Routing; using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HandleErrorInfoTest.cs b/test/System.Web.Mvc.Test/Test/HandleErrorInfoTest.cs index acfcd1f6..bd7ee300 100644 --- a/test/System.Web.Mvc.Test/Test/HandleErrorInfoTest.cs +++ b/test/System.Web.Mvc.Test/Test/HandleErrorInfoTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HtmlHelperTest.cs b/test/System.Web.Mvc.Test/Test/HtmlHelperTest.cs index f15b9080..08086e53 100644 --- a/test/System.Web.Mvc.Test/Test/HtmlHelperTest.cs +++ b/test/System.Web.Mvc.Test/Test/HtmlHelperTest.cs @@ -10,8 +10,6 @@ using System.Web.Routing; using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HtmlHelper`1Test.cs b/test/System.Web.Mvc.Test/Test/HtmlHelper`1Test.cs index 66c78fae..b975a378 100644 --- a/test/System.Web.Mvc.Test/Test/HtmlHelper`1Test.cs +++ b/test/System.Web.Mvc.Test/Test/HtmlHelper`1Test.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpDeleteAttributeTest.cs b/test/System.Web.Mvc.Test/Test/HttpDeleteAttributeTest.cs index 87305bf7..4075da61 100644 --- a/test/System.Web.Mvc.Test/Test/HttpDeleteAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpDeleteAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpFileCollectionValueProviderFactoryTest.cs b/test/System.Web.Mvc.Test/Test/HttpFileCollectionValueProviderFactoryTest.cs index 68645b0c..e6f9f5df 100644 --- a/test/System.Web.Mvc.Test/Test/HttpFileCollectionValueProviderFactoryTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpFileCollectionValueProviderFactoryTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpFileCollectionValueProviderTest.cs b/test/System.Web.Mvc.Test/Test/HttpFileCollectionValueProviderTest.cs index bae9d6aa..3d3f4396 100644 --- a/test/System.Web.Mvc.Test/Test/HttpFileCollectionValueProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpFileCollectionValueProviderTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpGetAttributeTest.cs b/test/System.Web.Mvc.Test/Test/HttpGetAttributeTest.cs index 01adcf7e..2bcbb9e7 100644 --- a/test/System.Web.Mvc.Test/Test/HttpGetAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpGetAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpHandlerUtilTest.cs b/test/System.Web.Mvc.Test/Test/HttpHandlerUtilTest.cs index e1b40bf7..b053cbf4 100644 --- a/test/System.Web.Mvc.Test/Test/HttpHandlerUtilTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpHandlerUtilTest.cs @@ -2,9 +2,8 @@ using System.IO; using System.Web.Hosting; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpHeadAttributeTest.cs b/test/System.Web.Mvc.Test/Test/HttpHeadAttributeTest.cs index 9ee2f6ea..fa65505f 100644 --- a/test/System.Web.Mvc.Test/Test/HttpHeadAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpHeadAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpNotFoundResultTest.cs b/test/System.Web.Mvc.Test/Test/HttpNotFoundResultTest.cs index 1dee8936..d1e295d8 100644 --- a/test/System.Web.Mvc.Test/Test/HttpNotFoundResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpNotFoundResultTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpOptionsAttributeTest.cs b/test/System.Web.Mvc.Test/Test/HttpOptionsAttributeTest.cs index 7d34eec8..578375e6 100644 --- a/test/System.Web.Mvc.Test/Test/HttpOptionsAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpOptionsAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpPatchAttributeTest.cs b/test/System.Web.Mvc.Test/Test/HttpPatchAttributeTest.cs index 42a869f6..e191e55f 100644 --- a/test/System.Web.Mvc.Test/Test/HttpPatchAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpPatchAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { public class HttpPatchAttributeTest diff --git a/test/System.Web.Mvc.Test/Test/HttpPostAttributeTest.cs b/test/System.Web.Mvc.Test/Test/HttpPostAttributeTest.cs index fb32dc5c..ebe19e0a 100644 --- a/test/System.Web.Mvc.Test/Test/HttpPostAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpPostAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpPostedFileBaseModelBinderTest.cs b/test/System.Web.Mvc.Test/Test/HttpPostedFileBaseModelBinderTest.cs index 829bc37d..8acc22b1 100644 --- a/test/System.Web.Mvc.Test/Test/HttpPostedFileBaseModelBinderTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpPostedFileBaseModelBinderTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpPutAttributeTest.cs b/test/System.Web.Mvc.Test/Test/HttpPutAttributeTest.cs index a8329b29..33b5511d 100644 --- a/test/System.Web.Mvc.Test/Test/HttpPutAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpPutAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpRequestExtensionsTest.cs b/test/System.Web.Mvc.Test/Test/HttpRequestExtensionsTest.cs index 3a469346..0bbfbaab 100644 --- a/test/System.Web.Mvc.Test/Test/HttpRequestExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpRequestExtensionsTest.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpStatusCodeResultTest.cs b/test/System.Web.Mvc.Test/Test/HttpStatusCodeResultTest.cs index 3a642f0c..c7e0ea0c 100644 --- a/test/System.Web.Mvc.Test/Test/HttpStatusCodeResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpStatusCodeResultTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Net; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpUnauthorizedResultTest.cs b/test/System.Web.Mvc.Test/Test/HttpUnauthorizedResultTest.cs index 2d6b2349..7ff993da 100644 --- a/test/System.Web.Mvc.Test/Test/HttpUnauthorizedResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/HttpUnauthorizedResultTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/HttpVerbAttributeHelper.cs b/test/System.Web.Mvc.Test/Test/HttpVerbAttributeHelper.cs index 6205a35f..7299c389 100644 --- a/test/System.Web.Mvc.Test/Test/HttpVerbAttributeHelper.cs +++ b/test/System.Web.Mvc.Test/Test/HttpVerbAttributeHelper.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/JavaScriptResultTest.cs b/test/System.Web.Mvc.Test/Test/JavaScriptResultTest.cs index 7529cbba..11903dc7 100644 --- a/test/System.Web.Mvc.Test/Test/JavaScriptResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/JavaScriptResultTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/JsonResultTest.cs b/test/System.Web.Mvc.Test/Test/JsonResultTest.cs index b76f6fa9..4a2dbf6d 100644 --- a/test/System.Web.Mvc.Test/Test/JsonResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/JsonResultTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Text; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/JsonValueProviderFactoryTest.cs b/test/System.Web.Mvc.Test/Test/JsonValueProviderFactoryTest.cs index 790444c7..e4f3ecf2 100644 --- a/test/System.Web.Mvc.Test/Test/JsonValueProviderFactoryTest.cs +++ b/test/System.Web.Mvc.Test/Test/JsonValueProviderFactoryTest.cs @@ -3,9 +3,8 @@ using System.Globalization; using System.IO; using System.Text; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/LinqBinaryModelBinderTest.cs b/test/System.Web.Mvc.Test/Test/LinqBinaryModelBinderTest.cs index dc2254a5..f1b789a5 100644 --- a/test/System.Web.Mvc.Test/Test/LinqBinaryModelBinderTest.cs +++ b/test/System.Web.Mvc.Test/Test/LinqBinaryModelBinderTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Data.Linq; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelBinderAttributeTest.cs b/test/System.Web.Mvc.Test/Test/ModelBinderAttributeTest.cs index 33858f25..13a41359 100644 --- a/test/System.Web.Mvc.Test/Test/ModelBinderAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelBinderAttributeTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelBinderDictionaryTest.cs b/test/System.Web.Mvc.Test/Test/ModelBinderDictionaryTest.cs index 2b85a0c5..c6ad4c69 100644 --- a/test/System.Web.Mvc.Test/Test/ModelBinderDictionaryTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelBinderDictionaryTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelBinderProviderCollectionTest.cs b/test/System.Web.Mvc.Test/Test/ModelBinderProviderCollectionTest.cs index 72218ec0..3a2ed1a6 100644 --- a/test/System.Web.Mvc.Test/Test/ModelBinderProviderCollectionTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelBinderProviderCollectionTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelBinderProvidersTest.cs b/test/System.Web.Mvc.Test/Test/ModelBinderProvidersTest.cs index bbb2bb48..1544211d 100644 --- a/test/System.Web.Mvc.Test/Test/ModelBinderProvidersTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelBinderProvidersTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelBindersTest.cs b/test/System.Web.Mvc.Test/Test/ModelBindersTest.cs index 310d6b75..2e309e1b 100644 --- a/test/System.Web.Mvc.Test/Test/ModelBindersTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelBindersTest.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; using System.Data.Linq; using System.Threading; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelBindingContextTest.cs b/test/System.Web.Mvc.Test/Test/ModelBindingContextTest.cs index fa8d9fe3..4fbb8ff0 100644 --- a/test/System.Web.Mvc.Test/Test/ModelBindingContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelBindingContextTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.TestUtil; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelClientValidationRuleTest.cs b/test/System.Web.Mvc.Test/Test/ModelClientValidationRuleTest.cs index 056e59b9..be2cdeb6 100644 --- a/test/System.Web.Mvc.Test/Test/ModelClientValidationRuleTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelClientValidationRuleTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Web.TestUtil; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelErrorCollectionTest.cs b/test/System.Web.Mvc.Test/Test/ModelErrorCollectionTest.cs index d1f16d57..bf1c1ddd 100644 --- a/test/System.Web.Mvc.Test/Test/ModelErrorCollectionTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelErrorCollectionTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelErrorTest.cs b/test/System.Web.Mvc.Test/Test/ModelErrorTest.cs index 5a26f2e2..72b5b68b 100644 --- a/test/System.Web.Mvc.Test/Test/ModelErrorTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelErrorTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelMetadataProvidersTest.cs b/test/System.Web.Mvc.Test/Test/ModelMetadataProvidersTest.cs index d98ade52..bd37b432 100644 --- a/test/System.Web.Mvc.Test/Test/ModelMetadataProvidersTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelMetadataProvidersTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelMetadataTest.cs b/test/System.Web.Mvc.Test/Test/ModelMetadataTest.cs index 3395c18c..8a6c90c7 100644 --- a/test/System.Web.Mvc.Test/Test/ModelMetadataTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelMetadataTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Linq.Expressions; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelStateDictionaryTest.cs b/test/System.Web.Mvc.Test/Test/ModelStateDictionaryTest.cs index fb0ecbd4..cbed3115 100644 --- a/test/System.Web.Mvc.Test/Test/ModelStateDictionaryTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelStateDictionaryTest.cs @@ -5,8 +5,7 @@ using System.Globalization; using System.IO; using System.Runtime.Serialization.Formatters.Binary; using System.Web.TestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelStateTest.cs b/test/System.Web.Mvc.Test/Test/ModelStateTest.cs index cdd2f5c4..9e86b759 100644 --- a/test/System.Web.Mvc.Test/Test/ModelStateTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelStateTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelValidationResultTest.cs b/test/System.Web.Mvc.Test/Test/ModelValidationResultTest.cs index 15b83266..bd0c605f 100644 --- a/test/System.Web.Mvc.Test/Test/ModelValidationResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelValidationResultTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.TestUtil; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelValidatorProviderCollectionTest.cs b/test/System.Web.Mvc.Test/Test/ModelValidatorProviderCollectionTest.cs index 49a79c0f..2119acde 100644 --- a/test/System.Web.Mvc.Test/Test/ModelValidatorProviderCollectionTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelValidatorProviderCollectionTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelValidatorProvidersTest.cs b/test/System.Web.Mvc.Test/Test/ModelValidatorProvidersTest.cs index d2a7544c..99d230ad 100644 --- a/test/System.Web.Mvc.Test/Test/ModelValidatorProvidersTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelValidatorProvidersTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ModelValidatorTest.cs b/test/System.Web.Mvc.Test/Test/ModelValidatorTest.cs index 0a3d279d..0caa1bf6 100644 --- a/test/System.Web.Mvc.Test/Test/ModelValidatorTest.cs +++ b/test/System.Web.Mvc.Test/Test/ModelValidatorTest.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/MultiSelectListTest.cs b/test/System.Web.Mvc.Test/Test/MultiSelectListTest.cs index 9daf6200..11812e54 100644 --- a/test/System.Web.Mvc.Test/Test/MultiSelectListTest.cs +++ b/test/System.Web.Mvc.Test/Test/MultiSelectListTest.cs @@ -3,8 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/MultiServiceResolverTest.cs b/test/System.Web.Mvc.Test/Test/MultiServiceResolverTest.cs index 5e9c8437..398ac557 100644 --- a/test/System.Web.Mvc.Test/Test/MultiServiceResolverTest.cs +++ b/test/System.Web.Mvc.Test/Test/MultiServiceResolverTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/MvcHandlerTest.cs b/test/System.Web.Mvc.Test/Test/MvcHandlerTest.cs index 161f460c..4d76cf79 100644 --- a/test/System.Web.Mvc.Test/Test/MvcHandlerTest.cs +++ b/test/System.Web.Mvc.Test/Test/MvcHandlerTest.cs @@ -4,10 +4,9 @@ using System.Web.Mvc.Async; using System.Web.Mvc.Async.Test; using System.Web.Routing; using System.Web.SessionState; +using Microsoft.TestCommon; using Moq; using Moq.Protected; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/MvcHtmlStringTest.cs b/test/System.Web.Mvc.Test/Test/MvcHtmlStringTest.cs index 333326d9..d76ecf7b 100644 --- a/test/System.Web.Mvc.Test/Test/MvcHtmlStringTest.cs +++ b/test/System.Web.Mvc.Test/Test/MvcHtmlStringTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/MvcHttpHandlerTest.cs b/test/System.Web.Mvc.Test/Test/MvcHttpHandlerTest.cs index 68cebb80..59250a0b 100644 --- a/test/System.Web.Mvc.Test/Test/MvcHttpHandlerTest.cs +++ b/test/System.Web.Mvc.Test/Test/MvcHttpHandlerTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/MvcRouteHandlerTest.cs b/test/System.Web.Mvc.Test/Test/MvcRouteHandlerTest.cs index f7bd1bd4..5ba3b88b 100644 --- a/test/System.Web.Mvc.Test/Test/MvcRouteHandlerTest.cs +++ b/test/System.Web.Mvc.Test/Test/MvcRouteHandlerTest.cs @@ -2,9 +2,8 @@ using System.Web.Routing; using System.Web.SessionState; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/MvcWebRazorHostFactoryTest.cs b/test/System.Web.Mvc.Test/Test/MvcWebRazorHostFactoryTest.cs index 6e38671c..348fcbf5 100644 --- a/test/System.Web.Mvc.Test/Test/MvcWebRazorHostFactoryTest.cs +++ b/test/System.Web.Mvc.Test/Test/MvcWebRazorHostFactoryTest.cs @@ -2,7 +2,7 @@ using System.Web.Mvc.Razor; using System.Web.WebPages.Razor; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/NameValueCollectionExtensionsTest.cs b/test/System.Web.Mvc.Test/Test/NameValueCollectionExtensionsTest.cs index 4ffd08a2..7db2559b 100644 --- a/test/System.Web.Mvc.Test/Test/NameValueCollectionExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Test/NameValueCollectionExtensionsTest.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Web.Routing; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/NameValueCollectionValueProviderTest.cs b/test/System.Web.Mvc.Test/Test/NameValueCollectionValueProviderTest.cs index 9b53829e..1dc7d2c5 100644 --- a/test/System.Web.Mvc.Test/Test/NameValueCollectionValueProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/NameValueCollectionValueProviderTest.cs @@ -2,8 +2,7 @@ using System.Collections.Specialized; using System.Globalization; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/NoAsyncTimeoutAttributeTest.cs b/test/System.Web.Mvc.Test/Test/NoAsyncTimeoutAttributeTest.cs index 30517ae6..d7be5d94 100644 --- a/test/System.Web.Mvc.Test/Test/NoAsyncTimeoutAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/NoAsyncTimeoutAttributeTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Threading; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/NonActionAttributeTest.cs b/test/System.Web.Mvc.Test/Test/NonActionAttributeTest.cs index 69aaa788..b7bca9f5 100644 --- a/test/System.Web.Mvc.Test/Test/NonActionAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/NonActionAttributeTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/OutputCacheAttributeTest.cs b/test/System.Web.Mvc.Test/Test/OutputCacheAttributeTest.cs index 0b4238c3..aa07c00d 100644 --- a/test/System.Web.Mvc.Test/Test/OutputCacheAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/OutputCacheAttributeTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Web.TestUtil; using System.Web.UI; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ParameterBindingInfoTest.cs b/test/System.Web.Mvc.Test/Test/ParameterBindingInfoTest.cs index 16ed7cf0..ac9b8982 100644 --- a/test/System.Web.Mvc.Test/Test/ParameterBindingInfoTest.cs +++ b/test/System.Web.Mvc.Test/Test/ParameterBindingInfoTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ParameterDescriptorTest.cs b/test/System.Web.Mvc.Test/Test/ParameterDescriptorTest.cs index 93cebbdf..7fd5073b 100644 --- a/test/System.Web.Mvc.Test/Test/ParameterDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Test/ParameterDescriptorTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Reflection; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ParameterInfoUtilTest.cs b/test/System.Web.Mvc.Test/Test/ParameterInfoUtilTest.cs index 7d78a864..84e7f162 100644 --- a/test/System.Web.Mvc.Test/Test/ParameterInfoUtilTest.cs +++ b/test/System.Web.Mvc.Test/Test/ParameterInfoUtilTest.cs @@ -3,8 +3,8 @@ using System.ComponentModel; using System.Linq; using System.Reflection; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/PartialViewResultTest.cs b/test/System.Web.Mvc.Test/Test/PartialViewResultTest.cs index b961a4d4..ef7bece8 100644 --- a/test/System.Web.Mvc.Test/Test/PartialViewResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/PartialViewResultTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.IO; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/PathHelpersTest.cs b/test/System.Web.Mvc.Test/Test/PathHelpersTest.cs index d0cbe91f..2087b2d2 100644 --- a/test/System.Web.Mvc.Test/Test/PathHelpersTest.cs +++ b/test/System.Web.Mvc.Test/Test/PathHelpersTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Specialized; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/PreApplicationStartCodeTest.cs b/test/System.Web.Mvc.Test/Test/PreApplicationStartCodeTest.cs index 2e0f8db9..ee8315c6 100644 --- a/test/System.Web.Mvc.Test/Test/PreApplicationStartCodeTest.cs +++ b/test/System.Web.Mvc.Test/Test/PreApplicationStartCodeTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/QueryStringValueProviderFactoryTest.cs b/test/System.Web.Mvc.Test/Test/QueryStringValueProviderFactoryTest.cs index 8653cde0..07d685e2 100644 --- a/test/System.Web.Mvc.Test/Test/QueryStringValueProviderFactoryTest.cs +++ b/test/System.Web.Mvc.Test/Test/QueryStringValueProviderFactoryTest.cs @@ -2,9 +2,8 @@ using System.Collections.Specialized; using System.Globalization; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RangeAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/RangeAttributeAdapterTest.cs index e6f8cf4e..04158aaf 100644 --- a/test/System.Web.Mvc.Test/Test/RangeAttributeAdapterTest.cs +++ b/test/System.Web.Mvc.Test/Test/RangeAttributeAdapterTest.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RazorViewEngineTest.cs b/test/System.Web.Mvc.Test/Test/RazorViewEngineTest.cs index ccae48d9..1d4060d5 100644 --- a/test/System.Web.Mvc.Test/Test/RazorViewEngineTest.cs +++ b/test/System.Web.Mvc.Test/Test/RazorViewEngineTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RazorViewTest.cs b/test/System.Web.Mvc.Test/Test/RazorViewTest.cs index b6989d88..49e61d0e 100644 --- a/test/System.Web.Mvc.Test/Test/RazorViewTest.cs +++ b/test/System.Web.Mvc.Test/Test/RazorViewTest.cs @@ -5,9 +5,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Web.WebPages; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ReaderWriterCacheTest.cs b/test/System.Web.Mvc.Test/Test/ReaderWriterCacheTest.cs index 03178ee7..490b2031 100644 --- a/test/System.Web.Mvc.Test/Test/ReaderWriterCacheTest.cs +++ b/test/System.Web.Mvc.Test/Test/ReaderWriterCacheTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RedirectResultTest.cs b/test/System.Web.Mvc.Test/Test/RedirectResultTest.cs index 1429f8e0..5ac094cd 100644 --- a/test/System.Web.Mvc.Test/Test/RedirectResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/RedirectResultTest.cs @@ -2,9 +2,8 @@ using System.Web.Mvc.Properties; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RedirectToRouteResultTest.cs b/test/System.Web.Mvc.Test/Test/RedirectToRouteResultTest.cs index b6d38158..2969e8e8 100644 --- a/test/System.Web.Mvc.Test/Test/RedirectToRouteResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/RedirectToRouteResultTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ReflectedActionDescriptorTest.cs b/test/System.Web.Mvc.Test/Test/ReflectedActionDescriptorTest.cs index bbffa3ff..4d104fbe 100644 --- a/test/System.Web.Mvc.Test/Test/ReflectedActionDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Test/ReflectedActionDescriptorTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ReflectedControllerDescriptorTest.cs b/test/System.Web.Mvc.Test/Test/ReflectedControllerDescriptorTest.cs index 2dea03cf..353da7c7 100644 --- a/test/System.Web.Mvc.Test/Test/ReflectedControllerDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Test/ReflectedControllerDescriptorTest.cs @@ -2,9 +2,8 @@ using System.Linq; using System.Reflection; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ReflectedParameterBindingInfoTest.cs b/test/System.Web.Mvc.Test/Test/ReflectedParameterBindingInfoTest.cs index 16084500..af12a65f 100644 --- a/test/System.Web.Mvc.Test/Test/ReflectedParameterBindingInfoTest.cs +++ b/test/System.Web.Mvc.Test/Test/ReflectedParameterBindingInfoTest.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reflection; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ReflectedParameterDescriptorTest.cs b/test/System.Web.Mvc.Test/Test/ReflectedParameterDescriptorTest.cs index bb92a3c0..19a95b76 100644 --- a/test/System.Web.Mvc.Test/Test/ReflectedParameterDescriptorTest.cs +++ b/test/System.Web.Mvc.Test/Test/ReflectedParameterDescriptorTest.cs @@ -2,9 +2,8 @@ using System.ComponentModel; using System.Reflection; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RegularExpressionAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/RegularExpressionAttributeAdapterTest.cs index 45eca944..543ce2f3 100644 --- a/test/System.Web.Mvc.Test/Test/RegularExpressionAttributeAdapterTest.cs +++ b/test/System.Web.Mvc.Test/Test/RegularExpressionAttributeAdapterTest.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RemoteAttributeTest.cs b/test/System.Web.Mvc.Test/Test/RemoteAttributeTest.cs index 6ce4db2c..262f5cca 100644 --- a/test/System.Web.Mvc.Test/Test/RemoteAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/RemoteAttributeTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RequireHttpsAttributeTest.cs b/test/System.Web.Mvc.Test/Test/RequireHttpsAttributeTest.cs index d6e03bf7..68e8a795 100644 --- a/test/System.Web.Mvc.Test/Test/RequireHttpsAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/RequireHttpsAttributeTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RequiredAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/RequiredAttributeAdapterTest.cs index 8dc7be33..721aa598 100644 --- a/test/System.Web.Mvc.Test/Test/RequiredAttributeAdapterTest.cs +++ b/test/System.Web.Mvc.Test/Test/RequiredAttributeAdapterTest.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ResultExecutedContextTest.cs b/test/System.Web.Mvc.Test/Test/ResultExecutedContextTest.cs index c65834e8..ebccbc90 100644 --- a/test/System.Web.Mvc.Test/Test/ResultExecutedContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/ResultExecutedContextTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ResultExecutingContextTest.cs b/test/System.Web.Mvc.Test/Test/ResultExecutingContextTest.cs index ecc61baf..9b7fbb0f 100644 --- a/test/System.Web.Mvc.Test/Test/ResultExecutingContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/ResultExecutingContextTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RouteCollectionExtensionsTest.cs b/test/System.Web.Mvc.Test/Test/RouteCollectionExtensionsTest.cs index 62fcb232..f326c8d0 100644 --- a/test/System.Web.Mvc.Test/Test/RouteCollectionExtensionsTest.cs +++ b/test/System.Web.Mvc.Test/Test/RouteCollectionExtensionsTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Web.Routing; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/RouteDataValueProviderFactoryTest.cs b/test/System.Web.Mvc.Test/Test/RouteDataValueProviderFactoryTest.cs index bd106379..3ca6c1df 100644 --- a/test/System.Web.Mvc.Test/Test/RouteDataValueProviderFactoryTest.cs +++ b/test/System.Web.Mvc.Test/Test/RouteDataValueProviderFactoryTest.cs @@ -2,8 +2,7 @@ using System.Globalization; using System.Web.Routing; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/SelectListTest.cs b/test/System.Web.Mvc.Test/Test/SelectListTest.cs index 24c84ccb..bc922f71 100644 --- a/test/System.Web.Mvc.Test/Test/SelectListTest.cs +++ b/test/System.Web.Mvc.Test/Test/SelectListTest.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/SessionStateTempDataProviderTest.cs b/test/System.Web.Mvc.Test/Test/SessionStateTempDataProviderTest.cs index 9d09ea5b..a7752aa3 100644 --- a/test/System.Web.Mvc.Test/Test/SessionStateTempDataProviderTest.cs +++ b/test/System.Web.Mvc.Test/Test/SessionStateTempDataProviderTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/SingleServiceResolverTest.cs b/test/System.Web.Mvc.Test/Test/SingleServiceResolverTest.cs index d5149256..c4fd378e 100644 --- a/test/System.Web.Mvc.Test/Test/SingleServiceResolverTest.cs +++ b/test/System.Web.Mvc.Test/Test/SingleServiceResolverTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/StringLengthAttributeAdapterTest.cs b/test/System.Web.Mvc.Test/Test/StringLengthAttributeAdapterTest.cs index fe34cd9e..9d3e3f1c 100644 --- a/test/System.Web.Mvc.Test/Test/StringLengthAttributeAdapterTest.cs +++ b/test/System.Web.Mvc.Test/Test/StringLengthAttributeAdapterTest.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/TempDataDictionaryTest.cs b/test/System.Web.Mvc.Test/Test/TempDataDictionaryTest.cs index 95524358..56e8cf71 100644 --- a/test/System.Web.Mvc.Test/Test/TempDataDictionaryTest.cs +++ b/test/System.Web.Mvc.Test/Test/TempDataDictionaryTest.cs @@ -2,8 +2,8 @@ using System.Collections; using System.Collections.Generic; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/TypeCacheSerializerTest.cs b/test/System.Web.Mvc.Test/Test/TypeCacheSerializerTest.cs index cf6b91e5..a805fdf9 100644 --- a/test/System.Web.Mvc.Test/Test/TypeCacheSerializerTest.cs +++ b/test/System.Web.Mvc.Test/Test/TypeCacheSerializerTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/TypeCacheUtilTest.cs b/test/System.Web.Mvc.Test/Test/TypeCacheUtilTest.cs index 3e47d2d7..01bca1b2 100644 --- a/test/System.Web.Mvc.Test/Test/TypeCacheUtilTest.cs +++ b/test/System.Web.Mvc.Test/Test/TypeCacheUtilTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/TypeHelpersTest.cs b/test/System.Web.Mvc.Test/Test/TypeHelpersTest.cs index cfb88871..d42fd5e2 100644 --- a/test/System.Web.Mvc.Test/Test/TypeHelpersTest.cs +++ b/test/System.Web.Mvc.Test/Test/TypeHelpersTest.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/UrlHelperTest.cs b/test/System.Web.Mvc.Test/Test/UrlHelperTest.cs index a077cf56..7df59be5 100644 --- a/test/System.Web.Mvc.Test/Test/UrlHelperTest.cs +++ b/test/System.Web.Mvc.Test/Test/UrlHelperTest.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Routing; +using Microsoft.TestCommon; using Microsoft.Web.UnitTestUtil; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/UrlParameterTest.cs b/test/System.Web.Mvc.Test/Test/UrlParameterTest.cs index 973d19e9..06ee385f 100644 --- a/test/System.Web.Mvc.Test/Test/UrlParameterTest.cs +++ b/test/System.Web.Mvc.Test/Test/UrlParameterTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/UrlRewriterHelperTest.cs b/test/System.Web.Mvc.Test/Test/UrlRewriterHelperTest.cs index 5959ca84..848d92d6 100644 --- a/test/System.Web.Mvc.Test/Test/UrlRewriterHelperTest.cs +++ b/test/System.Web.Mvc.Test/Test/UrlRewriterHelperTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Specialized; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ValidatableObjectAdapterTest.cs b/test/System.Web.Mvc.Test/Test/ValidatableObjectAdapterTest.cs index 778904ee..2fe1f199 100644 --- a/test/System.Web.Mvc.Test/Test/ValidatableObjectAdapterTest.cs +++ b/test/System.Web.Mvc.Test/Test/ValidatableObjectAdapterTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ValidateAntiForgeryTokenAttributeTest.cs b/test/System.Web.Mvc.Test/Test/ValidateAntiForgeryTokenAttributeTest.cs index f53178e2..035d3f19 100644 --- a/test/System.Web.Mvc.Test/Test/ValidateAntiForgeryTokenAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/ValidateAntiForgeryTokenAttributeTest.cs @@ -1,10 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Helpers; -using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ValidateInputAttributeTest.cs b/test/System.Web.Mvc.Test/Test/ValidateInputAttributeTest.cs index 1f5c9cfb..0bc4242d 100644 --- a/test/System.Web.Mvc.Test/Test/ValidateInputAttributeTest.cs +++ b/test/System.Web.Mvc.Test/Test/ValidateInputAttributeTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ValueProviderCollectionTest.cs b/test/System.Web.Mvc.Test/Test/ValueProviderCollectionTest.cs index 0fd12957..34b1948c 100644 --- a/test/System.Web.Mvc.Test/Test/ValueProviderCollectionTest.cs +++ b/test/System.Web.Mvc.Test/Test/ValueProviderCollectionTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ValueProviderDictionaryTest.cs b/test/System.Web.Mvc.Test/Test/ValueProviderDictionaryTest.cs index 6c496801..232b60d5 100644 --- a/test/System.Web.Mvc.Test/Test/ValueProviderDictionaryTest.cs +++ b/test/System.Web.Mvc.Test/Test/ValueProviderDictionaryTest.cs @@ -5,8 +5,8 @@ using System.Globalization; using System.Threading; using System.Web.Routing; using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; #pragma warning disable 0618 // ValueProviderDictionary is now obsolete diff --git a/test/System.Web.Mvc.Test/Test/ValueProviderFactoriesTest.cs b/test/System.Web.Mvc.Test/Test/ValueProviderFactoriesTest.cs index 9a3f34bd..666182a2 100644 --- a/test/System.Web.Mvc.Test/Test/ValueProviderFactoriesTest.cs +++ b/test/System.Web.Mvc.Test/Test/ValueProviderFactoriesTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ValueProviderFactoryCollectionTest.cs b/test/System.Web.Mvc.Test/Test/ValueProviderFactoryCollectionTest.cs index 2ed32bc6..f6bb1188 100644 --- a/test/System.Web.Mvc.Test/Test/ValueProviderFactoryCollectionTest.cs +++ b/test/System.Web.Mvc.Test/Test/ValueProviderFactoryCollectionTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ValueProviderResultTest.cs b/test/System.Web.Mvc.Test/Test/ValueProviderResultTest.cs index 0532770a..dcde2e2c 100644 --- a/test/System.Web.Mvc.Test/Test/ValueProviderResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/ValueProviderResultTest.cs @@ -3,9 +3,6 @@ using System.Collections.Generic; using System.Globalization; using Microsoft.TestCommon; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ValueProviderUtilTest.cs b/test/System.Web.Mvc.Test/Test/ValueProviderUtilTest.cs index 776c5397..084f8a84 100644 --- a/test/System.Web.Mvc.Test/Test/ValueProviderUtilTest.cs +++ b/test/System.Web.Mvc.Test/Test/ValueProviderUtilTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewContextTest.cs b/test/System.Web.Mvc.Test/Test/ViewContextTest.cs index 7a41df4e..b8413c60 100644 --- a/test/System.Web.Mvc.Test/Test/ViewContextTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewContextTest.cs @@ -3,9 +3,8 @@ using System.Collections; using System.Collections.Generic; using System.IO; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewDataDictionaryTest.cs b/test/System.Web.Mvc.Test/Test/ViewDataDictionaryTest.cs index f7e11665..c6f7a708 100644 --- a/test/System.Web.Mvc.Test/Test/ViewDataDictionaryTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewDataDictionaryTest.cs @@ -4,8 +4,7 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Web.TestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewDataInfoTest.cs b/test/System.Web.Mvc.Test/Test/ViewDataInfoTest.cs index d693e0e0..57fbfb57 100644 --- a/test/System.Web.Mvc.Test/Test/ViewDataInfoTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewDataInfoTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewEngineCollectionTest.cs b/test/System.Web.Mvc.Test/Test/ViewEngineCollectionTest.cs index 4a5a896c..d5203062 100644 --- a/test/System.Web.Mvc.Test/Test/ViewEngineCollectionTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewEngineCollectionTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewEngineResultTest.cs b/test/System.Web.Mvc.Test/Test/ViewEngineResultTest.cs index 3d68a072..d81cc73b 100644 --- a/test/System.Web.Mvc.Test/Test/ViewEngineResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewEngineResultTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewEnginesTest.cs b/test/System.Web.Mvc.Test/Test/ViewEnginesTest.cs index 9a797a96..80d7bcba 100644 --- a/test/System.Web.Mvc.Test/Test/ViewEnginesTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewEnginesTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewMasterPageControlBuilderTest.cs b/test/System.Web.Mvc.Test/Test/ViewMasterPageControlBuilderTest.cs index 0373e2c6..d1e31f28 100644 --- a/test/System.Web.Mvc.Test/Test/ViewMasterPageControlBuilderTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewMasterPageControlBuilderTest.cs @@ -2,7 +2,7 @@ using System.CodeDom; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewMasterPageTest.cs b/test/System.Web.Mvc.Test/Test/ViewMasterPageTest.cs index c594d24f..9ae33332 100644 --- a/test/System.Web.Mvc.Test/Test/ViewMasterPageTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewMasterPageTest.cs @@ -3,9 +3,8 @@ using System.IO; using System.Web.Routing; using System.Web.UI; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewPageControlBuilderTest.cs b/test/System.Web.Mvc.Test/Test/ViewPageControlBuilderTest.cs index e4e639fc..2b642cdf 100644 --- a/test/System.Web.Mvc.Test/Test/ViewPageControlBuilderTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewPageControlBuilderTest.cs @@ -2,7 +2,7 @@ using System.CodeDom; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewPageTest.cs b/test/System.Web.Mvc.Test/Test/ViewPageTest.cs index 04ab1d69..57847893 100644 --- a/test/System.Web.Mvc.Test/Test/ViewPageTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewPageTest.cs @@ -2,9 +2,8 @@ using System.IO; using System.Web.UI; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewResultBaseTest.cs b/test/System.Web.Mvc.Test/Test/ViewResultBaseTest.cs index 0da00558..ec458f1b 100644 --- a/test/System.Web.Mvc.Test/Test/ViewResultBaseTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewResultBaseTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.TestUtil; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewResultTest.cs b/test/System.Web.Mvc.Test/Test/ViewResultTest.cs index 038dade1..589acf69 100644 --- a/test/System.Web.Mvc.Test/Test/ViewResultTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewResultTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.IO; using System.Web.Routing; using System.Web.TestUtil; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewStartPageTest.cs b/test/System.Web.Mvc.Test/Test/ViewStartPageTest.cs index 1d31ee7d..8fa041ac 100644 --- a/test/System.Web.Mvc.Test/Test/ViewStartPageTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewStartPageTest.cs @@ -2,9 +2,8 @@ using System.Web.Routing; using System.Web.WebPages; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewTypeParserFilterTest.cs b/test/System.Web.Mvc.Test/Test/ViewTypeParserFilterTest.cs index 471c64b2..3a23c165 100644 --- a/test/System.Web.Mvc.Test/Test/ViewTypeParserFilterTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewTypeParserFilterTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Web.UI; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewUserControlControlBuilderTest.cs b/test/System.Web.Mvc.Test/Test/ViewUserControlControlBuilderTest.cs index 68cced23..5a61692d 100644 --- a/test/System.Web.Mvc.Test/Test/ViewUserControlControlBuilderTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewUserControlControlBuilderTest.cs @@ -2,7 +2,7 @@ using System.CodeDom; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/ViewUserControlTest.cs b/test/System.Web.Mvc.Test/Test/ViewUserControlTest.cs index 4e8b5d18..e432c235 100644 --- a/test/System.Web.Mvc.Test/Test/ViewUserControlTest.cs +++ b/test/System.Web.Mvc.Test/Test/ViewUserControlTest.cs @@ -4,9 +4,8 @@ using System.IO; using System.Web.Routing; using System.Web.TestUtil; using System.Web.UI; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/VirtualPathProviderViewEngineTest.cs b/test/System.Web.Mvc.Test/Test/VirtualPathProviderViewEngineTest.cs index b7f92fb0..99c7e819 100644 --- a/test/System.Web.Mvc.Test/Test/VirtualPathProviderViewEngineTest.cs +++ b/test/System.Web.Mvc.Test/Test/VirtualPathProviderViewEngineTest.cs @@ -6,9 +6,8 @@ using System.Linq; using System.Web.Hosting; using System.Web.Routing; using System.Web.WebPages; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/WebFormViewEngineTest.cs b/test/System.Web.Mvc.Test/Test/WebFormViewEngineTest.cs index 738ce849..0e35056c 100644 --- a/test/System.Web.Mvc.Test/Test/WebFormViewEngineTest.cs +++ b/test/System.Web.Mvc.Test/Test/WebFormViewEngineTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Hosting; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Test/WebFormViewTest.cs b/test/System.Web.Mvc.Test/Test/WebFormViewTest.cs index d481fb51..09ecffb0 100644 --- a/test/System.Web.Mvc.Test/Test/WebFormViewTest.cs +++ b/test/System.Web.Mvc.Test/Test/WebFormViewTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.Mvc.Test/Util/DictionaryHelper.cs b/test/System.Web.Mvc.Test/Util/DictionaryHelper.cs index b4ffc442..aef7fa30 100644 --- a/test/System.Web.Mvc.Test/Util/DictionaryHelper.cs +++ b/test/System.Web.Mvc.Test/Util/DictionaryHelper.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.TestUtil { diff --git a/test/System.Web.Razor.Test/CSharpRazorCodeLanguageTest.cs b/test/System.Web.Razor.Test/CSharpRazorCodeLanguageTest.cs index 87d48b4a..6135d6f8 100644 --- a/test/System.Web.Razor.Test/CSharpRazorCodeLanguageTest.cs +++ b/test/System.Web.Razor.Test/CSharpRazorCodeLanguageTest.cs @@ -3,7 +3,7 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; using Microsoft.CSharp; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test { diff --git a/test/System.Web.Razor.Test/Editor/RazorEditorParserTest.cs b/test/System.Web.Razor.Test/Editor/RazorEditorParserTest.cs index 431eae59..be1d5ecb 100644 --- a/test/System.Web.Razor.Test/Editor/RazorEditorParserTest.cs +++ b/test/System.Web.Razor.Test/Editor/RazorEditorParserTest.cs @@ -10,9 +10,8 @@ using System.Web.Razor.Test.Utils; using System.Web.Razor.Text; using System.Web.WebPages.TestUtils; using Microsoft.CSharp; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Razor.Test.Editor { diff --git a/test/System.Web.Razor.Test/Framework/ParserTestBase.cs b/test/System.Web.Razor.Test/Framework/ParserTestBase.cs index 5ec6eefc..6b0e2419 100644 --- a/test/System.Web.Razor.Test/Framework/ParserTestBase.cs +++ b/test/System.Web.Razor.Test/Framework/ParserTestBase.cs @@ -10,7 +10,7 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Framework { diff --git a/test/System.Web.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs b/test/System.Web.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs index 6b3a1eb3..0e5829ba 100644 --- a/test/System.Web.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs +++ b/test/System.Web.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.Web.Razor.Generator; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Generator { diff --git a/test/System.Web.Razor.Test/Generator/GeneratedCodeMappingTest.cs b/test/System.Web.Razor.Test/Generator/GeneratedCodeMappingTest.cs index cfc2572c..4d99f06b 100644 --- a/test/System.Web.Razor.Test/Generator/GeneratedCodeMappingTest.cs +++ b/test/System.Web.Razor.Test/Generator/GeneratedCodeMappingTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Generator; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Generator { diff --git a/test/System.Web.Razor.Test/Generator/RazorCodeGeneratorTest.cs b/test/System.Web.Razor.Test/Generator/RazorCodeGeneratorTest.cs index c342d8b4..bd47effd 100644 --- a/test/System.Web.Razor.Test/Generator/RazorCodeGeneratorTest.cs +++ b/test/System.Web.Razor.Test/Generator/RazorCodeGeneratorTest.cs @@ -12,7 +12,7 @@ using System.Text; using System.Web.Razor.Generator; using System.Web.Razor.Test.Utils; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Generator { diff --git a/test/System.Web.Razor.Test/Generator/VBRazorCodeGeneratorTest.cs b/test/System.Web.Razor.Test/Generator/VBRazorCodeGeneratorTest.cs index 74b4a6ca..7179583f 100644 --- a/test/System.Web.Razor.Test/Generator/VBRazorCodeGeneratorTest.cs +++ b/test/System.Web.Razor.Test/Generator/VBRazorCodeGeneratorTest.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.Web.Razor.Generator; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Generator { diff --git a/test/System.Web.Razor.Test/Parser/BlockTest.cs b/test/System.Web.Razor.Test/Parser/BlockTest.cs index bcb7a8ad..d1834e62 100644 --- a/test/System.Web.Razor.Test/Parser/BlockTest.cs +++ b/test/System.Web.Razor.Test/Parser/BlockTest.cs @@ -6,7 +6,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs index 0f8c2ae2..d9275a80 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs @@ -7,7 +7,7 @@ using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpBlockTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpBlockTest.cs index d2cf2179..465a8816 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpBlockTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpBlockTest.cs @@ -7,8 +7,7 @@ using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs index e94a37df..a0f053ec 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpErrorTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpErrorTest.cs index 94925bf2..61fe7d05 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpErrorTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpErrorTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs index df2666e2..ee822f8b 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs @@ -4,7 +4,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpHelperTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpHelperTest.cs index f643702d..1aef11f7 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpHelperTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpHelperTest.cs @@ -6,7 +6,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs index b05ee203..90834dfc 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpLayoutDirectiveTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpLayoutDirectiveTest.cs index 9cc9aded..8e908b55 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpLayoutDirectiveTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpLayoutDirectiveTest.cs @@ -5,8 +5,7 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs index ef3cfe8d..b2031cc7 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs @@ -4,7 +4,7 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs index 859b9cf3..d9e6b2d5 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs index d1f7c27a..939a139e 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpSectionTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpSectionTest.cs index 1254618b..5ac5c6d8 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpSectionTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpSectionTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs index 77e6141f..43d0fde5 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpStatementTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpStatementTest.cs index b52621a0..4395ddc2 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpStatementTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpStatementTest.cs @@ -4,7 +4,7 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs index 4ebaab71..0a88061e 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs @@ -7,7 +7,7 @@ using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs index daf897c3..7a9e730c 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs @@ -6,7 +6,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs index 93a892e2..bbb9e398 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs @@ -4,7 +4,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs index bcc8b23c..99d7d371 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs @@ -3,7 +3,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CSharp/CsHtmlDocumentTest.cs b/test/System.Web.Razor.Test/Parser/CSharp/CsHtmlDocumentTest.cs index 2a27565f..3cff9747 100644 --- a/test/System.Web.Razor.Test/Parser/CSharp/CsHtmlDocumentTest.cs +++ b/test/System.Web.Razor.Test/Parser/CSharp/CsHtmlDocumentTest.cs @@ -6,7 +6,7 @@ using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.CSharp { diff --git a/test/System.Web.Razor.Test/Parser/CallbackParserListenerTest.cs b/test/System.Web.Razor.Test/Parser/CallbackParserListenerTest.cs index 2136c246..2c66ced1 100644 --- a/test/System.Web.Razor.Test/Parser/CallbackParserListenerTest.cs +++ b/test/System.Web.Razor.Test/Parser/CallbackParserListenerTest.cs @@ -5,8 +5,8 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.Razor.Test.Parser { diff --git a/test/System.Web.Razor.Test/Parser/Html/HtmlAttributeTest.cs b/test/System.Web.Razor.Test/Parser/Html/HtmlAttributeTest.cs index e1ef9455..54ed2195 100644 --- a/test/System.Web.Razor.Test/Parser/Html/HtmlAttributeTest.cs +++ b/test/System.Web.Razor.Test/Parser/Html/HtmlAttributeTest.cs @@ -6,7 +6,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.Html { diff --git a/test/System.Web.Razor.Test/Parser/Html/HtmlBlockTest.cs b/test/System.Web.Razor.Test/Parser/Html/HtmlBlockTest.cs index 0df9209f..3b512a89 100644 --- a/test/System.Web.Razor.Test/Parser/Html/HtmlBlockTest.cs +++ b/test/System.Web.Razor.Test/Parser/Html/HtmlBlockTest.cs @@ -8,8 +8,7 @@ using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.Html { diff --git a/test/System.Web.Razor.Test/Parser/Html/HtmlDocumentTest.cs b/test/System.Web.Razor.Test/Parser/Html/HtmlDocumentTest.cs index b94dcf37..1c0a1933 100644 --- a/test/System.Web.Razor.Test/Parser/Html/HtmlDocumentTest.cs +++ b/test/System.Web.Razor.Test/Parser/Html/HtmlDocumentTest.cs @@ -7,8 +7,7 @@ using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.WebPages.TestUtils; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.Html { diff --git a/test/System.Web.Razor.Test/Parser/Html/HtmlErrorTest.cs b/test/System.Web.Razor.Test/Parser/Html/HtmlErrorTest.cs index afdae1a1..da870f70 100644 --- a/test/System.Web.Razor.Test/Parser/Html/HtmlErrorTest.cs +++ b/test/System.Web.Razor.Test/Parser/Html/HtmlErrorTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.Html { diff --git a/test/System.Web.Razor.Test/Parser/Html/HtmlTagsTest.cs b/test/System.Web.Razor.Test/Parser/Html/HtmlTagsTest.cs index 82b93bd7..9e7498a5 100644 --- a/test/System.Web.Razor.Test/Parser/Html/HtmlTagsTest.cs +++ b/test/System.Web.Razor.Test/Parser/Html/HtmlTagsTest.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.Html { diff --git a/test/System.Web.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs b/test/System.Web.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs index 32239b32..6634639b 100644 --- a/test/System.Web.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs +++ b/test/System.Web.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs @@ -7,7 +7,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.Html { diff --git a/test/System.Web.Razor.Test/Parser/Html/HtmlUrlAttributeTest.cs b/test/System.Web.Razor.Test/Parser/Html/HtmlUrlAttributeTest.cs index a550eccf..e6a66f93 100644 --- a/test/System.Web.Razor.Test/Parser/Html/HtmlUrlAttributeTest.cs +++ b/test/System.Web.Razor.Test/Parser/Html/HtmlUrlAttributeTest.cs @@ -6,7 +6,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.Html { diff --git a/test/System.Web.Razor.Test/Parser/ParserContextTest.cs b/test/System.Web.Razor.Test/Parser/ParserContextTest.cs index 8ff10326..ed168ad3 100644 --- a/test/System.Web.Razor.Test/Parser/ParserContextTest.cs +++ b/test/System.Web.Razor.Test/Parser/ParserContextTest.cs @@ -7,9 +7,8 @@ using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer.Symbols; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Razor.Test.Parser { diff --git a/test/System.Web.Razor.Test/Parser/ParserVisitorExtensionsTest.cs b/test/System.Web.Razor.Test/Parser/ParserVisitorExtensionsTest.cs index ad5b0b09..6a923bf6 100644 --- a/test/System.Web.Razor.Test/Parser/ParserVisitorExtensionsTest.cs +++ b/test/System.Web.Razor.Test/Parser/ParserVisitorExtensionsTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Razor.Test.Parser { diff --git a/test/System.Web.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs b/test/System.Web.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs index 550b46aa..50a17ac3 100644 --- a/test/System.Web.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs +++ b/test/System.Web.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.PartialParsing { diff --git a/test/System.Web.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs b/test/System.Web.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs index 3ce061ec..aedca565 100644 --- a/test/System.Web.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs +++ b/test/System.Web.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs @@ -7,7 +7,7 @@ using System.Web.Razor.Test.Framework; using System.Web.Razor.Test.Utils; using System.Web.Razor.Text; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.PartialParsing { diff --git a/test/System.Web.Razor.Test/Parser/PartialParsing/VBPartialParsingTest.cs b/test/System.Web.Razor.Test/Parser/PartialParsing/VBPartialParsingTest.cs index 02c59273..203916cf 100644 --- a/test/System.Web.Razor.Test/Parser/PartialParsing/VBPartialParsingTest.cs +++ b/test/System.Web.Razor.Test/Parser/PartialParsing/VBPartialParsingTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.PartialParsing { diff --git a/test/System.Web.Razor.Test/Parser/RazorParserTest.cs b/test/System.Web.Razor.Test/Parser/RazorParserTest.cs index 3ad69992..753af811 100644 --- a/test/System.Web.Razor.Test/Parser/RazorParserTest.cs +++ b/test/System.Web.Razor.Test/Parser/RazorParserTest.cs @@ -4,8 +4,7 @@ using System.IO; using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBAutoCompleteTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBAutoCompleteTest.cs index 21810837..e163e4c4 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBAutoCompleteTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBAutoCompleteTest.cs @@ -7,7 +7,7 @@ using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBBlockTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBBlockTest.cs index 231ec73d..03fb2a04 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBBlockTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBBlockTest.cs @@ -5,9 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBContinueStatementTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBContinueStatementTest.cs index aeab3ae3..ed5caaeb 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBContinueStatementTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBContinueStatementTest.cs @@ -3,7 +3,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBDirectiveTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBDirectiveTest.cs index 4d825a23..47243f23 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBDirectiveTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBDirectiveTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBErrorTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBErrorTest.cs index 6618cea1..90ab1194 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBErrorTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBErrorTest.cs @@ -6,8 +6,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBExitStatementTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBExitStatementTest.cs index dab7863d..594c2a9f 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBExitStatementTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBExitStatementTest.cs @@ -3,7 +3,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBExplicitExpressionTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBExplicitExpressionTest.cs index 050ee578..0f95d99f 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBExplicitExpressionTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBExplicitExpressionTest.cs @@ -2,7 +2,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBExpressionTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBExpressionTest.cs index 2220dc78..7406473a 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBExpressionTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBExpressionTest.cs @@ -4,8 +4,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBExpressionsInCodeTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBExpressionsInCodeTest.cs index c716e17b..668cc1b6 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBExpressionsInCodeTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBExpressionsInCodeTest.cs @@ -4,8 +4,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBHelperTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBHelperTest.cs index 352b683a..a2466c43 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBHelperTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBHelperTest.cs @@ -6,7 +6,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBHtmlDocumentTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBHtmlDocumentTest.cs index 40af5c23..43eb8e12 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBHtmlDocumentTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBHtmlDocumentTest.cs @@ -3,7 +3,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBImplicitExpressionTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBImplicitExpressionTest.cs index c6fed0f4..9c90ae96 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBImplicitExpressionTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBImplicitExpressionTest.cs @@ -3,7 +3,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBLayoutDirectiveTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBLayoutDirectiveTest.cs index 1ed37728..aba8e8cb 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBLayoutDirectiveTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBLayoutDirectiveTest.cs @@ -4,8 +4,7 @@ using System.Web.Razor.Editor; using System.Web.Razor.Generator; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBNestedStatementsTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBNestedStatementsTest.cs index 4bae4fad..b282277f 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBNestedStatementsTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBNestedStatementsTest.cs @@ -3,7 +3,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBRazorCommentsTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBRazorCommentsTest.cs index fd790ff9..c629aa01 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBRazorCommentsTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBRazorCommentsTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBReservedWordsTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBReservedWordsTest.cs index 96f46016..c6867923 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBReservedWordsTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBReservedWordsTest.cs @@ -4,7 +4,7 @@ using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; using System.Web.Razor.Text; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBSectionTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBSectionTest.cs index d7d33ddd..47c8a79f 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBSectionTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBSectionTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBSpecialKeywordsTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBSpecialKeywordsTest.cs index 0253d294..c1917c6c 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBSpecialKeywordsTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBSpecialKeywordsTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBStatementTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBStatementTest.cs index b36ee4ce..433ce186 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBStatementTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBStatementTest.cs @@ -4,7 +4,7 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBTemplateTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBTemplateTest.cs index e38e3dfd..d27b8bab 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBTemplateTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBTemplateTest.cs @@ -5,7 +5,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Resources; using System.Web.Razor.Test.Framework; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/VB/VBToMarkupSwitchTest.cs b/test/System.Web.Razor.Test/Parser/VB/VBToMarkupSwitchTest.cs index d357ff7a..3f155f8b 100644 --- a/test/System.Web.Razor.Test/Parser/VB/VBToMarkupSwitchTest.cs +++ b/test/System.Web.Razor.Test/Parser/VB/VBToMarkupSwitchTest.cs @@ -5,8 +5,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser.VB { diff --git a/test/System.Web.Razor.Test/Parser/WhitespaceRewriterTest.cs b/test/System.Web.Razor.Test/Parser/WhitespaceRewriterTest.cs index e8d449ca..af7e3619 100644 --- a/test/System.Web.Razor.Test/Parser/WhitespaceRewriterTest.cs +++ b/test/System.Web.Razor.Test/Parser/WhitespaceRewriterTest.cs @@ -3,8 +3,7 @@ using System.Web.Razor.Parser; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Test.Framework; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Parser { diff --git a/test/System.Web.Razor.Test/RazorCodeLanguageTest.cs b/test/System.Web.Razor.Test/RazorCodeLanguageTest.cs index 4d884d52..d858cce7 100644 --- a/test/System.Web.Razor.Test/RazorCodeLanguageTest.cs +++ b/test/System.Web.Razor.Test/RazorCodeLanguageTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test { diff --git a/test/System.Web.Razor.Test/RazorDirectiveAttributeTest.cs b/test/System.Web.Razor.Test/RazorDirectiveAttributeTest.cs index ae719a51..fa42a4a4 100644 --- a/test/System.Web.Razor.Test/RazorDirectiveAttributeTest.cs +++ b/test/System.Web.Razor.Test/RazorDirectiveAttributeTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test { diff --git a/test/System.Web.Razor.Test/RazorEngineHostTest.cs b/test/System.Web.Razor.Test/RazorEngineHostTest.cs index b7c62d32..c76ea7cd 100644 --- a/test/System.Web.Razor.Test/RazorEngineHostTest.cs +++ b/test/System.Web.Razor.Test/RazorEngineHostTest.cs @@ -3,8 +3,7 @@ using System.CodeDom; using System.Web.Razor.Generator; using System.Web.Razor.Parser; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test { diff --git a/test/System.Web.Razor.Test/RazorTemplateEngineTest.cs b/test/System.Web.Razor.Test/RazorTemplateEngineTest.cs index fcddf330..04c9f6e6 100644 --- a/test/System.Web.Razor.Test/RazorTemplateEngineTest.cs +++ b/test/System.Web.Razor.Test/RazorTemplateEngineTest.cs @@ -6,9 +6,8 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; using System.Web.Razor.Text; using System.Web.WebPages.TestUtils; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Razor.Test { diff --git a/test/System.Web.Razor.Test/Text/BufferingTextReaderTest.cs b/test/System.Web.Razor.Test/Text/BufferingTextReaderTest.cs index a24e00c5..197df48c 100644 --- a/test/System.Web.Razor.Test/Text/BufferingTextReaderTest.cs +++ b/test/System.Web.Razor.Test/Text/BufferingTextReaderTest.cs @@ -2,8 +2,7 @@ using System.IO; using System.Web.Razor.Text; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Text { diff --git a/test/System.Web.Razor.Test/Text/LineTrackingStringBufferTest.cs b/test/System.Web.Razor.Test/Text/LineTrackingStringBufferTest.cs index 3614e6e6..656d5b16 100644 --- a/test/System.Web.Razor.Test/Text/LineTrackingStringBufferTest.cs +++ b/test/System.Web.Razor.Test/Text/LineTrackingStringBufferTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Text { diff --git a/test/System.Web.Razor.Test/Text/LookaheadTextReaderTestBase.cs b/test/System.Web.Razor.Test/Text/LookaheadTextReaderTestBase.cs index 2eaecc3f..1a0f87a2 100644 --- a/test/System.Web.Razor.Test/Text/LookaheadTextReaderTestBase.cs +++ b/test/System.Web.Razor.Test/Text/LookaheadTextReaderTestBase.cs @@ -3,7 +3,7 @@ using System.Text; using System.Web.Razor.Resources; using System.Web.Razor.Text; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Text { diff --git a/test/System.Web.Razor.Test/Text/SourceLocationTest.cs b/test/System.Web.Razor.Test/Text/SourceLocationTest.cs index f6ac6051..b2b9d880 100644 --- a/test/System.Web.Razor.Test/Text/SourceLocationTest.cs +++ b/test/System.Web.Razor.Test/Text/SourceLocationTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Text { diff --git a/test/System.Web.Razor.Test/Text/SourceLocationTrackerTest.cs b/test/System.Web.Razor.Test/Text/SourceLocationTrackerTest.cs index 89108455..2629e1c6 100644 --- a/test/System.Web.Razor.Test/Text/SourceLocationTrackerTest.cs +++ b/test/System.Web.Razor.Test/Text/SourceLocationTrackerTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Text { diff --git a/test/System.Web.Razor.Test/Text/TextBufferReaderTest.cs b/test/System.Web.Razor.Test/Text/TextBufferReaderTest.cs index 5ee1adca..f11a512b 100644 --- a/test/System.Web.Razor.Test/Text/TextBufferReaderTest.cs +++ b/test/System.Web.Razor.Test/Text/TextBufferReaderTest.cs @@ -2,8 +2,7 @@ using System.Web.Razor.Text; using System.Web.WebPages.TestUtils; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Text { diff --git a/test/System.Web.Razor.Test/Text/TextChangeTest.cs b/test/System.Web.Razor.Test/Text/TextChangeTest.cs index a460361e..7e585044 100644 --- a/test/System.Web.Razor.Test/Text/TextChangeTest.cs +++ b/test/System.Web.Razor.Test/Text/TextChangeTest.cs @@ -2,9 +2,8 @@ using System.Web.Razor.Text; using System.Web.WebPages.TestUtils; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Razor.Test.Text { diff --git a/test/System.Web.Razor.Test/Text/TextReaderExtensionsTest.cs b/test/System.Web.Razor.Test/Text/TextReaderExtensionsTest.cs index fb8c36f3..208938b6 100644 --- a/test/System.Web.Razor.Test/Text/TextReaderExtensionsTest.cs +++ b/test/System.Web.Razor.Test/Text/TextReaderExtensionsTest.cs @@ -2,8 +2,7 @@ using System.IO; using System.Web.Razor.Parser; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Text { diff --git a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs index 5e2f5f76..07a9e44a 100644 --- a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs index 5b749ea7..11ecb353 100644 --- a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs index 0f58a0c1..f0279624 100644 --- a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs index 267e721d..cd4d05d0 100644 --- a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerTest.cs b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerTest.cs index 4739f308..4099dd67 100644 --- a/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/CSharpTokenizerTest.cs @@ -2,8 +2,7 @@ using System.Web.Razor.Tokenizer; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/HtmlTokenizerTest.cs b/test/System.Web.Razor.Test/Tokenizer/HtmlTokenizerTest.cs index 56452917..40a7fcc7 100644 --- a/test/System.Web.Razor.Test/Tokenizer/HtmlTokenizerTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/HtmlTokenizerTest.cs @@ -2,8 +2,7 @@ using System.Web.Razor.Tokenizer; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs b/test/System.Web.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs index f7a46672..4ac1191a 100644 --- a/test/System.Web.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs @@ -4,7 +4,7 @@ using System.IO; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/TokenizerTestBase.cs b/test/System.Web.Razor.Test/Tokenizer/TokenizerTestBase.cs index 67efdad4..04e4de53 100644 --- a/test/System.Web.Razor.Test/Tokenizer/TokenizerTestBase.cs +++ b/test/System.Web.Razor.Test/Tokenizer/TokenizerTestBase.cs @@ -6,7 +6,7 @@ using System.Text; using System.Web.Razor.Text; using System.Web.Razor.Tokenizer; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerCommentTest.cs b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerCommentTest.cs index db1a59cd..516a4220 100644 --- a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerCommentTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerCommentTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerIdentifierTest.cs b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerIdentifierTest.cs index 30e64f35..ec9a95f1 100644 --- a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerIdentifierTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerIdentifierTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerLiteralTest.cs b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerLiteralTest.cs index a04ce9ed..4572a6da 100644 --- a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerLiteralTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerLiteralTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerOperatorsTest.cs b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerOperatorsTest.cs index 32f13575..e252f0d9 100644 --- a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerOperatorsTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerOperatorsTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Tokenizer.Symbols; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerTest.cs b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerTest.cs index 2bd30ce1..95b84198 100644 --- a/test/System.Web.Razor.Test/Tokenizer/VBTokenizerTest.cs +++ b/test/System.Web.Razor.Test/Tokenizer/VBTokenizerTest.cs @@ -2,8 +2,7 @@ using System.Web.Razor.Tokenizer; using System.Web.Razor.Tokenizer.Symbols; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Tokenizer { diff --git a/test/System.Web.Razor.Test/Utils/DisposableActionTest.cs b/test/System.Web.Razor.Test/Utils/DisposableActionTest.cs index 71dd48ee..3d1314ef 100644 --- a/test/System.Web.Razor.Test/Utils/DisposableActionTest.cs +++ b/test/System.Web.Razor.Test/Utils/DisposableActionTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Razor.Utils; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Utils { diff --git a/test/System.Web.Razor.Test/Utils/MiscAssert.cs b/test/System.Web.Razor.Test/Utils/MiscAssert.cs index 20f098c8..497b241a 100644 --- a/test/System.Web.Razor.Test/Utils/MiscAssert.cs +++ b/test/System.Web.Razor.Test/Utils/MiscAssert.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq.Expressions; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Utils { diff --git a/test/System.Web.Razor.Test/Utils/MiscUtils.cs b/test/System.Web.Razor.Test/Utils/MiscUtils.cs index a9c3ec81..8cb9edfc 100644 --- a/test/System.Web.Razor.Test/Utils/MiscUtils.cs +++ b/test/System.Web.Razor.Test/Utils/MiscUtils.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Text.RegularExpressions; using System.Threading; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Utils { diff --git a/test/System.Web.Razor.Test/Utils/SpanAssert.cs b/test/System.Web.Razor.Test/Utils/SpanAssert.cs index 748fa42f..75e3d18d 100644 --- a/test/System.Web.Razor.Test/Utils/SpanAssert.cs +++ b/test/System.Web.Razor.Test/Utils/SpanAssert.cs @@ -5,7 +5,7 @@ using System.Globalization; using System.Text; using System.Web.Razor.Parser.SyntaxTree; using System.Web.Razor.Text; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Razor.Test.Utils { diff --git a/test/System.Web.Razor.Test/VBRazorCodeLanguageTest.cs b/test/System.Web.Razor.Test/VBRazorCodeLanguageTest.cs index 4ceafefd..d9ba60ed 100644 --- a/test/System.Web.Razor.Test/VBRazorCodeLanguageTest.cs +++ b/test/System.Web.Razor.Test/VBRazorCodeLanguageTest.cs @@ -2,8 +2,8 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; +using Microsoft.TestCommon; using Microsoft.VisualBasic; -using Xunit; namespace System.Web.Razor.Test { diff --git a/test/System.Web.WebPages.Administration.Test/AdminPackageTest.cs b/test/System.Web.WebPages.Administration.Test/AdminPackageTest.cs index 26d5165f..25bb17d2 100644 --- a/test/System.Web.WebPages.Administration.Test/AdminPackageTest.cs +++ b/test/System.Web.WebPages.Administration.Test/AdminPackageTest.cs @@ -6,9 +6,8 @@ using System.Text; using System.Web.Helpers; using System.Web.Hosting; using System.Web.Security; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Administration.Test { diff --git a/test/System.Web.WebPages.Administration.Test/PackageManagerModuleTest.cs b/test/System.Web.WebPages.Administration.Test/PackageManagerModuleTest.cs index bc6a169d..cc269b4b 100644 --- a/test/System.Web.WebPages.Administration.Test/PackageManagerModuleTest.cs +++ b/test/System.Web.WebPages.Administration.Test/PackageManagerModuleTest.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Web.WebPages.Administration.PackageManager; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Administration.Test { diff --git a/test/System.Web.WebPages.Administration.Test/PackagesSourceFileTest.cs b/test/System.Web.WebPages.Administration.Test/PackagesSourceFileTest.cs index 49c3a5f6..6373a973 100644 --- a/test/System.Web.WebPages.Administration.Test/PackagesSourceFileTest.cs +++ b/test/System.Web.WebPages.Administration.Test/PackagesSourceFileTest.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Web.WebPages.Administration.PackageManager; using System.Xml.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Administration.Test { diff --git a/test/System.Web.WebPages.Administration.Test/PageUtilsTest.cs b/test/System.Web.WebPages.Administration.Test/PageUtilsTest.cs index a3a296b7..d2c77b3f 100644 --- a/test/System.Web.WebPages.Administration.Test/PageUtilsTest.cs +++ b/test/System.Web.WebPages.Administration.Test/PageUtilsTest.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Web.WebPages.Administration.PackageManager; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Administration.Test { diff --git a/test/System.Web.WebPages.Administration.Test/PreApplicationStartCodeTest.cs b/test/System.Web.WebPages.Administration.Test/PreApplicationStartCodeTest.cs index 9d7480e3..300f1018 100644 --- a/test/System.Web.WebPages.Administration.Test/PreApplicationStartCodeTest.cs +++ b/test/System.Web.WebPages.Administration.Test/PreApplicationStartCodeTest.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Administration.Test { diff --git a/test/System.Web.WebPages.Administration.Test/RemoteAssemblyTest.cs b/test/System.Web.WebPages.Administration.Test/RemoteAssemblyTest.cs index bc307677..8db618e5 100644 --- a/test/System.Web.WebPages.Administration.Test/RemoteAssemblyTest.cs +++ b/test/System.Web.WebPages.Administration.Test/RemoteAssemblyTest.cs @@ -2,9 +2,9 @@ using System.Linq; using System.Web.WebPages.Administration.PackageManager; +using Microsoft.TestCommon; using Moq; using NuGet.Runtime; -using Xunit; namespace System.Web.WebPages.Administration.Test { diff --git a/test/System.Web.WebPages.Administration.Test/WebProjectManagerTest.cs b/test/System.Web.WebPages.Administration.Test/WebProjectManagerTest.cs index 48397079..b111e925 100644 --- a/test/System.Web.WebPages.Administration.Test/WebProjectManagerTest.cs +++ b/test/System.Web.WebPages.Administration.Test/WebProjectManagerTest.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Web.WebPages.Administration.PackageManager; +using Microsoft.TestCommon; using Moq; using NuGet; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Administration.Test { diff --git a/test/System.Web.WebPages.Administration.Test/WebProjectSystemTest.cs b/test/System.Web.WebPages.Administration.Test/WebProjectSystemTest.cs index b000caaa..3f10d91c 100644 --- a/test/System.Web.WebPages.Administration.Test/WebProjectSystemTest.cs +++ b/test/System.Web.WebPages.Administration.Test/WebProjectSystemTest.cs @@ -6,9 +6,9 @@ using System.Linq; using System.Text; using System.Web.WebPages.Administration.PackageManager; using System.Xml.Linq; +using Microsoft.TestCommon; using Moq; using NuGet; -using Xunit; namespace System.Web.WebPages.Administration.Test { diff --git a/test/System.Web.WebPages.Deployment.Test/AssemblyUtilsTest.cs b/test/System.Web.WebPages.Deployment.Test/AssemblyUtilsTest.cs index d7cf9cfe..f52282e2 100644 --- a/test/System.Web.WebPages.Deployment.Test/AssemblyUtilsTest.cs +++ b/test/System.Web.WebPages.Deployment.Test/AssemblyUtilsTest.cs @@ -5,7 +5,7 @@ using System.Globalization; using System.IO; using System.Linq; using System.Reflection; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Deployment.Test { diff --git a/test/System.Web.WebPages.Deployment.Test/PreApplicationStartCodeTest.cs b/test/System.Web.WebPages.Deployment.Test/PreApplicationStartCodeTest.cs index ec45ca5b..6379f37b 100644 --- a/test/System.Web.WebPages.Deployment.Test/PreApplicationStartCodeTest.cs +++ b/test/System.Web.WebPages.Deployment.Test/PreApplicationStartCodeTest.cs @@ -7,8 +7,7 @@ using System.Linq; using System.Reflection; using System.Text; using System.Web.WebPages.TestUtils; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Deployment.Test { diff --git a/test/System.Web.WebPages.Deployment.Test/WebPagesDeploymentTest.cs b/test/System.Web.WebPages.Deployment.Test/WebPagesDeploymentTest.cs index fddce08a..8a236c52 100644 --- a/test/System.Web.WebPages.Deployment.Test/WebPagesDeploymentTest.cs +++ b/test/System.Web.WebPages.Deployment.Test/WebPagesDeploymentTest.cs @@ -5,9 +5,7 @@ using System.Collections.Specialized; using System.IO; using System.Reflection; using System.Web.WebPages.TestUtils; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Deployment.Test { diff --git a/test/System.Web.WebPages.Razor.Test/PreApplicationStartCodeTest.cs b/test/System.Web.WebPages.Razor.Test/PreApplicationStartCodeTest.cs index bddd3f6e..de254a56 100644 --- a/test/System.Web.WebPages.Razor.Test/PreApplicationStartCodeTest.cs +++ b/test/System.Web.WebPages.Razor.Test/PreApplicationStartCodeTest.cs @@ -3,7 +3,7 @@ using System.Reflection; using System.Web.Compilation; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Razor.Test { diff --git a/test/System.Web.WebPages.Razor.Test/RazorBuildProviderTest.cs b/test/System.Web.WebPages.Razor.Test/RazorBuildProviderTest.cs index 194e48f2..af885712 100644 --- a/test/System.Web.WebPages.Razor.Test/RazorBuildProviderTest.cs +++ b/test/System.Web.WebPages.Razor.Test/RazorBuildProviderTest.cs @@ -9,8 +9,8 @@ using System.Reflection; using System.Web.Compilation; using ASP; using Microsoft.CSharp; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace ASP { diff --git a/test/System.Web.WebPages.Razor.Test/WebCodeRazorEngineHostTest.cs b/test/System.Web.WebPages.Razor.Test/WebCodeRazorEngineHostTest.cs index 2e0020d8..4896a2e7 100644 --- a/test/System.Web.WebPages.Razor.Test/WebCodeRazorEngineHostTest.cs +++ b/test/System.Web.WebPages.Razor.Test/WebCodeRazorEngineHostTest.cs @@ -3,7 +3,7 @@ using System.CodeDom; using System.Linq; using System.Web.Razor.Generator; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Razor.Test { diff --git a/test/System.Web.WebPages.Razor.Test/WebPageRazorEngineHostTest.cs b/test/System.Web.WebPages.Razor.Test/WebPageRazorEngineHostTest.cs index 9f124eb2..5573ae68 100644 --- a/test/System.Web.WebPages.Razor.Test/WebPageRazorEngineHostTest.cs +++ b/test/System.Web.WebPages.Razor.Test/WebPageRazorEngineHostTest.cs @@ -8,8 +8,7 @@ using System.Text; using System.Web.Razor; using System.Web.Razor.Generator; using Microsoft.CSharp; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Razor.Test { diff --git a/test/System.Web.WebPages.Razor.Test/WebRazorHostFactoryTest.cs b/test/System.Web.WebPages.Razor.Test/WebRazorHostFactoryTest.cs index d9dce12f..d19151e8 100644 --- a/test/System.Web.WebPages.Razor.Test/WebRazorHostFactoryTest.cs +++ b/test/System.Web.WebPages.Razor.Test/WebRazorHostFactoryTest.cs @@ -5,8 +5,7 @@ using System.Reflection; using System.Web.Configuration; using System.Web.WebPages.Razor.Configuration; using System.Web.WebPages.Razor.Resources; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Razor.Test { diff --git a/test/System.Web.WebPages.Test/ApplicationParts/ApplicationPartRegistryTest.cs b/test/System.Web.WebPages.Test/ApplicationParts/ApplicationPartRegistryTest.cs index f1134d9c..b861df67 100644 --- a/test/System.Web.WebPages.Test/ApplicationParts/ApplicationPartRegistryTest.cs +++ b/test/System.Web.WebPages.Test/ApplicationParts/ApplicationPartRegistryTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.WebPages.ApplicationParts; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test.ApplicationModule { diff --git a/test/System.Web.WebPages.Test/ApplicationParts/ApplicationPartTest.cs b/test/System.Web.WebPages.Test/ApplicationParts/ApplicationPartTest.cs index baacbef8..f79d835e 100644 --- a/test/System.Web.WebPages.Test/ApplicationParts/ApplicationPartTest.cs +++ b/test/System.Web.WebPages.Test/ApplicationParts/ApplicationPartTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/ApplicationParts/MimeMappingTest.cs b/test/System.Web.WebPages.Test/ApplicationParts/MimeMappingTest.cs index 49fa3313..f3945344 100644 --- a/test/System.Web.WebPages.Test/ApplicationParts/MimeMappingTest.cs +++ b/test/System.Web.WebPages.Test/ApplicationParts/MimeMappingTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using Microsoft.Internal.Web.Utils; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/ApplicationParts/ResourceHandlerTest.cs b/test/System.Web.WebPages.Test/ApplicationParts/ResourceHandlerTest.cs index 59f443b7..4b34cfe0 100644 --- a/test/System.Web.WebPages.Test/ApplicationParts/ResourceHandlerTest.cs +++ b/test/System.Web.WebPages.Test/ApplicationParts/ResourceHandlerTest.cs @@ -3,9 +3,8 @@ using System.IO; using System.Text; using System.Web.WebPages.ApplicationParts; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Extensions/HttpContextExtensionsTest.cs b/test/System.Web.WebPages.Test/Extensions/HttpContextExtensionsTest.cs index 58e6c6b1..053ebc69 100644 --- a/test/System.Web.WebPages.Test/Extensions/HttpContextExtensionsTest.cs +++ b/test/System.Web.WebPages.Test/Extensions/HttpContextExtensionsTest.cs @@ -3,8 +3,8 @@ using System; using System.Web; using System.Web.WebPages; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.WebPages.Test.Helpers { diff --git a/test/System.Web.WebPages.Test/Extensions/HttpRequestExtensionsTest.cs b/test/System.Web.WebPages.Test/Extensions/HttpRequestExtensionsTest.cs index d2f6fefd..96d84701 100644 --- a/test/System.Web.WebPages.Test/Extensions/HttpRequestExtensionsTest.cs +++ b/test/System.Web.WebPages.Test/Extensions/HttpRequestExtensionsTest.cs @@ -3,8 +3,8 @@ using System; using System.Web; using System.Web.WebPages; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.WebPages.Test.Helpers { diff --git a/test/System.Web.WebPages.Test/Extensions/HttpResponseExtensionsTest.cs b/test/System.Web.WebPages.Test/Extensions/HttpResponseExtensionsTest.cs index c1cdf475..3d8fb1ae 100644 --- a/test/System.Web.WebPages.Test/Extensions/HttpResponseExtensionsTest.cs +++ b/test/System.Web.WebPages.Test/Extensions/HttpResponseExtensionsTest.cs @@ -6,8 +6,8 @@ using System.Net; using System.Text; using System.Web; using System.Web.WebPages; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.WebPages.Test.Helpers { diff --git a/test/System.Web.WebPages.Test/Extensions/StringExtensionsTest.cs b/test/System.Web.WebPages.Test/Extensions/StringExtensionsTest.cs index 15184e2e..54fbece8 100644 --- a/test/System.Web.WebPages.Test/Extensions/StringExtensionsTest.cs +++ b/test/System.Web.WebPages.Test/Extensions/StringExtensionsTest.cs @@ -2,8 +2,7 @@ using System.Globalization; using System.Web.TestUtil; -using Xunit; -using Xunit.Extensions; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiForgeryConfigTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiForgeryConfigTest.cs index 9b9262df..a1c24753 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiForgeryConfigTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiForgeryConfigTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiForgeryTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiForgeryTest.cs index 6a6378d8..a323ea24 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiForgeryTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiForgeryTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenSerializerTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenSerializerTest.cs index e132cab9..960c6757 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenSerializerTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenSerializerTest.cs @@ -4,10 +4,8 @@ using System.Collections.Generic; using System.Globalization; using System.Text; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenStoreTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenStoreTest.cs index 0fb1fbc2..6cc660e6 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenStoreTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenStoreTest.cs @@ -1,10 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenTest.cs index ee2b10fc..7ee6ebca 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryTokenTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryWorkerTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryWorkerTest.cs index 8ae7b083..5defc641 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryWorkerTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/AntiForgeryWorkerTest.cs @@ -1,11 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Security.Principal; -using System.Web.Helpers.Test; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/BinaryBlobTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/BinaryBlobTest.cs index a7beedff..707acfcd 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/BinaryBlobTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/BinaryBlobTest.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/ClaimUidExtractorTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/ClaimUidExtractorTest.cs index 59ced27f..ba3cf8b3 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/ClaimUidExtractorTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/ClaimUidExtractorTest.cs @@ -5,11 +5,8 @@ using System.Reflection; using System.Security.Principal; using System.Web.Helpers.Claims; using System.Web.Helpers.Claims.Test; -using System.Web.Helpers.Test; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MachineKey40CryptoSystemTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MachineKey40CryptoSystemTest.cs index ca3ccc27..2339fc14 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MachineKey40CryptoSystemTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MachineKey40CryptoSystemTest.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.Security; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MachineKey45CryptoSystemTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MachineKey45CryptoSystemTest.cs index abd2eaaa..e1d124f3 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MachineKey45CryptoSystemTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MachineKey45CryptoSystemTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MockableTokenStore.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MockableTokenStore.cs index e716da1f..403fa7d0 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MockableTokenStore.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/MockableTokenStore.cs @@ -1,6 +1,5 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using System.Security.Principal; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/TokenValidatorTest.cs b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/TokenValidatorTest.cs index e2339441..6ca6fcf9 100644 --- a/test/System.Web.WebPages.Test/Helpers/AntiXsrf/TokenValidatorTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/AntiXsrf/TokenValidatorTest.cs @@ -1,12 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Security.Principal; -using System.Web.Helpers.Test; using System.Web.Mvc; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Helpers.AntiXsrf.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/Claims/ClaimTest.cs b/test/System.Web.WebPages.Test/Helpers/Claims/ClaimTest.cs index c318256c..fcf41e78 100644 --- a/test/System.Web.WebPages.Test/Helpers/Claims/ClaimTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/Claims/ClaimTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Claims.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/Claims/ClaimsIdentityConverterTest.cs b/test/System.Web.WebPages.Test/Helpers/Claims/ClaimsIdentityConverterTest.cs index cb356671..4ee7ab59 100644 --- a/test/System.Web.WebPages.Test/Helpers/Claims/ClaimsIdentityConverterTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/Claims/ClaimsIdentityConverterTest.cs @@ -4,10 +4,8 @@ using System.Collections.Generic; using System.Reflection; using System.Security.Principal; using System.Web.Security; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.Helpers.Claims.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/Claims/ClaimsIdentityTest.cs b/test/System.Web.WebPages.Test/Helpers/Claims/ClaimsIdentityTest.cs index 5e804f5c..ca69ca02 100644 --- a/test/System.Web.WebPages.Test/Helpers/Claims/ClaimsIdentityTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/Claims/ClaimsIdentityTest.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Security.Principal; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Claims.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/CryptoUtilTest.cs b/test/System.Web.WebPages.Test/Helpers/CryptoUtilTest.cs index 1e361a28..ac702ad2 100644 --- a/test/System.Web.WebPages.Test/Helpers/CryptoUtilTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/CryptoUtilTest.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Helpers.Test { diff --git a/test/System.Web.WebPages.Test/Helpers/UnvalidatedRequestValuesTest.cs b/test/System.Web.WebPages.Test/Helpers/UnvalidatedRequestValuesTest.cs index 02415516..08f4de96 100644 --- a/test/System.Web.WebPages.Test/Helpers/UnvalidatedRequestValuesTest.cs +++ b/test/System.Web.WebPages.Test/Helpers/UnvalidatedRequestValuesTest.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; using System.Web; using System.Web.Helpers; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace Microsoft.WebPages.Test.Helpers { diff --git a/test/System.Web.WebPages.Test/Html/CheckBoxTest.cs b/test/System.Web.WebPages.Test/Html/CheckBoxTest.cs index 832fafae..78798d23 100644 --- a/test/System.Web.WebPages.Test/Html/CheckBoxTest.cs +++ b/test/System.Web.WebPages.Test/Html/CheckBoxTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Web.WebPages.Html; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Html/HtmlHelperTest.cs b/test/System.Web.WebPages.Test/Html/HtmlHelperTest.cs index 924a11c8..508ddfd6 100644 --- a/test/System.Web.WebPages.Test/Html/HtmlHelperTest.cs +++ b/test/System.Web.WebPages.Test/Html/HtmlHelperTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.WebPages.Html; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Html/InputHelperTest.cs b/test/System.Web.WebPages.Test/Html/InputHelperTest.cs index 1c9653cd..b2e9724d 100644 --- a/test/System.Web.WebPages.Test/Html/InputHelperTest.cs +++ b/test/System.Web.WebPages.Test/Html/InputHelperTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Data.Linq; using System.Web.WebPages.Html; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Html/RadioButtonTest.cs b/test/System.Web.WebPages.Test/Html/RadioButtonTest.cs index 98ea06e5..ff97bfda 100644 --- a/test/System.Web.WebPages.Test/Html/RadioButtonTest.cs +++ b/test/System.Web.WebPages.Test/Html/RadioButtonTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Web.WebPages.Html; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Html/SelectHelperTest.cs b/test/System.Web.WebPages.Test/Html/SelectHelperTest.cs index 359993c3..d026b68f 100644 --- a/test/System.Web.WebPages.Test/Html/SelectHelperTest.cs +++ b/test/System.Web.WebPages.Test/Html/SelectHelperTest.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Web.WebPages.Html; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Html/TextAreaHelperTest.cs b/test/System.Web.WebPages.Test/Html/TextAreaHelperTest.cs index bb81ff0c..dc1f6ef1 100644 --- a/test/System.Web.WebPages.Test/Html/TextAreaHelperTest.cs +++ b/test/System.Web.WebPages.Test/Html/TextAreaHelperTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Web.WebPages.Html; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Html/ValidationHelperTest.cs b/test/System.Web.WebPages.Test/Html/ValidationHelperTest.cs index 25de62ec..00479528 100644 --- a/test/System.Web.WebPages.Test/Html/ValidationHelperTest.cs +++ b/test/System.Web.WebPages.Test/Html/ValidationHelperTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Web.WebPages.Html; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Instrumentation/InstrumentationServiceTest.cs b/test/System.Web.WebPages.Test/Instrumentation/InstrumentationServiceTest.cs index 16f8d4a3..0ed999a6 100644 --- a/test/System.Web.WebPages.Test/Instrumentation/InstrumentationServiceTest.cs +++ b/test/System.Web.WebPages.Test/Instrumentation/InstrumentationServiceTest.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Dynamic; using System.IO; using System.Web.WebPages.Instrumentation; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test.Instrumentation { diff --git a/test/System.Web.WebPages.Test/Mvc/HttpAntiForgeryExceptionTest.cs b/test/System.Web.WebPages.Test/Mvc/HttpAntiForgeryExceptionTest.cs index 9836a5af..06559217 100644 --- a/test/System.Web.WebPages.Test/Mvc/HttpAntiForgeryExceptionTest.cs +++ b/test/System.Web.WebPages.Test/Mvc/HttpAntiForgeryExceptionTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Runtime.Serialization.Formatters.Binary; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.WebPages.Test/Mvc/ModelClientValidationMembershipPasswordRuleTest.cs b/test/System.Web.WebPages.Test/Mvc/ModelClientValidationMembershipPasswordRuleTest.cs index 0ad10de3..2994abc1 100644 --- a/test/System.Web.WebPages.Test/Mvc/ModelClientValidationMembershipPasswordRuleTest.cs +++ b/test/System.Web.WebPages.Test/Mvc/ModelClientValidationMembershipPasswordRuleTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.WebPages.Test/Mvc/TagBuilderTest.cs b/test/System.Web.WebPages.Test/Mvc/TagBuilderTest.cs index cf70d6f7..a6838f68 100644 --- a/test/System.Web.WebPages.Test/Mvc/TagBuilderTest.cs +++ b/test/System.Web.WebPages.Test/Mvc/TagBuilderTest.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Web.WebPages.Html; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.Mvc.Test { diff --git a/test/System.Web.WebPages.Test/PreApplicationStartCodeTest.cs b/test/System.Web.WebPages.Test/PreApplicationStartCodeTest.cs index 184bc806..cb0bb426 100644 --- a/test/System.Web.WebPages.Test/PreApplicationStartCodeTest.cs +++ b/test/System.Web.WebPages.Test/PreApplicationStartCodeTest.cs @@ -5,7 +5,7 @@ using System.Web.Routing; using System.Web.Security; using System.Web.UI; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/ScopeStorage/AspNetRequestScopeStorageProviderTest.cs b/test/System.Web.WebPages.Test/ScopeStorage/AspNetRequestScopeStorageProviderTest.cs index a0887b86..afd0869b 100644 --- a/test/System.Web.WebPages.Test/ScopeStorage/AspNetRequestScopeStorageProviderTest.cs +++ b/test/System.Web.WebPages.Test/ScopeStorage/AspNetRequestScopeStorageProviderTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Web.WebPages.Scope; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/ScopeStorage/ScopeStorageDictionaryTest.cs b/test/System.Web.WebPages.Test/ScopeStorage/ScopeStorageDictionaryTest.cs index a4dc4a20..18a225c9 100644 --- a/test/System.Web.WebPages.Test/ScopeStorage/ScopeStorageDictionaryTest.cs +++ b/test/System.Web.WebPages.Test/ScopeStorage/ScopeStorageDictionaryTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Web.WebPages.Scope; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/ScopeStorage/ScopeStorageKeyComparerTest.cs b/test/System.Web.WebPages.Test/ScopeStorage/ScopeStorageKeyComparerTest.cs index 194a21fe..9554d9aa 100644 --- a/test/System.Web.WebPages.Test/ScopeStorage/ScopeStorageKeyComparerTest.cs +++ b/test/System.Web.WebPages.Test/ScopeStorage/ScopeStorageKeyComparerTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Web.WebPages.Scope; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/ScopeStorage/WebConfigScopeStorageTest.cs b/test/System.Web.WebPages.Test/ScopeStorage/WebConfigScopeStorageTest.cs index 1b5ed43b..b67fb758 100644 --- a/test/System.Web.WebPages.Test/ScopeStorage/WebConfigScopeStorageTest.cs +++ b/test/System.Web.WebPages.Test/ScopeStorage/WebConfigScopeStorageTest.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; using System.Web.WebPages.Scope; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Utils/CultureUtilTest.cs b/test/System.Web.WebPages.Test/Utils/CultureUtilTest.cs index 1839a5ed..a06ed1ca 100644 --- a/test/System.Web.WebPages.Test/Utils/CultureUtilTest.cs +++ b/test/System.Web.WebPages.Test/Utils/CultureUtilTest.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Threading; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Utils/PathUtilTest.cs b/test/System.Web.WebPages.Test/Utils/PathUtilTest.cs index 4e0cd71d..1cd0d0ad 100644 --- a/test/System.Web.WebPages.Test/Utils/PathUtilTest.cs +++ b/test/System.Web.WebPages.Test/Utils/PathUtilTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Web.WebPages.TestUtils; using Microsoft.Internal.Web.Utils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Utils/SessionStateUtilTest.cs b/test/System.Web.WebPages.Test/Utils/SessionStateUtilTest.cs index 90f018dc..5b2c54e1 100644 --- a/test/System.Web.WebPages.Test/Utils/SessionStateUtilTest.cs +++ b/test/System.Web.WebPages.Test/Utils/SessionStateUtilTest.cs @@ -3,9 +3,8 @@ using System.Collections.Concurrent; using System.Web.Razor; using System.Web.SessionState; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Utils/TypeHelperTest.cs b/test/System.Web.WebPages.Test/Utils/TypeHelperTest.cs index fffe1950..3dd2c0c8 100644 --- a/test/System.Web.WebPages.Test/Utils/TypeHelperTest.cs +++ b/test/System.Web.WebPages.Test/Utils/TypeHelperTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Utils/UrlUtilTest.cs b/test/System.Web.WebPages.Test/Utils/UrlUtilTest.cs index 9772655e..1359936b 100644 --- a/test/System.Web.WebPages.Test/Utils/UrlUtilTest.cs +++ b/test/System.Web.WebPages.Test/Utils/UrlUtilTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/Validation/ValidationHelperTest.cs b/test/System.Web.WebPages.Test/Validation/ValidationHelperTest.cs index 0d42a5a4..249988b6 100644 --- a/test/System.Web.WebPages.Test/Validation/ValidationHelperTest.cs +++ b/test/System.Web.WebPages.Test/Validation/ValidationHelperTest.cs @@ -6,9 +6,8 @@ using System.Linq; using System.Web.Mvc; using System.Web.WebPages.Html; using System.Web.WebPages.Scope; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Validation.Test { diff --git a/test/System.Web.WebPages.Test/Validation/ValidatorTest.cs b/test/System.Web.WebPages.Test/Validation/ValidatorTest.cs index 7e97b377..3047c2ad 100644 --- a/test/System.Web.WebPages.Test/Validation/ValidatorTest.cs +++ b/test/System.Web.WebPages.Test/Validation/ValidatorTest.cs @@ -4,9 +4,8 @@ using System.Collections.Specialized; using System.ComponentModel.DataAnnotations; using System.Globalization; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Validation.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/ApplicationStartPageTest.cs b/test/System.Web.WebPages.Test/WebPage/ApplicationStartPageTest.cs index 3252fab3..87aadde9 100644 --- a/test/System.Web.WebPages.Test/WebPage/ApplicationStartPageTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/ApplicationStartPageTest.cs @@ -4,9 +4,8 @@ using System.IO; using System.Reflection; using System.Text; using System.Web.WebPages.TestUtils; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/BrowserHelpersTest.cs b/test/System.Web.WebPages.Test/WebPage/BrowserHelpersTest.cs index 60a1c0db..35876b4c 100644 --- a/test/System.Web.WebPages.Test/WebPage/BrowserHelpersTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/BrowserHelpersTest.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Web.Configuration; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/BrowserOverrideStoresTest.cs b/test/System.Web.WebPages.Test/WebPage/BrowserOverrideStoresTest.cs index fe6b43de..b2a91865 100644 --- a/test/System.Web.WebPages.Test/WebPage/BrowserOverrideStoresTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/BrowserOverrideStoresTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/BuildManagerExceptionUtilTest.cs b/test/System.Web.WebPages.Test/WebPage/BuildManagerExceptionUtilTest.cs index 10937e25..cd2ea3a5 100644 --- a/test/System.Web.WebPages.Test/WebPage/BuildManagerExceptionUtilTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/BuildManagerExceptionUtilTest.cs @@ -3,8 +3,7 @@ using System.Globalization; using System.Runtime.CompilerServices; using System.Web.WebPages.Resources; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/BuildManagerWrapperTest.cs b/test/System.Web.WebPages.Test/WebPage/BuildManagerWrapperTest.cs index 3f5e43ac..838819fd 100644 --- a/test/System.Web.WebPages.Test/WebPage/BuildManagerWrapperTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/BuildManagerWrapperTest.cs @@ -5,8 +5,8 @@ using System.IO; using System.Text; using System.Web.Hosting; using Microsoft.Internal.Web.Utils; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/CookieBrowserOverrideStoreTest.cs b/test/System.Web.WebPages.Test/WebPage/CookieBrowserOverrideStoreTest.cs index 4af6440c..2eefe0aa 100644 --- a/test/System.Web.WebPages.Test/WebPage/CookieBrowserOverrideStoreTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/CookieBrowserOverrideStoreTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/DefaultDisplayModeTest.cs b/test/System.Web.WebPages.Test/WebPage/DefaultDisplayModeTest.cs index 4fae2cd3..98c8b89b 100644 --- a/test/System.Web.WebPages.Test/WebPage/DefaultDisplayModeTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/DefaultDisplayModeTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/DisplayInfoTest.cs b/test/System.Web.WebPages.Test/WebPage/DisplayInfoTest.cs index 89fd7d23..181192dd 100644 --- a/test/System.Web.WebPages.Test/WebPage/DisplayInfoTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/DisplayInfoTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/DisplayModeProviderTest.cs b/test/System.Web.WebPages.Test/WebPage/DisplayModeProviderTest.cs index 10d96375..5ea075fa 100644 --- a/test/System.Web.WebPages.Test/WebPage/DisplayModeProviderTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/DisplayModeProviderTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/DynamicHttpApplicationStateTest.cs b/test/System.Web.WebPages.Test/WebPage/DynamicHttpApplicationStateTest.cs index 0a543480..7dc7f081 100644 --- a/test/System.Web.WebPages.Test/WebPage/DynamicHttpApplicationStateTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/DynamicHttpApplicationStateTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.WebPages.Resources; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/DynamicPageDataDictionaryTest.cs b/test/System.Web.WebPages.Test/WebPage/DynamicPageDataDictionaryTest.cs index 353f8fd2..978a9fd7 100644 --- a/test/System.Web.WebPages.Test/WebPage/DynamicPageDataDictionaryTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/DynamicPageDataDictionaryTest.cs @@ -3,8 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Web.WebPages.Resources; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/FileExistenceCacheTest.cs b/test/System.Web.WebPages.Test/WebPage/FileExistenceCacheTest.cs index da9a3e2c..8aa64bad 100644 --- a/test/System.Web.WebPages.Test/WebPage/FileExistenceCacheTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/FileExistenceCacheTest.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Threading; using System.Web.Hosting; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/LayoutTest.cs b/test/System.Web.WebPages.Test/WebPage/LayoutTest.cs index 75d16d5d..3d4817ce 100644 --- a/test/System.Web.WebPages.Test/WebPage/LayoutTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/LayoutTest.cs @@ -2,9 +2,8 @@ using System.Globalization; using System.Web.WebPages.Resources; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/PageDataDictionaryTest.cs b/test/System.Web.WebPages.Test/WebPage/PageDataDictionaryTest.cs index 774b48f0..6b4685d7 100644 --- a/test/System.Web.WebPages.Test/WebPage/PageDataDictionaryTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/PageDataDictionaryTest.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/RenderPageTest.cs b/test/System.Web.WebPages.Test/WebPage/RenderPageTest.cs index 4763a1ad..7397ed68 100644 --- a/test/System.Web.WebPages.Test/WebPage/RenderPageTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/RenderPageTest.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using System.Web.WebPages.Resources; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/RequestBrowserOverrideStoreTest.cs b/test/System.Web.WebPages.Test/WebPage/RequestBrowserOverrideStoreTest.cs index fd2c1800..65e67d23 100644 --- a/test/System.Web.WebPages.Test/WebPage/RequestBrowserOverrideStoreTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/RequestBrowserOverrideStoreTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/RequestResourceTrackerTest.cs b/test/System.Web.WebPages.Test/WebPage/RequestResourceTrackerTest.cs index 62b1837e..b25b5daf 100644 --- a/test/System.Web.WebPages.Test/WebPage/RequestResourceTrackerTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/RequestResourceTrackerTest.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/StartPageTest.cs b/test/System.Web.WebPages.Test/WebPage/StartPageTest.cs index e361bffa..29e14111 100644 --- a/test/System.Web.WebPages.Test/WebPage/StartPageTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/StartPageTest.cs @@ -6,9 +6,8 @@ using System.Web.Compilation; using System.Web.Hosting; using System.Web.Profile; using System.Web.WebPages.TestUtils; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/TemplateStackTest.cs b/test/System.Web.WebPages.Test/WebPage/TemplateStackTest.cs index 8a66890e..64409033 100644 --- a/test/System.Web.WebPages.Test/WebPage/TemplateStackTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/TemplateStackTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/UrlDataTest.cs b/test/System.Web.WebPages.Test/WebPage/UrlDataTest.cs index cfa2312f..f415a467 100644 --- a/test/System.Web.WebPages.Test/WebPage/UrlDataTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/UrlDataTest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/VirtualPathFactoryExtensionsTest.cs b/test/System.Web.WebPages.Test/WebPage/VirtualPathFactoryExtensionsTest.cs index dc6fb107..261e8a05 100644 --- a/test/System.Web.WebPages.Test/WebPage/VirtualPathFactoryExtensionsTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/VirtualPathFactoryExtensionsTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/VirtualPathFactoryManagerTest.cs b/test/System.Web.WebPages.Test/WebPage/VirtualPathFactoryManagerTest.cs index 04c0fece..7fd5982b 100644 --- a/test/System.Web.WebPages.Test/WebPage/VirtualPathFactoryManagerTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/VirtualPathFactoryManagerTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/WebPageContextTest.cs b/test/System.Web.WebPages.Test/WebPage/WebPageContextTest.cs index 075bed83..40f4ee3d 100644 --- a/test/System.Web.WebPages.Test/WebPage/WebPageContextTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/WebPageContextTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.IO; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/WebPageExecutingBaseTest.cs b/test/System.Web.WebPages.Test/WebPage/WebPageExecutingBaseTest.cs index 90388f6b..7b88995e 100644 --- a/test/System.Web.WebPages.Test/WebPage/WebPageExecutingBaseTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/WebPageExecutingBaseTest.cs @@ -3,8 +3,8 @@ using System.IO; using System.Text; using System.Web.WebPages.Instrumentation; +using Microsoft.TestCommon; using Moq; -using Xunit; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/WebPageHttpHandlerTest.cs b/test/System.Web.WebPages.Test/WebPage/WebPageHttpHandlerTest.cs index 85da607b..9b04ad1d 100644 --- a/test/System.Web.WebPages.Test/WebPage/WebPageHttpHandlerTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/WebPageHttpHandlerTest.cs @@ -5,9 +5,8 @@ using System.Collections.Specialized; using System.IO; using System.Security; using System.Text; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/WebPageHttpModuleTest.cs b/test/System.Web.WebPages.Test/WebPage/WebPageHttpModuleTest.cs index ec596a06..941b3405 100644 --- a/test/System.Web.WebPages.Test/WebPage/WebPageHttpModuleTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/WebPageHttpModuleTest.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/WebPageRenderingBaseTest.cs b/test/System.Web.WebPages.Test/WebPage/WebPageRenderingBaseTest.cs index c6ba2c0c..fadbdfb9 100644 --- a/test/System.Web.WebPages.Test/WebPage/WebPageRenderingBaseTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/WebPageRenderingBaseTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/WebPageRouteTest.cs b/test/System.Web.WebPages.Test/WebPage/WebPageRouteTest.cs index ccf6dcee..1691d821 100644 --- a/test/System.Web.WebPages.Test/WebPage/WebPageRouteTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/WebPageRouteTest.cs @@ -2,10 +2,8 @@ using System.Collections; using System.Collections.Generic; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Xunit.Extensions; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/System.Web.WebPages.Test/WebPage/WebPageTest.cs b/test/System.Web.WebPages.Test/WebPage/WebPageTest.cs index 5ba99e50..fafc5c79 100644 --- a/test/System.Web.WebPages.Test/WebPage/WebPageTest.cs +++ b/test/System.Web.WebPages.Test/WebPage/WebPageTest.cs @@ -5,9 +5,8 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; using System.Web.Caching; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace System.Web.WebPages.Test { diff --git a/test/WebApiHelpPage.Test/HelpControllerTest.cs b/test/WebApiHelpPage.Test/HelpControllerTest.cs index e394516a..17f88152 100644 --- a/test/WebApiHelpPage.Test/HelpControllerTest.cs +++ b/test/WebApiHelpPage.Test/HelpControllerTest.cs @@ -2,10 +2,9 @@ using System.Web.Http; using System.Web.Mvc; +using Microsoft.TestCommon; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage.Controllers; -using Xunit; -using Xunit.Extensions; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/HelpPageApiModelTest.cs b/test/WebApiHelpPage.Test/HelpPageApiModelTest.cs index 78c0b55f..65778a76 100644 --- a/test/WebApiHelpPage.Test/HelpPageApiModelTest.cs +++ b/test/WebApiHelpPage.Test/HelpPageApiModelTest.cs @@ -2,9 +2,9 @@ using System.Net.Http.Headers; using System.Web.Http.Description; +using Microsoft.TestCommon; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage.Models; -using Xunit; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/HelpPageAreaRegistrationTest.cs b/test/WebApiHelpPage.Test/HelpPageAreaRegistrationTest.cs index d17af575..b46f9b24 100644 --- a/test/WebApiHelpPage.Test/HelpPageAreaRegistrationTest.cs +++ b/test/WebApiHelpPage.Test/HelpPageAreaRegistrationTest.cs @@ -2,8 +2,8 @@ using System.Web.Mvc; using System.Web.Routing; +using Microsoft.TestCommon; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; -using Xunit; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/HelpPageConfigurationExtensionsTest.cs b/test/WebApiHelpPage.Test/HelpPageConfigurationExtensionsTest.cs index 7af159ce..87e396d1 100644 --- a/test/WebApiHelpPage.Test/HelpPageConfigurationExtensionsTest.cs +++ b/test/WebApiHelpPage.Test/HelpPageConfigurationExtensionsTest.cs @@ -7,11 +7,10 @@ using System.Net.Http.Headers; using System.Web.Http; using System.Web.Http.Description; using System.Web.Http.ModelBinding; +using Microsoft.TestCommon; using Moq; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage.Models; -using Xunit; -using Xunit.Extensions; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/HelpPageSampleKeyTest.cs b/test/WebApiHelpPage.Test/HelpPageSampleKeyTest.cs index 3bd92ffd..b2272dbc 100644 --- a/test/WebApiHelpPage.Test/HelpPageSampleKeyTest.cs +++ b/test/WebApiHelpPage.Test/HelpPageSampleKeyTest.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Net.Http.Headers; +using Microsoft.TestCommon; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; -using Xunit; -using Xunit.Extensions; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/HelppageSampleGeneratorTest.cs b/test/WebApiHelpPage.Test/HelppageSampleGeneratorTest.cs index efc0e24e..023a2ed6 100644 --- a/test/WebApiHelpPage.Test/HelppageSampleGeneratorTest.cs +++ b/test/WebApiHelpPage.Test/HelppageSampleGeneratorTest.cs @@ -11,11 +11,10 @@ using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Threading.Tasks; using System.Web.Http.Description; +using Microsoft.TestCommon; using Moq; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; using WebApiHelpPageWebHost.UnitTest.Helpers; -using Xunit; -using Xunit.Extensions; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/ImageSampleTest.cs b/test/WebApiHelpPage.Test/ImageSampleTest.cs index aede098a..c18021fd 100644 --- a/test/WebApiHelpPage.Test/ImageSampleTest.cs +++ b/test/WebApiHelpPage.Test/ImageSampleTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; +using Microsoft.TestCommon; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; -using Xunit; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/InvalidSampleTest.cs b/test/WebApiHelpPage.Test/InvalidSampleTest.cs index 06d07b4b..db852182 100644 --- a/test/WebApiHelpPage.Test/InvalidSampleTest.cs +++ b/test/WebApiHelpPage.Test/InvalidSampleTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; +using Microsoft.TestCommon; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; -using Xunit; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/ObjectGeneratorTest.cs b/test/WebApiHelpPage.Test/ObjectGeneratorTest.cs index b9220a31..d4541d30 100644 --- a/test/WebApiHelpPage.Test/ObjectGeneratorTest.cs +++ b/test/WebApiHelpPage.Test/ObjectGeneratorTest.cs @@ -10,9 +10,8 @@ using System.Net; using System.Net.Http; using System.Web.Http.Description; using System.Web.Mvc; +using Microsoft.TestCommon; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; -using Xunit; -using Xunit.Extensions; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/TextSampleTest.cs b/test/WebApiHelpPage.Test/TextSampleTest.cs index d98edf2e..2d54dc95 100644 --- a/test/WebApiHelpPage.Test/TextSampleTest.cs +++ b/test/WebApiHelpPage.Test/TextSampleTest.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; +using Microsoft.TestCommon; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; -using Xunit; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebApiHelpPage.Test/WebApiHelpPage.Test.csproj b/test/WebApiHelpPage.Test/WebApiHelpPage.Test.csproj index ed6d114d..0ba98a8e 100644 --- a/test/WebApiHelpPage.Test/WebApiHelpPage.Test.csproj +++ b/test/WebApiHelpPage.Test/WebApiHelpPage.Test.csproj @@ -138,6 +138,10 @@ {FEDFE6CA-8282-4C5B-A756-E97189690982} WebApiHelpPage + + {fccc4cb7-baf7-4a57-9f89-e5766fe536c0} + Microsoft.TestCommon + diff --git a/test/WebApiHelpPage.Test/XmlDocumentationProviderTest.cs b/test/WebApiHelpPage.Test/XmlDocumentationProviderTest.cs index 185006f6..00248bf9 100644 --- a/test/WebApiHelpPage.Test/XmlDocumentationProviderTest.cs +++ b/test/WebApiHelpPage.Test/XmlDocumentationProviderTest.cs @@ -5,10 +5,9 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Web.Http.Controllers; +using Microsoft.TestCommon; using ROOT_PROJECT_NAMESPACE.Areas.HelpPage; using WebApiHelpPageWebHost.UnitTest.Controllers; -using Xunit; -using Xunit.Extensions; namespace WebApiHelpPageWebHost.UnitTest { diff --git a/test/WebMatrix.Data.Test/ConfigurationManagerWrapperTest.cs b/test/WebMatrix.Data.Test/ConfigurationManagerWrapperTest.cs index 1fc75222..7e24533d 100644 --- a/test/WebMatrix.Data.Test/ConfigurationManagerWrapperTest.cs +++ b/test/WebMatrix.Data.Test/ConfigurationManagerWrapperTest.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; +using Microsoft.TestCommon; using Moq; using WebMatrix.Data.Test.Mocks; -using Xunit; namespace WebMatrix.Data.Test { diff --git a/test/WebMatrix.Data.Test/DatabaseTest.cs b/test/WebMatrix.Data.Test/DatabaseTest.cs index c128ec2d..c94e127d 100644 --- a/test/WebMatrix.Data.Test/DatabaseTest.cs +++ b/test/WebMatrix.Data.Test/DatabaseTest.cs @@ -3,10 +3,9 @@ using System; using System.Collections.Generic; using System.Data.Common; +using Microsoft.TestCommon; using Moq; using WebMatrix.Data.Test.Mocks; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace WebMatrix.Data.Test { diff --git a/test/WebMatrix.Data.Test/DynamicRecordTest.cs b/test/WebMatrix.Data.Test/DynamicRecordTest.cs index b47d01bd..b358136e 100644 --- a/test/WebMatrix.Data.Test/DynamicRecordTest.cs +++ b/test/WebMatrix.Data.Test/DynamicRecordTest.cs @@ -4,9 +4,8 @@ using System; using System.ComponentModel; using System.Data; using System.Linq; +using Microsoft.TestCommon; using Moq; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; namespace WebMatrix.Data.Test { diff --git a/test/WebMatrix.Data.Test/FileHandlerTest.cs b/test/WebMatrix.Data.Test/FileHandlerTest.cs index 2a470d96..a0406792 100644 --- a/test/WebMatrix.Data.Test/FileHandlerTest.cs +++ b/test/WebMatrix.Data.Test/FileHandlerTest.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using Xunit; +using Microsoft.TestCommon; namespace WebMatrix.Data.Test { diff --git a/test/WebMatrix.WebData.Test/PreApplicationStartCodeTest.cs b/test/WebMatrix.WebData.Test/PreApplicationStartCodeTest.cs index 32ad12f6..37051741 100644 --- a/test/WebMatrix.WebData.Test/PreApplicationStartCodeTest.cs +++ b/test/WebMatrix.WebData.Test/PreApplicationStartCodeTest.cs @@ -6,7 +6,7 @@ using System.Reflection; using System.Web.Security; using System.Web.WebPages.Razor; using System.Web.WebPages.TestUtils; -using Xunit; +using Microsoft.TestCommon; namespace WebMatrix.WebData.Test { diff --git a/test/WebMatrix.WebData.Test/SimpleMembershipProviderTest.cs b/test/WebMatrix.WebData.Test/SimpleMembershipProviderTest.cs index 54097cee..f94f9d15 100644 --- a/test/WebMatrix.WebData.Test/SimpleMembershipProviderTest.cs +++ b/test/WebMatrix.WebData.Test/SimpleMembershipProviderTest.cs @@ -5,9 +5,9 @@ using System.Data; using System.Linq; using System.Security.Cryptography; using System.Text; +using Microsoft.TestCommon; using Moq; using WebMatrix.Data; -using Xunit; namespace WebMatrix.WebData.Test { diff --git a/test/WebMatrix.WebData.Test/WebSecurityTest.cs b/test/WebMatrix.WebData.Test/WebSecurityTest.cs index 61245b8f..cc93315a 100644 --- a/test/WebMatrix.WebData.Test/WebSecurityTest.cs +++ b/test/WebMatrix.WebData.Test/WebSecurityTest.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; -using Xunit; -using Assert = Microsoft.TestCommon.AssertEx; +using Microsoft.TestCommon; namespace WebMatrix.WebData.Test {