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

mmitche · mmitche · commit df881ff53867 · 2015-06-23T11:21:58.000-07:00
Fixes issues with the System.Net.Http tests
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/src/System.Net.Http/tests/Fakes/HttpClientHandler.cs b/src/System.Net.Http/tests/Fakes/HttpClientHandler.cs
diff --git a/src/System.Net.Http/tests/Headers/AuthenticationHeaderValueTest.cs b/src/System.Net.Http/tests/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/src/System.Net.Http/tests/Headers/ByteArrayHeaderParserTest.cs b/src/System.Net.Http/tests/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/src/System.Net.Http/tests/Headers/CacheControlHeaderParserTest.cs b/src/System.Net.Http/tests/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/src/System.Net.Http/tests/Headers/CacheControlHeaderValueTest.cs b/src/System.Net.Http/tests/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/src/System.Net.Http/tests/Headers/ContentDispositionHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/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/src/System.Net.Http/tests/Headers/ContentRangeHeaderValueTest.cs b/src/System.Net.Http/tests/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/src/System.Net.Http/tests/Headers/DateHeaderParserTest.cs b/src/System.Net.Http/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/src/System.Net.Http/tests/Headers/EntityTagHeaderValueTest.cs b/src/System.Net.Http/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/AuthenticationParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/ContentRangeParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/EntityTagParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/HostParserTest.cs b/src/System.Net.Http/tests/Headers/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/MailAddressParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/NameValueParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/NameValueWithParametersParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/ProductParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/RangeConditionParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/RangeParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/RetryConditionParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/StringWithQualityParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/TokenListParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/ViaParserTest.cs b/src/System.Net.Http/tests/Headers/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/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/WarningParserTest.cs b/src/System.Net.Http/tests/Headers/GenericHeaderParserTest/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/src/System.Net.Http/tests/Headers/HeaderUtilitiesTest.cs b/src/System.Net.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/src/System.Net.Http/tests/Headers/HttpContentHeadersTest.cs b/src/System.Net.Http/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/src/System.Net.Http/tests/Headers/HttpHeaderValueCollectionTest.cs b/src/System.Net.Http/tests/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/src/System.Net.Http/tests/Headers/HttpHeadersTest.cs b/src/System.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/src/System.Net.Http/tests/Headers/HttpRequestHeadersTest.cs b/src/System.Net.Http/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/src/System.Net.Http/tests/Headers/HttpResponseHeadersTest.cs b/src/System.Net.Http/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/src/System.Net.Http/tests/Headers/Int32NumberHeaderParserTest.cs b/src/System.Net.Http/tests/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/src/System.Net.Http/tests/Headers/Int64NumberHeaderParserTest.cs b/src/System.Net.Http/tests/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/src/System.Net.Http/tests/Headers/MediaTypeHeaderParserTest.cs b/src/System.Net.Http/tests/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/src/System.Net.Http/tests/Headers/MediaTypeHeaderValueTest.cs b/src/System.Net.Http/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/src/System.Net.Http/tests/Headers/MediaTypeWithQualityHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/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/src/System.Net.Http/tests/Headers/NameValueHeaderValueTest.cs b/src/System.Net.Http/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/src/System.Net.Http/tests/Headers/NameValueWithParametersHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/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/src/System.Net.Http/tests/Headers/ObjectCollectionTest.cs b/src/System.Net.Http/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/src/System.Net.Http/tests/Headers/ProductHeaderValueTest.cs b/src/System.Net.Http/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/src/System.Net.Http/tests/Headers/ProductInfoHeaderParserTest.cs b/src/System.Net.Http/tests/Headers/ProductInfoHeaderParserTest.cs
@@ -9,7 +9,7 @@
 
 using Xunit;
 
-namespace System.Net.Http.Unit.Tests
+namespace System.Net.Http.Tests
 {
     public class ProductInfoHeaderParserTest
     {
diff --git a/src/System.Net.Http/tests/Headers/ProductInfoHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/ProductInfoHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/Headers/RangeConditionHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/RangeConditionHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/Headers/RangeHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/RangeHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/Headers/RangeItemHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/RangeItemHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/Headers/RetryConditionHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/RetryConditionHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/Headers/StringWithQualityHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/StringWithQualityHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/Headers/TimeSpanHeaderParserTest.cs b/src/System.Net.Http/tests/Headers/TimeSpanHeaderParserTest.cs
diff --git a/src/System.Net.Http/tests/Headers/TransferCodingHeaderParserTest.cs b/src/System.Net.Http/tests/Headers/TransferCodingHeaderParserTest.cs
diff --git a/src/System.Net.Http/tests/Headers/TransferCodingHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/TransferCodingHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/Headers/TransferCodingWithQualityHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/TransferCodingWithQualityHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/Headers/UriHeaderParserTest.cs b/src/System.Net.Http/tests/Headers/UriHeaderParserTest.cs
diff --git a/src/System.Net.Http/tests/Headers/ViaHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/ViaHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/Headers/WarningHeaderValueTest.cs b/src/System.Net.Http/tests/Headers/WarningHeaderValueTest.cs
diff --git a/src/System.Net.Http/tests/HttpContentTest.cs b/src/System.Net.Http/tests/HttpContentTest.cs
diff --git a/src/System.Net.Http/tests/HttpRuleParserTest.cs b/src/System.Net.Http/tests/HttpRuleParserTest.cs
diff --git a/src/System.Net.Http/tests/MockContent.cs b/src/System.Net.Http/tests/MockContent.cs
diff --git a/src/System.Net.Http/tests/System.Net.Http.Tests.csproj b/src/System.Net.Http/tests/System.Net.Http.Tests.csproj
diff --git a/src/System.Net.Http/tests/project.json b/src/System.Net.Http/tests/project.json
diff --git a/src/System.Net.Http/tests/project.lock.json b/src/System.Net.Http/tests/project.lock.json

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`using Xunit;`
`7`	`7`
`8`		`-namespace System.Net.Http.Unit.Tests`
	`8`	`+namespace System.Net.Http.Tests`
`9`	`9`	`{`
`10`	`10`	`public class AuthenticationHeaderValueTest`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`using Xunit;`
`10`	`10`
`11`		`-namespace System.Net.Http.Unit.Tests`
	`11`	`+namespace System.Net.Http.Tests`
`12`	`12`	`{`
`13`	`13`	`public class ByteArrayHeaderParserTest`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`using Xunit;`
`11`	`11`
`12`		`-namespace System.Net.Http.Unit.Tests`
	`12`	`+namespace System.Net.Http.Tests`
`13`	`13`	`{`
`14`	`14`	`public class CacheControlHeaderValueTest`
`15`	`15`	`{`