huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove use of `IsMono` to no-op a test 

- use `[ConditionalFact]` or `[ConditionalTheory]` instead
  - in some cases test was already conditional
- move other `IsMono` checks into data sets where possible
  - not reported as skipped but at least not counted as successful

nit: switch from `[ConditionalTheory]` to `[ConditionalFact]` as appropriate
- slightly more efficient since xUnit won't check for data
This commit is contained in:
Doug Bunting 2015-09-09 09:07:04 -07:00
parent 902e42817d
commit 271e19e61a
25 changed files with 139 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/SimpleTypeModelBinderTest.cs
View File

@ -33,24 +33,35 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
Assert.Equal(ModelBindingResult.NoResult, result);
}
public static TheoryData<Type> ConvertableTypeData
{
get
{
var data = new TheoryData<Type>
{
typeof(byte),
typeof(short),
typeof(int),
typeof(long),
typeof(Guid),
typeof(double),
typeof(DayOfWeek),
};
// DateTimeOffset doesn't have a TypeConverter in Mono.
if (!TestPlatformHelper.IsMono)
{
data.Add(typeof(DateTimeOffset));
}
return data;
}
}
[Theory]
[InlineData(typeof(byte))]
[InlineData(typeof(short))]
[InlineData(typeof(int))]
[InlineData(typeof(long))]
[InlineData(typeof(Guid))]
[InlineData(typeof(DateTimeOffset))]
[InlineData(typeof(double))]
[InlineData(typeof(DayOfWeek))]
[MemberData(nameof(ConvertableTypeData))]
public async Task BindModel_ReturnsFailure_IfTypeCanBeConverted_AndConversionFails(Type destinationType)
{
if (TestPlatformHelper.IsMono &&
destinationType == typeof(DateTimeOffset))
{
// DateTimeOffset doesn't have a TypeConverter in Mono
return;
}
// Arrange
var bindingContext = GetBindingContext(destinationType);
bindingContext.ValueProvider = new SimpleValueProvider

11
test/Microsoft.AspNet.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs
View File

@ -3,6 +3,7 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNet.Testing;
using Microsoft.AspNet.Testing.xunit;
using Microsoft.Framework.DependencyInjection;
using Xunit;
@ -85,15 +86,11 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
Assert.Equal("Hello 'MyProperty', goodbye 'OtherProperty'.", rule.ErrorMessage);
}
[Fact]
[ConditionalFact]
// ValidationAttribute in Mono does not read non-public resx properties.
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public void ClientRulesWithCompareAttribute_ErrorMessageUsesResourceOverride()
{
if (TestPlatformHelper.IsMono)
{
// ValidationAttribute in Mono does not read non-public resx properties.
return;
}
// Arrange
var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyNameModel), "MyProperty");

38
test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlAssertTest.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Testing;
using Microsoft.AspNet.Testing.xunit;
using Xunit;
@ -36,21 +35,32 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(input1, input2);
}
public static TheoryData<string, string> EmptyElementData
{
get
{
var data = new TheoryData<string, string>
{
{ "<A></A>", "<A></A>" },
{ "<A><!-- comment1 --><B></B></A>", "<A><!-- comment1 --><B></B></A>" },
{ "<A/>", "<A/>" },
};
// DeepEquals returns false even though the generated XML documents are equal.
// This is fixed in Mono 4.3.0
if (!TestPlatformHelper.IsMono)
{
data.Add("<A><![CDATA[<greeting></greeting>]]></A>", "<A><![CDATA[<greeting></greeting>]]></A>");
}
return data;
}
}
[Theory]
[InlineData("<A></A>", "<A></A>")]
[InlineData("<A><!-- comment1 --><B></B></A>", "<A><!-- comment1 --><B></B></A>")]
[InlineData("<A/>", "<A/>")]
[InlineData("<A><![CDATA[<greeting></greeting>]]></A>", "<A><![CDATA[<greeting></greeting>]]></A>")]
[MemberData(nameof(EmptyElementData))]
public void ReturnsSuccessfully_WithEmptyElements(string input1, string input2)
{
// DeepEquals returns false even though the generated XML documents are equal.
// This is fixed in Mono 4.3.0
if (TestPlatformHelper.IsMono
&& input1 == "<A><![CDATA[<greeting></greeting>]]></A>")
{
return;
}
XmlAssert.Equal(input1, input2);
}
@ -64,7 +74,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Throws<EqualException>(() => XmlAssert.Equal(input1, input2));
}
[ConditionalTheory]
[ConditionalFact]
// DeepEquals returns false even though the generated XML documents are equal.
// This is fixed in Mono 4.3.0
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]

