Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit c4df4a0

Browse files
TratcherTratcher
committed
#303 Enable tests for CoreCLR.
1 parent eb0fe6a commit c4df4a0

File tree

11 files changed

+82
-99
lines changed

11 files changed

+82
-99
lines changed

‎test/Microsoft.AspNet.FeatureModel.Tests/project.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
"test": "xunit.runner.aspnet"
88
},
99
"frameworks": {
10-
"dnx451": {
11-
"dependencies": {
12-
"Shouldly": "1.1.1.1"
13-
}
14-
}
10+
"dnx451": { },
11+
"dnxcore50": { }
1512
}
1613
}

‎test/Microsoft.AspNet.Http.Abstractions.Tests/MapPathMiddlewareTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Microsoft.AspNet.Builder.Internal;
77
using Microsoft.AspNet.Http;
88
using Microsoft.AspNet.Http.Internal;
9-
using Shouldly;
109
using Xunit;
1110

1211
namespace Microsoft.AspNet.Builder.Extensions
@@ -98,7 +97,7 @@ public void PathMatchAction_BranchTaken(string matchPath, string basePath, strin
9897
[InlineData("/foo/cho/")]
9998
public void MatchPathWithTrailingSlashThrowsException(string matchPath)
10099
{
101-
Should.Throw<ArgumentException>(() => new ApplicationBuilder(serviceProvider: null).Map(matchPath, map => { }).Build());
100+
Assert.Throws<ArgumentException>(() => new ApplicationBuilder(serviceProvider: null).Map(matchPath, map => { }).Build());
102101
}
103102

104103
[Theory]

‎test/Microsoft.AspNet.Http.Abstractions.Tests/project.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
"test": "xunit.runner.aspnet"
99
},
1010
"frameworks": {
11-
"dnx451": {
12-
"dependencies": {
13-
"Shouldly": "1.1.1.1"
14-
}
15-
}
11+
"dnx451": { },
12+
"dnxcore50": { }
1613
}
1714
}

‎test/Microsoft.AspNet.Http.Extensions.Tests/project.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
"test": "xunit.runner.aspnet"
1010
},
1111
"frameworks": {
12-
"dnx451": {
13-
"dependencies": {
14-
"Shouldly": "1.1.1.1"
15-
}
16-
}
12+
"dnx451": { },
13+
"dnxcore50": { }
1714
}
1815
}

‎test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using Microsoft.AspNet.Http;
4+
using Microsoft.AspNet.Http.Internal;
55
using Xunit;
66

77
namespace Microsoft.AspNet.Builder.Internal
@@ -14,13 +14,10 @@ public void BuildReturnsCallableDelegate()
1414
var builder = new ApplicationBuilder(null);
1515
var app = builder.Build();
1616

17-
var mockHttpContext = new Moq.Mock<HttpContext>();
18-
var mockHttpResponse = new Moq.Mock<HttpResponse>();
19-
mockHttpContext.SetupGet(x => x.Response).Returns(mockHttpResponse.Object);
20-
mockHttpResponse.SetupProperty(x => x.StatusCode);
17+
var httpContext = new DefaultHttpContext();
2118

22-
app.Invoke(mockHttpContext.Object);
23-
Assert.Equal(mockHttpContext.Object.Response.StatusCode, 404);
19+
app.Invoke(httpContext);
20+
Assert.Equal(httpContext.Response.StatusCode, 404);
2421
}
2522
}
2623
}

‎test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using Microsoft.AspNet.FeatureModel;
5-
using Moq;
65
using Xunit;
76

