Merge pull request #1975 from mmitche/fix-net-http-tests

Fixes issues with the System.Net.Http tests
dotnet · Jun 23, 2015 · df881ff · df881ff
2 parents 61c837a + 36b6d6b
commit df881ff
Show file tree

Hide file tree

Showing 60 changed files with 1,556 additions and 143 deletions.
diff --git a/src/System.Net.Http/System.Net.Http.sln b/src/System.Net.Http/System.Net.Http.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22816.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.UnitTests", "tests\UnitTests\System.Net.Http.Unit.Tests.csproj", "{5F9C3C9F-652E-461E-B2D6-85D264F5A733}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Tests", "tests\System.Net.Http.Tests.csproj", "{5F9C3C9F-652E-461E-B2D6-85D264F5A733}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...ests/UnitTests/Fakes/HttpClientHandler.cs → ...Net.Http/tests/Fakes/HttpClientHandler.cs b/...ests/UnitTests/Fakes/HttpClientHandler.cs → ...Net.Http/tests/Fakes/HttpClientHandler.cs
diff --git a/.../Headers/AuthenticationHeaderValueTest.cs → .../Headers/AuthenticationHeaderValueTest.cs b/.../Headers/AuthenticationHeaderValueTest.cs → .../Headers/AuthenticationHeaderValueTest.cs
@@ -5,7 +5,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class AuthenticationHeaderValueTest
     {

diff --git a/...ests/Headers/ByteArrayHeaderParserTest.cs → ...ests/Headers/ByteArrayHeaderParserTest.cs b/...ests/Headers/ByteArrayHeaderParserTest.cs → ...ests/Headers/ByteArrayHeaderParserTest.cs
@@ -8,7 +8,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ByteArrayHeaderParserTest
     {

diff --git a/...s/Headers/CacheControlHeaderParserTest.cs → ...s/Headers/CacheControlHeaderParserTest.cs b/...s/Headers/CacheControlHeaderParserTest.cs → ...s/Headers/CacheControlHeaderParserTest.cs
@@ -5,7 +5,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class CacheControlHeaderParserTest
     {

diff --git a/...ts/Headers/CacheControlHeaderValueTest.cs → ...ts/Headers/CacheControlHeaderValueTest.cs b/...ts/Headers/CacheControlHeaderValueTest.cs → ...ts/Headers/CacheControlHeaderValueTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class CacheControlHeaderValueTest
     {

diff --git a/...ders/ContentDispositionHeaderValueTest.cs → ...ders/ContentDispositionHeaderValueTest.cs b/...ders/ContentDispositionHeaderValueTest.cs → ...ders/ContentDispositionHeaderValueTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ContentDispositionHeaderValueTest
     {
@@ -203,6 +203,7 @@ public void FileNameStar_NeedsEncoding_EncodedAndDecodedCorrectly()
             Assert.Null(contentDisposition.FileNameStar);
         }
 
+        [ActiveIssue(846, PlatformID.AnyUnix)]
         [Fact]
         public void FileNameStar_UnknownOrBadEncoding_PropertyFails()
         {

diff --git a/...ts/Headers/ContentRangeHeaderValueTest.cs → ...ts/Headers/ContentRangeHeaderValueTest.cs b/...ts/Headers/ContentRangeHeaderValueTest.cs → ...ts/Headers/ContentRangeHeaderValueTest.cs
@@ -5,7 +5,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ContentRangeHeaderValueTest
     {

diff --git a/...UnitTests/Headers/DateHeaderParserTest.cs → ...ttp/tests/Headers/DateHeaderParserTest.cs b/...UnitTests/Headers/DateHeaderParserTest.cs → ...ttp/tests/Headers/DateHeaderParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class DateHeaderParserTest
     {

diff --git a/...Tests/Headers/EntityTagHeaderValueTest.cs → ...tests/Headers/EntityTagHeaderValueTest.cs b/...Tests/Headers/EntityTagHeaderValueTest.cs → ...tests/Headers/EntityTagHeaderValueTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class EntityTagHeaderValueTest
     {

diff --git a/...derParserTest/AuthenticationParserTest.cs → ...derParserTest/AuthenticationParserTest.cs b/...derParserTest/AuthenticationParserTest.cs → ...derParserTest/AuthenticationParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class AuthenticationParserTest
     {

diff --git a/...eaderParserTest/ContentRangeParserTest.cs → ...eaderParserTest/ContentRangeParserTest.cs b/...eaderParserTest/ContentRangeParserTest.cs → ...eaderParserTest/ContentRangeParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ContentRangeParserTest
     {

diff --git a/...icHeaderParserTest/EntityTagParserTest.cs → ...icHeaderParserTest/EntityTagParserTest.cs b/...icHeaderParserTest/EntityTagParserTest.cs → ...icHeaderParserTest/EntityTagParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class EntityTagParserTest
     {

diff --git a/...GenericHeaderParserTest/HostParserTest.cs → ...GenericHeaderParserTest/HostParserTest.cs b/...GenericHeaderParserTest/HostParserTest.cs → ...GenericHeaderParserTest/HostParserTest.cs
@@ -5,7 +5,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class HostParserTest
     {
@@ -17,6 +17,7 @@ public void Properties_ReadValues_MatchExpectation()
             Assert.Equal(StringComparer.OrdinalIgnoreCase, parser.Comparer);
         }
 
+        [ActiveIssue(846, PlatformID.AnyUnix)]
         [Fact]
         public void TryParse_SetOfValidValueStrings_ParsedCorrectly()
         {

diff --git a/...HeaderParserTest/MailAddressParserTest.cs → ...HeaderParserTest/MailAddressParserTest.cs b/...HeaderParserTest/MailAddressParserTest.cs → ...HeaderParserTest/MailAddressParserTest.cs
@@ -10,7 +10,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class MailAddressParserTest
     {

diff --git a/...icHeaderParserTest/NameValueParserTest.cs → ...icHeaderParserTest/NameValueParserTest.cs b/...icHeaderParserTest/NameValueParserTest.cs → ...icHeaderParserTest/NameValueParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class NameValueParserTest
     {

diff --git a/...Test/NameValueWithParametersParserTest.cs → ...Test/NameValueWithParametersParserTest.cs b/...Test/NameValueWithParametersParserTest.cs → ...Test/NameValueWithParametersParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class NameValueWithParametersParserTest
     {

diff --git a/...ericHeaderParserTest/ProductParserTest.cs → ...ericHeaderParserTest/ProductParserTest.cs b/...ericHeaderParserTest/ProductParserTest.cs → ...ericHeaderParserTest/ProductParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ProductParserTest
     {

diff --git a/...derParserTest/RangeConditionParserTest.cs → ...derParserTest/RangeConditionParserTest.cs b/...derParserTest/RangeConditionParserTest.cs → ...derParserTest/RangeConditionParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class RangeConditionParserTest
     {

diff --git a/...enericHeaderParserTest/RangeParserTest.cs → ...enericHeaderParserTest/RangeParserTest.cs b/...enericHeaderParserTest/RangeParserTest.cs → ...enericHeaderParserTest/RangeParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class RangeParserTest
     {

diff --git a/...derParserTest/RetryConditionParserTest.cs → ...derParserTest/RetryConditionParserTest.cs b/...derParserTest/RetryConditionParserTest.cs → ...derParserTest/RetryConditionParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class RetryConditionParserTest
     {

diff --git a/...ParserTest/StringWithQualityParserTest.cs → ...ParserTest/StringWithQualityParserTest.cs b/...ParserTest/StringWithQualityParserTest.cs → ...ParserTest/StringWithQualityParserTest.cs
@@ -5,7 +5,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class StringWithQualityParserTest
     {

diff --git a/...icHeaderParserTest/TokenListParserTest.cs → ...icHeaderParserTest/TokenListParserTest.cs b/...icHeaderParserTest/TokenListParserTest.cs → ...icHeaderParserTest/TokenListParserTest.cs
@@ -5,7 +5,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class TokenListParserTest
     {

diff --git a/.../GenericHeaderParserTest/ViaParserTest.cs → .../GenericHeaderParserTest/ViaParserTest.cs b/.../GenericHeaderParserTest/ViaParserTest.cs → .../GenericHeaderParserTest/ViaParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ViaParserTest
     {

diff --git a/...ericHeaderParserTest/WarningParserTest.cs → ...ericHeaderParserTest/WarningParserTest.cs b/...ericHeaderParserTest/WarningParserTest.cs → ...ericHeaderParserTest/WarningParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class WarningParserTest
     {
@@ -25,6 +25,7 @@ public void Properties_ReadValues_MatchExpectation()
             Assert.Null(parser.Comparer);
         }
 
+        [ActiveIssue(846, PlatformID.AnyUnix)]
         [Fact]
         public void TryParse_SetOfValidValueStrings_ParsedCorrectly()
         {
@@ -46,6 +47,7 @@ public void TryParse_SetOfValidValueStrings_ParsedCorrectly()
             CheckValidParsedValue("  ,,", 0, null, 4);
         }
 
+        [ActiveIssue(846, PlatformID.AnyUnix)]
         [Fact]
         public void TryParse_SetOfInvalidValueStrings_ReturnsFalse()
         {

diff --git a/.../UnitTests/Headers/HeaderUtilitiesTest.cs → ...Http/tests/Headers/HeaderUtilitiesTest.cs b/.../UnitTests/Headers/HeaderUtilitiesTest.cs → ...Http/tests/Headers/HeaderUtilitiesTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class HeaderUtilitiesTest
     {

diff --git a/...itTests/Headers/HttpContentHeadersTest.cs → ...p/tests/Headers/HttpContentHeadersTest.cs b/...itTests/Headers/HttpContentHeadersTest.cs → ...p/tests/Headers/HttpContentHeadersTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class HttpContentHeadersTest
     {

diff --git a/.../Headers/HttpHeaderValueCollectionTest.cs → .../Headers/HttpHeaderValueCollectionTest.cs b/.../Headers/HttpHeaderValueCollectionTest.cs → .../Headers/HttpHeaderValueCollectionTest.cs
@@ -10,7 +10,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class HttpHeaderValueCollectionTest
     {

diff --git a/...ests/UnitTests/Headers/HttpHeadersTest.cs → ...Net.Http/tests/Headers/HttpHeadersTest.cs b/...ests/UnitTests/Headers/HttpHeadersTest.cs → ...Net.Http/tests/Headers/HttpHeadersTest.cs
@@ -10,7 +10,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class HttpHeadersTest
     {

diff --git a/...itTests/Headers/HttpRequestHeadersTest.cs → ...p/tests/Headers/HttpRequestHeadersTest.cs b/...itTests/Headers/HttpRequestHeadersTest.cs → ...p/tests/Headers/HttpRequestHeadersTest.cs
@@ -10,7 +10,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class HttpRequestHeadersTest
     {

diff --git a/...tTests/Headers/HttpResponseHeadersTest.cs → .../tests/Headers/HttpResponseHeadersTest.cs b/...tTests/Headers/HttpResponseHeadersTest.cs → .../tests/Headers/HttpResponseHeadersTest.cs
@@ -7,7 +7,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class HttpResponseHeadersTest
     {
@@ -61,6 +61,7 @@ public void Location_UseAddMethodWithInvalidValue_InvalidValueRecognized()
             Assert.Equal(" http://example.com http://other", headers.GetValues("Location").First());
         }
 
+        [ActiveIssue(846, PlatformID.AnyUnix)]
         [Fact]
         public void Location_RequiresEncoding_Encoded()
         {

diff --git a/...ts/Headers/Int32NumberHeaderParserTest.cs → ...ts/Headers/Int32NumberHeaderParserTest.cs b/...ts/Headers/Int32NumberHeaderParserTest.cs → ...ts/Headers/Int32NumberHeaderParserTest.cs
@@ -10,7 +10,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class Int32NumberHeaderParserTest
     {

diff --git a/...ts/Headers/Int64NumberHeaderParserTest.cs → ...ts/Headers/Int64NumberHeaderParserTest.cs b/...ts/Headers/Int64NumberHeaderParserTest.cs → ...ts/Headers/Int64NumberHeaderParserTest.cs
@@ -9,7 +9,7 @@
 using System.Text;
 
 using Xunit;
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class Int64NumberHeaderParserTest
     {

diff --git a/...ests/Headers/MediaTypeHeaderParserTest.cs → ...ests/Headers/MediaTypeHeaderParserTest.cs b/...ests/Headers/MediaTypeHeaderParserTest.cs → ...ests/Headers/MediaTypeHeaderParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class MediaTypeHeaderParserTest
     {

diff --git a/...Tests/Headers/MediaTypeHeaderValueTest.cs → ...tests/Headers/MediaTypeHeaderValueTest.cs b/...Tests/Headers/MediaTypeHeaderValueTest.cs → ...tests/Headers/MediaTypeHeaderValueTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class MediaTypeHeaderValueTest
     {

diff --git a/...rs/MediaTypeWithQualityHeaderValueTest.cs → ...rs/MediaTypeWithQualityHeaderValueTest.cs b/...rs/MediaTypeWithQualityHeaderValueTest.cs → ...rs/MediaTypeWithQualityHeaderValueTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class MediaTypeWithQualityHeaderValueTest
     {

diff --git a/...Tests/Headers/NameValueHeaderValueTest.cs → ...tests/Headers/NameValueHeaderValueTest.cs b/...Tests/Headers/NameValueHeaderValueTest.cs → ...tests/Headers/NameValueHeaderValueTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class NameValueHeaderValueTest
     {

diff --git a/...NameValueWithParametersHeaderValueTest.cs → ...NameValueWithParametersHeaderValueTest.cs b/...NameValueWithParametersHeaderValueTest.cs → ...NameValueWithParametersHeaderValueTest.cs
@@ -7,7 +7,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class NameValueWithParametersHeaderValueTest
     {

diff --git a/...UnitTests/Headers/ObjectCollectionTest.cs → ...ttp/tests/Headers/ObjectCollectionTest.cs b/...UnitTests/Headers/ObjectCollectionTest.cs → ...ttp/tests/Headers/ObjectCollectionTest.cs
@@ -6,7 +6,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ObjectCollectionTest
     {

diff --git a/...itTests/Headers/ProductHeaderValueTest.cs → ...p/tests/Headers/ProductHeaderValueTest.cs b/...itTests/Headers/ProductHeaderValueTest.cs → ...p/tests/Headers/ProductHeaderValueTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ProductHeaderValueTest
     {

diff --git a/...ts/Headers/ProductInfoHeaderParserTest.cs → ...ts/Headers/ProductInfoHeaderParserTest.cs b/...ts/Headers/ProductInfoHeaderParserTest.cs → ...ts/Headers/ProductInfoHeaderParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ProductInfoHeaderParserTest
     {