Skip to content

Commit 41693e2

Browse files
yohanmishkinyohanmishkin
committed
WIP
1 parent 88e2984 commit 41693e2

29 files changed

+211
-216
lines changed

‎.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"isShellCommand": true,
77
"args": [],
88
"options": {
9-
"cwd": "${workspaceRoot}/src/Examples/JsonApiDotNetCoreExample"
9+
"cwd": "${workspaceRoot}/src/JsonApiDotNetCore"
1010
},
1111
"tasks": [
1212
{

‎src/Examples/ReportsExample/Properties/launchSettings.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"iisSettings": {
3+
"windowsAuthentication": false,
4+
"anonymousAuthentication": true,
5+
"iisExpress": {
6+
"applicationUrl": "http://localhost:55653/",
7+
"sslPort": 0
8+
}
9+
},
10+
"profiles": {
11+
"IIS Express": {
12+
"commandName": "IISExpress",
13+
"launchBrowser": true,
14+
"environmentVariables": {
15+
"ASPNETCORE_ENVIRONMENT": "Development"
16+
}
17+
},
18+
"ReportsExample": {
19+
"commandName": "Project",
20+
"launchBrowser": true,
21+
"environmentVariables": {
22+
"ASPNETCORE_ENVIRONMENT": "Development"
23+
},
24+
"applicationUrl": "http://localhost:55654/"
25+
}
26+
}
27+
}

‎test/JsonApiDotNetCoreExampleTests/Acceptance/CamelCasedModelsControllerTests.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,27 @@
44
using System.Net.Http.Headers;
55
using System.Threading.Tasks;
66
using Bogus;
7-
using DotNetCoreDocs;
8-
using DotNetCoreDocs.Writers;
7+
using JsonApiDotNetCore.Serialization;
8+
using JsonApiDotNetCore.Services;
99
using JsonApiDotNetCoreExample;
1010
using JsonApiDotNetCoreExample.Data;
1111
using JsonApiDotNetCoreExample.Models;
12+
using Microsoft.AspNetCore.Hosting;
13+
using Microsoft.AspNetCore.TestHost;
1214
using Newtonsoft.Json;
1315
using Xunit;
14-
using JsonApiDotNetCore.Services;
15-
using JsonApiDotNetCore.Serialization;
16-
using Microsoft.AspNetCore.TestHost;
17-
using Microsoft.AspNetCore.Hosting;
1816

1917
namespace JsonApiDotNetCoreExampleTests.Acceptance
2018
{
2119
[Collection("WebHostCollection")]
2220
public class CamelCasedModelsControllerTests
2321
{
24-
private DocsFixture<Startup, JsonDocWriter> _fixture;
22+
private TestFixture<Startup> _fixture;
2523
private AppDbContext _context;
2624
private IJsonApiContext _jsonApiContext;
2725
private Faker<CamelCasedModel> _faker;
2826

29-
public CamelCasedModelsControllerTests(DocsFixture<Startup, JsonDocWriter> fixture)
27+
public CamelCasedModelsControllerTests(TestFixture<Startup> fixture)
3028
{
3129
_fixture = fixture;
3230
_context = fixture.GetService<AppDbContext>();
@@ -37,6 +35,7 @@ public CamelCasedModelsControllerTests(DocsFixture<Startup, JsonDocWriter> fixtu
3735

3836
[Fact]
3937
public async Task Can_Get_CamelCasedModels()
38+
4039
{
4140
// Arrange
4241
var model = _faker.Generate();

‎test/JsonApiDotNetCoreExampleTests/Acceptance/Extensibility/CustomControllerTests.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,26 @@
22
using System.Net.Http;
33
using System.Threading.Tasks;
44
using Bogus;
5-
using DotNetCoreDocs;
6-
using DotNetCoreDocs.Writers;
7-
using Microsoft.AspNetCore.Hosting;
8-
using Microsoft.AspNetCore.TestHost;
9-
using Xunit;
105
using JsonApiDotNetCoreExample;
116
using JsonApiDotNetCoreExample.Data;
127
using JsonApiDotNetCoreExample.Models;
8+
using Microsoft.AspNetCore.Hosting;
9+
using Microsoft.AspNetCore.TestHost;
1310
using Newtonsoft.Json;
1411
using Newtonsoft.Json.Linq;
12+
using Xunit;
1513
using Person = JsonApiDotNetCoreExample.Models.Person;
1614

1715
namespace JsonApiDotNetCoreExampleTests.Acceptance.Extensibility
1816
{
1917
[Collection("WebHostCollection")]
2018
public class CustomControllerTests
2119
{
22-
private DocsFixture<Startup, JsonDocWriter> _fixture;
20+
private TestFixture<Startup> _fixture;
2321
private Faker<TodoItem> _todoItemFaker;
2422
private Faker<Person> _personFaker;
2523

26-
public CustomControllerTests(DocsFixture<Startup, JsonDocWriter> fixture)
24+
public CustomControllerTests(TestFixture<Startup> fixture)
2725
{
2826
_fixture = fixture;
2927
_todoItemFaker = new Faker<TodoItem>()

‎test/JsonApiDotNetCoreExampleTests/Acceptance/Extensibility/RepositoryOverrideTests.cs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
using System.Net;
22
using System.Net.Http;
33
using System.Threading.Tasks;
4-
using Microsoft.AspNetCore.Hosting;
5-
using Microsoft.AspNetCore.TestHost;
6-
using Xunit;
7-
using JsonApiDotNetCoreExample.Data;
8-
using JsonApiDotNetCoreExampleTests.Startups;
9-
using JsonApiDotNetCoreExample.Models;
10-
using JsonApiDotNetCoreExampleTests.Services;
114
using JsonApiDotNetCore.Serialization;
125
using JsonApiDotNetCore.Services;
13-
using DotNetCoreDocs;
146
using JsonApiDotNetCoreExample;
15-
using DotNetCoreDocs.Writers;
7+
using JsonApiDotNetCoreExample.Data;
8+
using JsonApiDotNetCoreExample.Models;
9+
using JsonApiDotNetCoreExampleTests.Services;
10+
using JsonApiDotNetCoreExampleTests.Startups;
11+
using Microsoft.AspNetCore.Hosting;
12+
using Microsoft.AspNetCore.TestHost;
13+
using Xunit;
1614

1715
namespace JsonApiDotNetCoreExampleTests.Acceptance.Extensibility
1816
{
1917
[Collection("WebHostCollection")]
2018
public class RepositoryOverrideTests
2119
{
22-
private DocsFixture<Startup, JsonDocWriter> _fixture;
20+
private TestFixture<Startup> _fixture;
2321

24-
public RepositoryOverrideTests(DocsFixture<Startup, JsonDocWriter> fixture)
22+
public RepositoryOverrideTests(TestFixture<Startup> fixture)
2523
{
2624
_fixture = fixture;
2725
}

‎test/JsonApiDotNetCoreExampleTests/Acceptance/Extensibility/RequestMetaTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ namespace JsonApiDotNetCoreExampleTests.Acceptance.Extensibility
1818
[Collection("WebHostCollection")]
1919
public class RequestMetaTests
2020
{
21-
private DocsFixture<Startup, JsonDocWriter> _fixture;
21+
private TestFixture<Startup> _fixture;
2222

23-
public RequestMetaTests(DocsFixture<Startup, JsonDocWriter> fixture)
23+
public RequestMetaTests(TestFixture<Startup> fixture)
2424
{
2525
_fixture = fixture;
2626
}

‎test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/AttributeFilterTests.cs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
1-
using System.Net;
1+
using System.Linq;
2+
using System.Net;
23
using System.Net.Http;
34
using System.Threading.Tasks;
4-
using DotNetCoreDocs;
5-
using DotNetCoreDocs.Writers;
5+
using Bogus;
6+
using JsonApiDotNetCore.Models;
7+
using JsonApiDotNetCore.Serialization;
68
using JsonApiDotNetCoreExample;
9+
using JsonApiDotNetCoreExample.Data;
10+
using JsonApiDotNetCoreExample.Models;
711
using Microsoft.AspNetCore.Hosting;
812
using Microsoft.AspNetCore.TestHost;
13+
using Newtonsoft.Json;
914
using Xunit;
10-
using JsonApiDotNetCoreExample.Data;
11-
using Bogus;
12-
using JsonApiDotNetCoreExample.Models;
13-
using JsonApiDotNetCore.Serialization;
14-
using System.Linq;
1515
using Person = JsonApiDotNetCoreExample.Models.Person;
16-
using Newtonsoft.Json;
17-
using JsonApiDotNetCore.Models;
1816

1917
namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec
2018
{
2119
[Collection("WebHostCollection")]
2220
public class AttributeFilterTests
2321
{
24-
private DocsFixture<Startup, JsonDocWriter> _fixture;
22+
private TestFixture<Startup> _fixture;
2523
private Faker<TodoItem> _todoItemFaker;
2624
private readonly Faker<Person> _personFaker;
2725

28-
public AttributeFilterTests(DocsFixture<Startup, JsonDocWriter> fixture)
26+
public AttributeFilterTests(TestFixture<Startup> fixture)
2927
{
3028
_fixture = fixture;
3129
_todoItemFaker = new Faker<TodoItem>()

‎test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/ContentNegotiation.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
using System.Net.Http;
33
using System.Net.Http.Headers;
44
using System.Threading.Tasks;
5-
using DotNetCoreDocs;
6-
using DotNetCoreDocs.Models;
7-
using DotNetCoreDocs.Writers;
85
using JsonApiDotNetCoreExample;
96
using Microsoft.AspNetCore.Hosting;
107
using Microsoft.AspNetCore.TestHost;
@@ -15,8 +12,8 @@ namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec
1512
[Collection("WebHostCollection")]
1613
public class ContentNegotiation
1714
{
18-
private DocsFixture<Startup, JsonDocWriter> _fixture;
19-
public ContentNegotiation(DocsFixture<Startup, JsonDocWriter> fixture)
15+
private TestFixture<Startup> _fixture;
16+
public ContentNegotiation(TestFixture<Startup> fixture)
2017
{
2118
_fixture = fixture;
2219
}
@@ -29,7 +26,6 @@ public async Task Server_Sends_Correct_ContentType_Header()
2926
.UseStartup<Startup>();
3027
var httpMethod = new HttpMethod("GET");
3128
var route = "/api/v1/todo-items";
32-
var description = new RequestProperties("Server Sends Correct Content Type Header");
3329
var server = new TestServer(builder);
3430
var client = server.CreateClient();
3531
var request = new HttpRequestMessage(httpMethod, route);
@@ -50,7 +46,6 @@ public async Task Server_Responds_415_With_MediaType_Parameters()
5046
.UseStartup<Startup>();
5147
var httpMethod = new HttpMethod("GET");
5248
var route = "/api/v1/todo-items";
53-
var description = new RequestProperties("Server responds with 415 if request contains media type parameters");
5449
var server = new TestServer(builder);
5550
var client = server.CreateClient();
5651
var request = new HttpRequestMessage(httpMethod, route);
@@ -73,7 +68,6 @@ public async Task ServerResponds_406_If_RequestAcceptHeader_Contains_MediaTypePa
7368
.UseStartup<Startup>();
7469
var httpMethod = new HttpMethod("GET");
7570
var route = "/api/v1/todo-items";
76-
var description = new RequestProperties("Server responds with 406...");
7771
var server = new TestServer(builder);
7872
var client = server.CreateClient();
7973
var acceptHeader = new MediaTypeWithQualityHeaderValue("application/vnd.api+json");

‎test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/CreatingDataTests.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
1-
using System.Net;
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Net;
25
using System.Net.Http;
36
using System.Net.Http.Headers;
47
using System.Threading.Tasks;
58
using Bogus;
6-
using DotNetCoreDocs;
7-
using DotNetCoreDocs.Writers;
89
using JsonApiDotNetCore.Serialization;
910
using JsonApiDotNetCore.Services;
1011
using JsonApiDotNetCoreExample;
1112
using JsonApiDotNetCoreExample.Data;
1213
using JsonApiDotNetCoreExample.Models;
14+
using JsonApiDotNetCoreExampleTests.Startups;
1315
using Microsoft.AspNetCore.Hosting;
1416
using Microsoft.AspNetCore.TestHost;
17+
using Microsoft.EntityFrameworkCore;
1518
using Newtonsoft.Json;
1619
using Xunit;
17-
using System.Collections.Generic;
18-
using System.Linq;
19-
using Microsoft.EntityFrameworkCore;
20-
using JsonApiDotNetCoreExampleTests.Startups;
21-
using System;
2220

2321
namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec
2422
{
2523
[Collection("WebHostCollection")]
2624
public class CreatingDataTests
2725
{
28-
private DocsFixture<Startup, JsonDocWriter> _fixture;
26+
private TestFixture<Startup> _fixture;
2927
private IJsonApiContext _jsonApiContext;
3028
private Faker<TodoItem> _todoItemFaker;
3129

32-
public CreatingDataTests(DocsFixture<Startup, JsonDocWriter> fixture)
30+
public CreatingDataTests(TestFixture<Startup> fixture)
3331
{
3432
_fixture = fixture;
3533
_jsonApiContext = fixture.GetService<IJsonApiContext>();

‎test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DeletingDataTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
using System.Net.Http;
44
using System.Threading.Tasks;
55
using Bogus;
6-
using DotNetCoreDocs;
7-
using DotNetCoreDocs.Writers;
86
using JsonApiDotNetCoreExample;
97
using JsonApiDotNetCoreExample.Data;
108
using JsonApiDotNetCoreExample.Models;
@@ -17,11 +15,11 @@ namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec
1715
[Collection("WebHostCollection")]
1816
public class DeletingDataTests
1917
{
20-
private DocsFixture<Startup, JsonDocWriter> _fixture;
18+
private TestFixture<Startup> _fixture;
2119
private AppDbContext _context;
2220
private Faker<TodoItem> _todoItemFaker;
2321

24-
public DeletingDataTests(DocsFixture<Startup, JsonDocWriter> fixture)
22+
public DeletingDataTests(TestFixture<Startup> fixture)
2523
{
2624
_fixture = fixture;
2725
_context = fixture.GetService<AppDbContext>();

‎test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/Included.cs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1-
using System.Net;
1+
using System.Linq;
2+
using System.Net;
23
using System.Net.Http;
34
using System.Threading.Tasks;
4-
using DotNetCoreDocs;
5-
using DotNetCoreDocs.Writers;
5+
using Bogus;
6+
using JsonApiDotNetCore.Models;
67
using JsonApiDotNetCoreExample;
8+
using JsonApiDotNetCoreExample.Data;
9+
using JsonApiDotNetCoreExample.Models;
710
using Microsoft.AspNetCore.Hosting;
811
using Microsoft.AspNetCore.TestHost;
912
using Newtonsoft.Json;
1013
using Xunit;
1114
using Person = JsonApiDotNetCoreExample.Models.Person;
12-
using JsonApiDotNetCore.Models;
13-
using JsonApiDotNetCoreExample.Data;
14-
using Bogus;
15-
using JsonApiDotNetCoreExample.Models;
16-
using System.Linq;
1715

1816
namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec.DocumentTests
1917
{
2018
[Collection("WebHostCollection")]
2119
public class Included
2220
{
23-
private DocsFixture<Startup, JsonDocWriter> _fixture;
21+
private TestFixture<Startup> _fixture;
2422
private AppDbContext _context;
25-
private Faker<Person> _personFaker;
23+
private Bogus.Faker<Person> _personFaker;
2624
private Faker<TodoItem> _todoItemFaker;
2725
private Faker<TodoItemCollection> _todoItemCollectionFaker;
2826

29-
public Included(DocsFixture<Startup, JsonDocWriter> fixture)
27+
public Included(TestFixture<Startup> fixture)
3028
{
3129
_fixture = fixture;
3230
_context = fixture.GetService<AppDbContext>();

‎test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/Meta.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
1+
using System.Collections;
12
using System.Net;
23
using System.Net.Http;
34
using System.Threading.Tasks;
4-
using DotNetCoreDocs;
5-
using DotNetCoreDocs.Writers;
5+
using JsonApiDotNetCore.Models;
66
using JsonApiDotNetCoreExample;
7+
using JsonApiDotNetCoreExample.Data;
8+
using JsonApiDotNetCoreExample.Models;
9+
using JsonApiDotNetCoreExampleTests.Startups;
710
using Microsoft.AspNetCore.Hosting;
811
using Microsoft.AspNetCore.TestHost;
912
using Newtonsoft.Json;
1013
using Xunit;
11-
using JsonApiDotNetCore.Models;
12-
using JsonApiDotNetCoreExample.Data;
13-
using JsonApiDotNetCoreExampleTests.Startups;
14-
using JsonApiDotNetCoreExample.Models;
15-
using System.Collections;
1614

1715
namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec.DocumentTests
1816
{
1917
[Collection("WebHostCollection")]
2018
public class Meta
2119
{
22-
private DocsFixture<Startup, JsonDocWriter> _fixture;
20+
private TestFixture<Startup> _fixture;
2321
private AppDbContext _context;
24-
public Meta(DocsFixture<Startup, JsonDocWriter> fixture)
22+
public Meta(TestFixture<Startup> fixture)
2523
{
2624
_fixture = fixture;
2725
_context = fixture.GetService<AppDbContext>();

0 commit comments

Comments
 (0)