87
namespace Microsoft.AspNet.Http.Features.Internal
@@ -13,15 +12,12 @@ public class QueryFeatureTests
1312
public void QueryReturnsParsedQueryCollection()
1413
{
1514
// Arrange
16-
var features = new Mock<IFeatureCollection>();
17-
var request = new Mock<IHttpRequestFeature>();
18-
request.SetupGet(r => r.QueryString).Returns("foo=bar");
15+
var features = new FeatureCollection();
16+
var request = new HttpRequestFeature();
17+
request.QueryString = "foo=bar";
18+
features.Add(typeof(IHttpRequestFeature), request);
1919

20-
object value = request.Object;
21-
features.Setup(f => f.TryGetValue(typeof(IHttpRequestFeature), out value))
22-
.Returns(true);
23-
24-
var provider = new QueryFeature(features.Object);
20+
var provider = new QueryFeature(features);
2521

2622
// Act
2723
var queryCollection = provider.Query;

‎test/Microsoft.AspNet.Http.Tests/project.json‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
{
2-
"dependencies": {
3-
"Microsoft.AspNet.Http": "1.0.0-*",
4-
"xunit.runner.aspnet": "2.0.0-aspnet-*"
5-
},
6-
"commands": {
7-
"test": "xunit.runner.aspnet"
8-
},
9-
"frameworks": {
10-
"dnx451": {
11-
"dependencies": {
12-
"Moq": "4.2.1312.1622"
13-
},
14-
"frameworkAssemblies": {
15-
"System.Net.Http": ""
16-
}
17-
}
18-
}
2+
"dependencies": {
3+
"Microsoft.AspNet.Http": "1.0.0-*",
4+
"xunit.runner.aspnet": "2.0.0-aspnet-*"
5+
},
6+
"commands": {
7+
"test": "xunit.runner.aspnet"
8+
},
9+
"frameworks": {
10+
"dnx451": { },
11+
"dnxcore50": { }
12+
}
1913
}

‎test/Microsoft.AspNet.Owin.Tests/project.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
"test": "xunit.runner.aspnet"
99
},
1010
"frameworks": {
11-
"dnx451": {
12-
"dependencies": {
13-
"Shouldly": "1.1.1.1"
14-
}
15-
}
11+
"dnx451": { },
12+
"dnxcore50": { }
1613
}
1714
}

‎test/Microsoft.Framework.WebEncoders.Tests/EncoderServiceProviderExtensionsTests.cs‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.IO;
6-
using Moq;
75
using Xunit;
86