44
test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs
View File

@ -2,8 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.IO;
using System.Linq;
using System.Runtime.Serialization;
@ -84,7 +82,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedCanRead, result);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public void XmlDataContractSerializer_CachesSerializerForType()
@ -130,7 +128,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.True(formatter.SupportedEncodings.Any(i => i.WebName == "utf-16"));
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ReadsSimpleTypes()
@ -159,7 +157,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedString, levelOneModel.sampleString);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ReadsComplexTypes()
@ -191,7 +189,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedString, levelTwoModel.TestOne.sampleString);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ReadsWhenMaxDepthIsModified()
@ -217,17 +215,11 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedInt, dummyModel.SampleInt);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ThrowsOnExceededMaxDepth()
{
if (TestPlatformHelper.IsMono)
{
// ReaderQuotas are not honored on Mono
return;
}
// Arrange
var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<TestLevelTwo><SampleString>test</SampleString>" +
@ -242,17 +234,11 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
await Assert.ThrowsAsync(typeof(SerializationException), async () => await formatter.ReadAsync(context));
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ThrowsWhenReaderQuotasAreChanged()
{
if (TestPlatformHelper.IsMono)
{
// ReaderQuotas are not honored on Mono
return;
}
// Arrange
var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<TestLevelTwo><SampleString>test</SampleString>" +
@ -277,7 +263,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Throws(typeof(ArgumentException), () => formatter.MaxDepth = 0);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_VerifyStreamIsOpenAfterRead()
@ -297,7 +283,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.True(context.HttpContext.Request.Body.CanRead);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_FallsbackToUTF8_WhenCharSet_NotInContentType()
@ -326,7 +312,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedMessage, ex.Message);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_UsesContentTypeCharSet_ToReadStream()
@ -352,7 +338,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedMessage, ex.Message);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_IgnoresBOMCharacters()
@ -385,7 +371,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedBytes, Encoding.UTF8.GetBytes(levelTwoModel.SampleString));
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_AcceptsUTF16Characters()
@ -418,7 +404,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedString, levelOneModel.sampleString);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ThrowsWhenNotConfiguredWithRootName()
@ -439,7 +425,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
await Assert.ThrowsAsync(typeof(SerializationException), async () => await formatter.ReadAsync(context));
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ReadsWhenConfiguredWithRootName()
@ -477,7 +463,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedInt, dummyModel.SampleInt);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ThrowsWhenNotConfiguredWithKnownTypes()
@ -499,7 +485,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
await Assert.ThrowsAsync(typeof(SerializationException), async () => await formatter.ReadAsync(context));
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ReadsWhenConfiguredWithKnownTypes()

61
test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
View File

