Skip to content
This repository was archived by the owner on Dec 24, 2020. It is now read-only.

Commit 4d07894

Browse files
kevinchaletkevinchalet
committed
Re-enable unit tests on Mono
1 parent 23c4e6d commit 4d07894

6 files changed

Lines changed: 17 additions & 23 deletions

File tree

‎test/AspNet.Security.OAuth.Introspection.Tests/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
"dependencies": {
77
"AspNet.Security.OAuth.Introspection": "1.0.0-*",
8-
"Microsoft.AspNetCore.Testing": "1.0.0-*",
98
"Microsoft.AspNetCore.TestHost": "1.0.0-*",
109
"Microsoft.Extensions.Caching.Memory": "1.0.0-*",
1110
"Microsoft.Extensions.Logging.Debug": "1.0.0-*",

‎test/AspNet.Security.OAuth.Validation.Tests/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
"dependencies": {
77
"AspNet.Security.OAuth.Validation": "1.0.0-*",
8-
"Microsoft.AspNetCore.Testing": "1.0.0-*",
98
"Microsoft.AspNetCore.TestHost": "1.0.0-*",
109
"Microsoft.Extensions.Caching.Memory": "1.0.0-*",
1110
"Microsoft.Extensions.Logging.Debug": "1.0.0-*",

‎test/Owin.Security.OAuth.Introspection.Tests/OAuthIntrospectionMiddlewareTests.cs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using System.Reflection;
1414
using System.Security.Claims;
1515
using System.Threading.Tasks;
16-
using Microsoft.AspNetCore.Testing.xunit;
1716
using Microsoft.Owin.Security;
1817
using Microsoft.Owin.Testing;
1918
using Newtonsoft.Json;
@@ -22,7 +21,7 @@
2221

2322
namespace Owin.Security.OAuth.Introspection.Tests {
2423
public class OAuthIntrospectionMiddlewareTests {
25-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
24+
[Fact]
2625
public void MissingAuthorityThrowsAnException() {
2726
// Arrange, act, assert
2827
var exception = Assert.Throws<TargetInvocationException>(() => CreateResourceServer(options => {
@@ -34,7 +33,7 @@ public void MissingAuthorityThrowsAnException() {
3433
Assert.StartsWith("The authority or the introspection endpoint must be configured.", exception.InnerException.Message);
3534
}
3635

37-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
36+
[Fact]
3837
public void MissingCredentialsThrowAnException() {
3938
// Arrange, act, assert
4039
var exception = Assert.Throws<TargetInvocationException>(() => CreateResourceServer(options => {
@@ -46,7 +45,7 @@ public void MissingCredentialsThrowAnException() {
4645
Assert.StartsWith("Client credentials must be configured.", exception.InnerException.Message);
4746
}
4847

49-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
48+
[Fact]
5049
public async Task MissingTokenCausesInvalidAuthentication() {
5150
// Arrange
5251
var server = CreateResourceServer(options => {
@@ -65,7 +64,7 @@ public async Task MissingTokenCausesInvalidAuthentication() {
6564
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
6665
}
6766

68-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
67+
[Fact]
6968
public async Task InvalidTokenCausesInvalidAuthentication() {
7069
// Arrange
7170
var server = CreateResourceServer(options => {
@@ -85,7 +84,7 @@ public async Task InvalidTokenCausesInvalidAuthentication() {
8584
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
8685
}
8786

88-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
87+
[Fact]
8988
public async Task ValidTokenAllowsSuccessfulAuthentication() {
9089
// Arrange
9190
var server = CreateResourceServer(options => {
@@ -106,7 +105,7 @@ public async Task ValidTokenAllowsSuccessfulAuthentication() {
106105
Assert.Equal("Fabrikam", await response.Content.ReadAsStringAsync());
107106
}
108107

109-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
108+
[Fact]
110109
public async Task MissingAudienceCausesInvalidAuthentication() {
111110
// Arrange
112111
var server = CreateResourceServer(options => {
@@ -127,7 +126,7 @@ public async Task MissingAudienceCausesInvalidAuthentication() {
127126
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
128127
}
129128

130-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
129+
[Fact]
131130
public async Task InvalidAudienceCausesInvalidAuthentication() {
132131
// Arrange
133132
var server = CreateResourceServer(options => {
@@ -149,7 +148,7 @@ public async Task InvalidAudienceCausesInvalidAuthentication() {
149148
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
150149
}
151150

152-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
151+
[Fact]
153152
public async Task AnyMatchingAudienceCausesSuccessfulAuthentication() {
154153
// Arrange
155154
var server = CreateResourceServer(options => {
@@ -173,7 +172,7 @@ public async Task AnyMatchingAudienceCausesSuccessfulAuthentication() {
173172
Assert.Equal("Fabrikam", await response.Content.ReadAsStringAsync());
174173
}
175174

176-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
175+
[Fact]
177176
public async Task ValidAudienceAllowsSuccessfulAuthentication() {
178177
// Arrange
179178
var server = CreateResourceServer(options => {
@@ -196,7 +195,7 @@ public async Task ValidAudienceAllowsSuccessfulAuthentication() {
196195
Assert.Equal("Fabrikam", await response.Content.ReadAsStringAsync());
197196
}
198197

199-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
198+
[Fact]
200199
public async Task MultipleMatchingAudienceCausesSuccessfulAuthentication() {
201200
// Arrange
202201
var server = CreateResourceServer(options => {
@@ -220,7 +219,7 @@ public async Task MultipleMatchingAudienceCausesSuccessfulAuthentication() {
220219
Assert.Equal("Fabrikam", await response.Content.ReadAsStringAsync());
221220
}
222221

223-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
222+
[Fact]
224223
public async Task ExpiredTicketCausesInvalidAuthentication() {
225224
// Arrange
226225
var server = CreateResourceServer(options => {

‎test/Owin.Security.OAuth.Introspection.Tests/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
},
55

66
"dependencies": {
7-
"Microsoft.AspNetCore.Testing": "1.0.0-*",
87
"Microsoft.Owin.Testing": "3.0.1",
98
"Owin.Security.OAuth.Introspection": "1.0.0-*",
109
"xunit": "2.1.0",

‎test/Owin.Security.OAuth.Validation.Tests/OAuthValidationMiddlewareTests.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
using System.Net.Http.Headers;
1313
using System.Security.Claims;
1414
using System.Threading.Tasks;
15-
using Microsoft.AspNetCore.Testing.xunit;
1615
using Microsoft.Owin.Security;
1716
using Microsoft.Owin.Testing;
1817
using Moq;
1918
using Xunit;
2019

2120
namespace Owin.Security.OAuth.Validation.Tests {
2221
public class OAuthValidationMiddlewareTests {
23-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
22+
[Fact]
2423
public async Task InvalidTokenCausesInvalidAuthentication() {
2524
// Arrange
2625
var server = CreateResourceServer();
@@ -37,7 +36,7 @@ public async Task InvalidTokenCausesInvalidAuthentication() {
3736
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
3837
}
3938

40-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
39+
[Fact]
4140
public async Task ValidTokenAllowsSuccessfulAuthentication() {
4241
// Arrange
4342
var server = CreateResourceServer();
@@ -55,7 +54,7 @@ public async Task ValidTokenAllowsSuccessfulAuthentication() {
5554
Assert.Equal("Fabrikam", await response.Content.ReadAsStringAsync());
5655
}
5756

58-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
57+
[Fact]
5958
public async Task MissingAudienceCausesInvalidAuthentication() {
6059
// Arrange
6160
var server = CreateResourceServer(options => {
@@ -74,7 +73,7 @@ public async Task MissingAudienceCausesInvalidAuthentication() {
7473
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
7574
}
7675

77-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
76+
[Fact]
7877
public async Task InvalidAudienceCausesInvalidAuthentication() {
7978
// Arrange
8079
var server = CreateResourceServer(options => {
@@ -93,7 +92,7 @@ public async Task InvalidAudienceCausesInvalidAuthentication() {
9392
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
9493
}
9594

96-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
95+
[Fact]
9796
public async Task ValidAudienceAllowsSuccessfulAuthentication() {
9897
// Arrange
9998
var server = CreateResourceServer(options => {
@@ -155,7 +154,7 @@ public async Task MultipleMatchingAudienceCausesSuccessfulAuthentication() {
155154
Assert.Equal("Fabrikam", await response.Content.ReadAsStringAsync());
156155
}
157156

158-
[ConditionalFact, FrameworkSkipCondition(RuntimeFrameworks.Mono)]
157+
[Fact]
159158
public async Task ExpiredTicketCausesInvalidAuthentication() {
160159
// Arrange
161160
var server = CreateResourceServer();

‎test/Owin.Security.OAuth.Validation.Tests/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
},
55

66
"dependencies": {
7-
"Microsoft.AspNetCore.Testing": "1.0.0-*",
87
"Microsoft.Owin.Testing": "3.0.1",
98
"Moq": "4.2.1312.1622",
109
"Owin.Security.OAuth.Validation": "1.0.0-*",

0 commit comments

Comments
 (0)