97
namespace Microsoft.Framework.WebEncoders
@@ -14,7 +12,7 @@ public class EncoderServiceProviderExtensionsTests
1412
public void GetHtmlEncoder_ServiceProviderDoesNotHaveEncoder_UsesDefault()
1513
{
1614
// Arrange
17-
var serviceProvider = new Mock<IServiceProvider>().Object;
15+
var serviceProvider = new TestServiceProvider();
1816

1917
// Act
2018
var retVal = serviceProvider.GetHtmlEncoder();
@@ -27,12 +25,11 @@ public void GetHtmlEncoder_ServiceProviderDoesNotHaveEncoder_UsesDefault()
2725
public void GetHtmlEncoder_ServiceProviderHasEncoder_ReturnsRegisteredInstance()
2826
{
2927
// Arrange
30-
var expectedEncoder = new Mock<IHtmlEncoder>().Object;
31-
var mockServiceProvider = new Mock<IServiceProvider>();
32-
mockServiceProvider.Setup(o => o.GetService(typeof(IHtmlEncoder))).Returns(expectedEncoder);
28+
var expectedEncoder = new HtmlEncoder();
29+
var serviceProvider = new TestServiceProvider() { Service = expectedEncoder };
3330

3431
// Act
35-
var retVal = mockServiceProvider.Object.GetHtmlEncoder();
32+
var retVal = serviceProvider.GetHtmlEncoder();
3633

3734
// Assert
3835
Assert.Same(expectedEncoder, retVal);
@@ -42,7 +39,7 @@ public void GetHtmlEncoder_ServiceProviderHasEncoder_ReturnsRegisteredInstance()
4239
public void GetJavaScriptStringEncoder_ServiceProviderDoesNotHaveEncoder_UsesDefault()
4340
{
4441
// Arrange
45-
var serviceProvider = new Mock<IServiceProvider>().Object;
42+
var serviceProvider = new TestServiceProvider();
4643

4744
// Act
4845
var retVal = serviceProvider.GetJavaScriptStringEncoder();
@@ -55,12 +52,11 @@ public void GetJavaScriptStringEncoder_ServiceProviderDoesNotHaveEncoder_UsesDef
5552
public void GetJavaScriptStringEncoder_ServiceProviderHasEncoder_ReturnsRegisteredInstance()
5653
{
5754
// Arrange
58-
var expectedEncoder = new Mock<IJavaScriptStringEncoder>().Object;
59-
var mockServiceProvider = new Mock<IServiceProvider>();
60-
mockServiceProvider.Setup(o => o.GetService(typeof(IJavaScriptStringEncoder))).Returns(expectedEncoder);
55+
var expectedEncoder = new JavaScriptStringEncoder();
56+
var serviceProvider = new TestServiceProvider() { Service = expectedEncoder };
6157

6258
// Act
63-
var retVal = mockServiceProvider.Object.GetJavaScriptStringEncoder();
59+
var retVal = serviceProvider.GetJavaScriptStringEncoder();
6460

6561
// Assert
6662
Assert.Same(expectedEncoder, retVal);
@@ -70,7 +66,7 @@ public void GetJavaScriptStringEncoder_ServiceProviderHasEncoder_ReturnsRegister
7066
public void GetUrlEncoder_ServiceProviderDoesNotHaveEncoder_UsesDefault()
7167
{
7268
// Arrange
73-
var serviceProvider = new Mock<IServiceProvider>().Object;
69+
var serviceProvider = new TestServiceProvider();
7470

7571
// Act
7672
var retVal = serviceProvider.GetUrlEncoder();
@@ -83,15 +79,24 @@ public void GetUrlEncoder_ServiceProviderDoesNotHaveEncoder_UsesDefault()
8379
public void GetUrlEncoder_ServiceProviderHasEncoder_ReturnsRegisteredInstance()
8480
{
8581
// Arrange
86-
var expectedEncoder = new Mock<IUrlEncoder>().Object;
87-
var mockServiceProvider = new Mock<IServiceProvider>();
88-
mockServiceProvider.Setup(o => o.GetService(typeof(IUrlEncoder))).Returns(expectedEncoder);
82+
var expectedEncoder = new UrlEncoder();
83+
var serviceProvider = new TestServiceProvider() { Service = expectedEncoder };
8984

9085
// Act
91-
var retVal = mockServiceProvider.Object.GetUrlEncoder();
86+
var retVal = serviceProvider.GetUrlEncoder();
9287

9388
// Assert
9489
Assert.Same(expectedEncoder, retVal);
9590
}
91+
92+
private class TestServiceProvider : IServiceProvider
93+
{
94+
public object Service { get; set; }
95+
96+
public object GetService(Type serviceType)
97+
{
98+
return Service;
99+
}
100+
}
96101
}
97102
}

‎test/Microsoft.Framework.WebEncoders.Tests/UnicodeEncoderBaseTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Collections.Generic;
66
using System.Globalization;
77
using System.IO;
8-
using Moq;
98
using Xunit;
109

1110
namespace Microsoft.Framework.WebEncoders
@@ -208,8 +207,9 @@ public void Encode_CharArray_ParameterChecking_NegativeTestCases()
208207
public void Encode_CharArray_ZeroCount_DoesNotCallIntoTextWriter()
209208
{
210209
// Arrange
211-
CustomUnicodeEncoderBase encoder = new CustomUnicodeEncoderBase();
212-
TextWriter output = new Mock<TextWriter>(MockBehavior.Strict).Object;
210+
var encoder = new CustomUnicodeEncoderBase();
211+
var output = new StringWriter();
212+
output.Dispose(); // Throws ODE if written to.
213213

214214
// Act
215215
encoder.Encode("abc".ToCharArray(), 2, 0, output);
@@ -280,8 +280,9 @@ public void Encode_StringSubstring_ParameterChecking_NegativeTestCases()
280280
public void Encode_StringSubstring_ZeroCount_DoesNotCallIntoTextWriter()
281281
{
282282
// Arrange
283-
CustomUnicodeEncoderBase encoder = new CustomUnicodeEncoderBase();
284-
TextWriter output = new Mock<TextWriter>(MockBehavior.Strict).Object;
283+
var encoder = new CustomUnicodeEncoderBase();
284+
var output = new StringWriter();
285+
output.Dispose(); // Throws ODE if written to.
285286

286287
// Act
287288
encoder.Encode("abc", 2, 0, output);
@@ -309,14 +310,13 @@ public void Encode_StringSubstring_EntireString_AllCharsValid_ForwardDirectlyToO
309310
{
310311
// Arrange
311312
CustomUnicodeEncoderBase encoder = new CustomUnicodeEncoderBase(UnicodeRanges.All);
312-
var mockWriter = new Mock<TextWriter>(MockBehavior.Strict);
313-
mockWriter.Setup(o => o.Write("abc")).Verifiable();
313+
StringWriter output = new StringWriter();
314314

315315
// Act
316-
encoder.Encode("abc", 0, 3, mockWriter.Object);
316+
encoder.Encode("abc", 0, 3, output);
317317

318318
// Assert
319-
mockWriter.Verify();
319+
Assert.Equal("abc", output.ToString());
320320
}
321321

322322
[Fact]

0 commit comments

Comments
 (0)