Skip to content

Commit aaa40ac

Browse files
committed
remaining changes of #1068
1 parent a8a0bf0 commit aaa40ac

File tree

427 files changed

+968
-966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

427 files changed

+968
-966
lines changed

JsonApiDotNetCore.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks",
2020
EndProject
2121
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GettingStarted", "src\Examples\GettingStarted\GettingStarted.csproj", "{067FFD7A-C66B-473D-8471-37F5C95DF61C}"
2222
EndProject
23-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCoreExampleTests", "test\JsonApiDotNetCoreTests\JsonApiDotNetCoreExampleTests.csproj", "{CAF331F8-9255-4D72-A1A8-A54141E99F1E}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCoreTests", "test\JsonApiDotNetCoreTests\JsonApiDotNetCoreTests.csproj", "{CAF331F8-9255-4D72-A1A8-A54141E99F1E}"
2424
EndProject
2525
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoEntityFrameworkTests", "test\NoEntityFrameworkTests\NoEntityFrameworkTests.csproj", "{4F15A8F8-5BC6-45A1-BC51-03F921B726A4}"
2626
EndProject

docs/usage/writing/bulk-batch-operations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Content-Type: application/vnd.api+json;ext="https://jsonapi.org/ext/atomic"
8181
}
8282
```
8383

84-
For example requests, see our suite of tests in JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.
84+
For example requests, see our suite of tests in JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.
8585

8686
## Configuration
8787

src/Examples/JsonApiDotNetCoreExample/Startups/EmptyStartup.cs

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace JsonApiDotNetCoreExample.Startups
1616
{
17-
public sealed class Startup : EmptyStartup
17+
public sealed class Startup
1818
{
1919
private readonly ICodeTimerSession _codeTimingSession;
2020
private readonly string _connectionString;
@@ -29,7 +29,7 @@ public Startup(IConfiguration configuration)
2929
}
3030

3131
// This method gets called by the runtime. Use this method to add services to the container.
32-
public override void ConfigureServices(IServiceCollection services)
32+
public void ConfigureServices(IServiceCollection services)
3333
{
3434
using (CodeTimingSessionManager.Current.Measure("Configure other (startup)"))
3535
{
@@ -63,7 +63,7 @@ public override void ConfigureServices(IServiceCollection services)
6363
}
6464

6565
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
66-
public override void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
66+
public void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
6767
{
6868
ILogger<Startup> logger = loggerFactory.CreateLogger<Startup>();
6969

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Runtime.CompilerServices;
22

33
[assembly: InternalsVisibleTo("Benchmarks")]
4-
[assembly: InternalsVisibleTo("JsonApiDotNetCoreExampleTests")]
4+
[assembly: InternalsVisibleTo("JsonApiDotNetCoreTests")]
55
[assembly: InternalsVisibleTo("UnitTests")]
66
[assembly: InternalsVisibleTo("DiscoveryTests")]
77
[assembly: InternalsVisibleTo("TestBuildingBlocks")]

test/JsonApiDotNetCoreTests/ExampleIntegrationTestContext.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@
77
using FluentAssertions;
88
using JsonApiDotNetCore.Configuration;
99
using JsonApiDotNetCore.Serialization.Objects;
10-
using JsonApiDotNetCoreExampleTests.Startups;
1110
using TestBuildingBlocks;
1211
using Xunit;
1312

14-
namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving
13+
namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
1514
{
16-
public sealed class ArchiveTests : IClassFixture<ExampleIntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext>>
15+
public sealed class ArchiveTests : IClassFixture<IntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext>>
1716
{
18-
private readonly ExampleIntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext> _testContext;
17+
private readonly IntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext> _testContext;
1918
private readonly TelevisionFakers _fakers = new();
2019

21-
public ArchiveTests(ExampleIntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext> testContext)
20+
public ArchiveTests(IntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext> testContext)
2221
{
2322
_testContext = testContext;
2423

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using JsonApiDotNetCore.Resources;
44
using JsonApiDotNetCore.Resources.Annotations;
55

6-
namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving
6+
namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
77
{
88
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
99
public sealed class BroadcastComment : Identifiable

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using JsonApiDotNetCore.Services;
44
using Microsoft.Extensions.Logging;
55

6-
namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving
6+
namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
77
{
88
public sealed class BroadcastCommentsController : JsonApiController<BroadcastComment>
99
{

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using JsonApiDotNetCore.Resources;
55
using JsonApiDotNetCore.Resources.Annotations;
66

7-
namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving
7+
namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
88
{
99
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
1010
public sealed class TelevisionBroadcast : Identifiable

0 commit comments

Comments
 (0)