@ -11,7 +11,6 @@ using System.Xml;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Internal;
using Microsoft.AspNet.Mvc.Formatters.Xml.Internal;
using Microsoft.AspNet.Testing;
using Microsoft.AspNet.Testing.xunit;
using Microsoft.Net.Http.Headers;
using Moq;
@ -93,17 +92,12 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
}
}
[Theory]
[ConditionalTheory]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[MemberData(nameof(BasicTypeValues))]
public async Task WriteAsync_CanWriteBasicTypes(object input, string expectedOutput)
{
// ConditionalThoery seems to throw when used with Member data. Hence using if case here.
if (TestPlatformHelper.IsMono)
{
// Mono issue - https://github.com/aspnet/External/issues/18
return;
}
// Arrange
var formatter = new XmlDataContractSerializerOutputFormatter();
var outputFormatterContext = GetOutputFormatterContext(input, typeof(object));
@ -119,7 +113,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(expectedOutput, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public void XmlDataContractSerializer_CachesSerializerForType()
@ -137,7 +131,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(1, formatter.createSerializerCalledCount);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public void DefaultConstructor_ExpectedWriterSettings_Created()
@ -153,7 +147,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.False(writerSettings.CheckCharacters);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task SuppliedWriterSettings_TakeAffect()
@ -181,7 +175,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(expectedOutput, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_WritesSimpleTypes()
@ -206,13 +200,13 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(expectedOutput, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_WritesComplexTypes()
{
// Arrange
var expectedOutput =
var expectedOutput =
"<TestLevelTwo xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
"<SampleString>TestString</SampleString>" +
"<TestOne><SampleInt>10</SampleInt><sampleString>TestLevelOne string</sampleString>" +
@ -241,7 +235,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(expectedOutput, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_WritesOnModifiedWriterSettings()
@ -272,7 +266,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(expectedOutput, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_WritesUTF16Output()
@ -302,7 +296,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(expectedOutput, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_WritesIndentedOutput()
@ -328,7 +322,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(expectedOutput, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_VerifyBodyIsNotClosedAfterOutputIsWritten()
@ -346,7 +340,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.True(body.CanRead);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_DoesntFlushOutputStream()
@ -379,17 +373,12 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
}
}
[Theory]
[ConditionalTheory]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[MemberData(nameof(TypesForCanWriteResult))]
public void CanWriteResult_ReturnsExpectedOutput(object input, Type declaredType, bool expectedOutput)
{
// ConditionalThoery seems to throw when used with Member data. Hence using if case here.
if (TestPlatformHelper.IsMono)
{
// Mono issue - https://github.com/aspnet/External/issues/18
return;
}
// Arrange
var formatter = new XmlDataContractSerializerOutputFormatter();
var outputFormatterContext = GetOutputFormatterContext(input, declaredType);
@ -418,8 +407,10 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[MemberData(nameof(TypesForGetSupportedContentTypes))]
public void GetSupportedContentTypes_ReturnsSupportedTypes(Type declaredType,
Type runtimeType, object expectedOutput)
public void GetSupportedContentTypes_ReturnsSupportedTypes(
Type declaredType,
Type runtimeType,
object expectedOutput)
{
// Arrange
var formatter = new XmlDataContractSerializerOutputFormatter();
@ -439,7 +430,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
}
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_ThrowsWhenNotConfiguredWithKnownTypes()
@ -454,7 +445,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
async () => await formatter.WriteAsync(outputFormatterContext));
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_ThrowsWhenNotConfiguredWithPreserveReferences()
@ -472,7 +463,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
async () => await formatter.WriteAsync(outputFormatterContext));
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_WritesWhenConfiguredWithRootName()
@ -515,7 +506,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(expectedOutput, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_WritesWhenConfiguredWithKnownTypes()
@ -561,7 +552,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
XmlAssert.Equal(expectedOutput, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task WriteAsync_WritesWhenConfiguredWithPreserveReferences()

22
test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
View File

@ -12,8 +12,8 @@ using System.Xml;
using System.Xml.Serialization;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc.ModelBinding;
using Microsoft.AspNet.Mvc.Formatters.Xml;
using Microsoft.AspNet.Testing;
using Microsoft.AspNet.Testing.xunit;
using Moq;
using Xunit;
@ -219,15 +219,11 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
Assert.Equal(expectedInt, dummyModel.SampleInt);
}
[Fact]
[ConditionalFact]
// ReaderQuotas are not honored on Mono
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ThrowsOnExceededMaxDepth()
{
if (TestPlatformHelper.IsMono)
{
// ReaderQuotas are not honored on Mono
return;
}
// Arrange
var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<TestLevelTwo><SampleString>test</SampleString>" +
@ -244,15 +240,11 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml
await Assert.ThrowsAsync(typeof(InvalidOperationException), () => formatter.ReadAsync(context));
}
[Fact]
[ConditionalFact]
// ReaderQuotas are not honored on Mono
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ReadAsync_ThrowsWhenReaderQuotasAreChanged()
{
if (TestPlatformHelper.IsMono)
{
// ReaderQuotas are not honored on Mono
return;
}
// Arrange
var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<TestLevelTwo><SampleString>test</SampleString>" +

4
test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs
View File

@ -6,12 +6,12 @@ using System.Collections.Generic;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Mvc.Formatters;
using Microsoft.AspNet.Mvc.ModelBinding;
using Microsoft.AspNet.Testing.xunit;
using Microsoft.Framework.DependencyInjection;
using Newtonsoft.Json;
using Xunit;
using Microsoft.AspNet.Mvc.Formatters;
namespace Microsoft.AspNet.Mvc.FunctionalTests
{
@ -569,7 +569,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal(type, description.ResponseType);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ApiExplorer_ResponseContentType_Unset()

2
test/Microsoft.AspNet.Mvc.FunctionalTests/ConsumesAttributeTests.cs
View File

@ -136,7 +136,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal(expectedString, product.SampleString);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task DerivedClassLevelAttribute_OveridesBaseClassLevel()

4
test/Microsoft.AspNet.Mvc.FunctionalTests/ContentNegotiationTest.cs
View File

@ -114,7 +114,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal(expectedOutput, actual);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ProducesAttribute_WithTypeAndContentType_UsesContentType()
@ -323,7 +323,7 @@ END:VCARD
Assert.Equal(expectedBody, body);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task XmlFormatter_SupportedMediaType_DoesNotChangeAcrossRequests()

4
test/Microsoft.AspNet.Mvc.FunctionalTests/FileResultTests.cs
View File

@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
private readonly Action<IApplicationBuilder> _app = new FilesWebSite.Startup().Configure;
private readonly Action<IServiceCollection> _configureServices = new FilesWebSite.Startup().ConfigureServices;
[ConditionalTheory]
[ConditionalFact]
// https://github.com/aspnet/Mvc/issues/2727
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task FileFromDisk_CanBeEnabled_WithMiddleware()
@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal("This is a sample text file", body);
}
[ConditionalTheory]
[ConditionalFact]
// https://github.com/aspnet/Mvc/issues/2727
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task FileFromDisk_ReturnsFileWithFileName()

2
test/Microsoft.AspNet.Mvc.FunctionalTests/InputFormatterTests.cs
View File

@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
private readonly Action<IServiceCollection> _configureServices = new FormatterWebSite.Startup().ConfigureServices;
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task CheckIfXmlInputFormatterIsBeingCalled()

2
test/Microsoft.AspNet.Mvc.FunctionalTests/InputObjectValidationTests.cs
View File

@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
}
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task CheckIfObjectIsDeserializedWithoutErrors()

2
test/Microsoft.AspNet.Mvc.FunctionalTests/JsonOutputFormatterTests.cs
View File

@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal(expectedBody, actualBody);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task SerializableErrorIsReturnedInExpectedFormat()

3
test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTest.cs
View File

@ -9,7 +9,6 @@ using System.Net;
using System.Net.Http;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Testing;
@ -1262,7 +1261,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
}
#if DNX451
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task UpdateVehicle_WithXml_BindsBodyServicesAndHeaders()

2
test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs
View File

@ -112,7 +112,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
}
[ConditionalTheory]
[ConditionalFact]
// Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. This is fixed in mono 4.3.0.
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task Home_CreateUser_ReturnsXmlBasedOnAcceptHeader()

8
test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs
View File

@ -10,8 +10,8 @@ using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Mvc.Razor.Precompilation;
using Microsoft.AspNet.Testing.xunit;
using Microsoft.Framework.DependencyInjection;
using Microsoft.Dnx.Runtime;
using Microsoft.Framework.DependencyInjection;
using PrecompilationWebSite;
using Xunit;
@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
private readonly Action<IServiceCollection> _configureServices = new Startup().ConfigureServices;
[ConditionalTheory]
[ConditionalFact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task PrecompiledView_RendersCorrectly()
{
@ -101,7 +101,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.StartsWith(expected, responseContent.Trim());
}
[ConditionalTheory]
[ConditionalFact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task TagHelpersFromTheApplication_CanBeAdded()
{
@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal(expected, responseLines[1]);
}
[ConditionalTheory]
[ConditionalFact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task TagHelpersFromTheApplication_CanBeRemoved()
{

4
test/Microsoft.AspNet.Mvc.FunctionalTests/TempDataTest.cs
View File

@ -75,7 +75,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal("Foo", body);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/21
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task Redirect_RetainsTempData_EvenIfAccessed()
@ -145,7 +145,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal("Foo", body);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/21
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task TempData_ValidTypes_RoundTripProperly()

10
test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs
View File

@ -209,7 +209,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal("The field ID must be between 0 and 100.", json["ID"]);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/24
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ApiController_RequestProperty()
@ -233,7 +233,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal(expected, content);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/24
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ApiController_RequestParameter()
@ -286,14 +286,14 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
[Fact]
public async Task ApiController_ExplicitChunkedEncoding_IsIgnored()
{
// Arrange
// Arrange
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
var expected =
"POST Hello, HttpResponseMessage world!";
// Act
// Act
var request = new HttpRequestMessage();
request.Method = HttpMethod.Post;
request.RequestUri = new Uri("http://localhost/api/Blog/HttpRequestMessage/EchoWithResponseMessageChunked");
@ -304,7 +304,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
// the client. So here we explicitly mention to only read the headers and not the body.
var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
// Assert
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.NotNull(response.Content);
if (!TestPlatformHelper.IsMono)

2
test/Microsoft.AspNet.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
View File

@ -192,7 +192,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
result);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task CanWrite_IEnumerableOf_SerializableErrors()

6
test/Microsoft.AspNet.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs
View File

@ -33,7 +33,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
nameof(DataMemberAttribute.IsRequired),
bool.TrueString);
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ThrowsOnInvalidInput_AndAddsToModelState()
@ -57,7 +57,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
data);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task RequiredDataIsProvided_AndModelIsBound_NoValidationErrors()
@ -88,7 +88,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
}
// Verifies that the model state has errors related to body model validation.
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task DataMissingForRefereneceTypeProperties_AndModelIsBound_AndHasMixedValidationErrors()

6
test/Microsoft.AspNet.Mvc.FunctionalTests/XmlOutputFormatterTests.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
private readonly Action<IServiceCollection> _configureServices = new Startup().ConfigureServices;
[ConditionalTheory]
[ConditionalFact]
// Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. This is fixed in mono 4.3.0.
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task XmlDataContractSerializerOutputFormatterIsCalled()
@ -68,7 +68,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
await response.Content.ReadAsStringAsync());
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/18
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task XmlSerializerFailsAndDataContractSerializerIsCalled()
@ -116,7 +116,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
await response.Content.ReadAsStringAsync());
}
[ConditionalTheory]
[ConditionalFact]
// Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. This is fixed in mono 4.3.0.
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task XmlDataContractSerializerOutputFormatter_WhenDerivedClassIsReturned()

2
test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
View File

@ -39,7 +39,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal(sampleInputInt.ToString(), await response.Content.ReadAsStringAsync());
}
[ConditionalTheory]
[ConditionalFact]
// Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. This is fixed in mono 4.3.0.
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ThrowsOnInvalidInput_AndAddsToModelState()

2
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpErrorTest.cs
View File

@ -133,7 +133,7 @@ namespace System.Web.Http.Dispatcher
Assert.Contains("c", data);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/25
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public void HttpError_Roundtrips_WithXmlFormatter()

2
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageFeatureTest.cs
View File

@ -52,7 +52,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim
Assert.Equal(new HttpMethod("OPTIONS"), request.Method);
}
[ConditionalTheory]
[ConditionalFact]
// Mono issue - https://github.com/aspnet/External/issues/24
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public void HttpRequestMessage_CopiesHeader()

8
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs
View File

@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShimTest
streamContent.Protected().Verify("Dispose", Times.Once(), true);
}
[ConditionalTheory]
[ConditionalFact]
// Issue - https://github.com/aspnet/External/issues/20
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ExplicitlySet_ChunkedEncodingFlag_IsIgnored()
@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShimTest
Assert.NotNull(httpContext.Response.ContentLength);
}
[ConditionalTheory]
[ConditionalFact]
// Issue - https://github.com/aspnet/External/issues/20
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ExplicitlySet_ChunkedEncodingHeader_IsIgnored()
@ -91,7 +91,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShimTest
Assert.NotNull(httpContext.Response.ContentLength);
}
[ConditionalTheory]
[ConditionalFact]
// Issue - https://github.com/aspnet/External/issues/20
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ExplicitlySet_MultipleEncodings_ChunkedNotIgnored()
@ -118,7 +118,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShimTest
Assert.NotNull(httpContext.Response.ContentLength);
}
[ConditionalTheory]
[ConditionalFact]
// Issue - https://github.com/aspnet/External/issues/20
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
public async Task ExplicitlySet_MultipleEncodingsUsingChunkedFlag_ChunkedNotIgnored()