Skip to content

Commit a37ca56

Browse files
bkoelmanbkoelman
committed
Minor refactorings on string interpolation and verbatim strings
1 parent 507851e commit a37ca56

9 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎src/JsonApiDotNetCore/Middleware/HeaderConstants.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ namespace JsonApiDotNetCore.Middleware;
88
public static class HeaderConstants
99
{
1010
public const string MediaType = "application/vnd.api+json";
11-
public const string AtomicOperationsMediaType = MediaType + "; ext=\"https://jsonapi.org/ext/atomic\"";
11+
public const string AtomicOperationsMediaType = $"{MediaType}; ext=\"https://jsonapi.org/ext/atomic\"";
1212
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public async Task Cannot_create_resource_with_invalid_attribute_value()
125125
ErrorObject error = responseDocument.Errors[0];
126126
error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
127127
error.Title.Should().Be("Input validation failed.");
128-
error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
128+
error.Detail.Should().Be(@"The field Name must match the regular expression '^[\w\s]+$'.");
129129
error.Source.ShouldNotBeNull();
130130
error.Source.Pointer.Should().Be("/data/attributes/directoryName");
131131
}
@@ -534,7 +534,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
534534
ErrorObject error = responseDocument.Errors[0];
535535
error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
536536
error.Title.Should().Be("Input validation failed.");
537-
error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
537+
error.Detail.Should().Be(@"The field Name must match the regular expression '^[\w\s]+$'.");
538538
error.Source.ShouldNotBeNull();
539539
error.Source.Pointer.Should().Be("/data/attributes/directoryName");
540540
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
7474
await dbContext.SaveChangesAsync();
7575
});
7676

77-
string route = $"/public-api/swimming-pools/{pool.StringId}/water-slides" +
78-
"?filter=greaterThan(length-in-meters,'1')&fields[water-slides]=length-in-meters";
77+
string route =
78+
$"/public-api/swimming-pools/{pool.StringId}/water-slides?filter=greaterThan(length-in-meters,'1')&fields[water-slides]=length-in-meters";
7979

8080
// Act
8181
(HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);

‎test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
7979
await dbContext.SaveChangesAsync();
8080
});
8181

82-
string route = $"/PublicApi/SwimmingPools/{pool.StringId}/WaterSlides" + "?filter=greaterThan(LengthInMeters,'1')&fields[WaterSlides]=LengthInMeters";
82+
string route = $"/PublicApi/SwimmingPools/{pool.StringId}/WaterSlides?filter=greaterThan(LengthInMeters,'1')&fields[WaterSlides]=LengthInMeters";
8383

8484
// Act
8585
(HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);

‎test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
323323

324324
responseDocument.Links.ShouldNotBeNull();
325325
responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
326-
responseDocument.Links.First.Should().Be(basePath + "?page%5Bsize%5D=1");
326+
responseDocument.Links.First.Should().Be($"{basePath}?page%5Bsize%5D=1");
327327
responseDocument.Links.Last.Should().BeNull();
328328
responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
329-
responseDocument.Links.Next.Should().Be(basePath + "?page%5Bnumber%5D=3&page%5Bsize%5D=1");
329+
responseDocument.Links.Next.Should().Be($"{basePath}?page%5Bnumber%5D=3&page%5Bsize%5D=1");
330330
}
331331

332332
[Fact]

‎test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ public async Task Cannot_create_resource_on_unknown_resource_type_in_url()
684684
}
685685
};
686686

687-
const string route = "/" + Unknown.ResourceType;
687+
const string route = $"/{Unknown.ResourceType}";
688688

689689
// Act
690690
(HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);

‎test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
6262
public async Task Cannot_get_primary_resources_for_unknown_type()
6363
{
6464
// Arrange
65-
const string route = "/" + Unknown.ResourceType;
65+
const string route = $"/{Unknown.ResourceType}";
6666

6767
// Act
6868
(HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);

‎test/JsonApiDotNetCoreTests/UnitTests/Queries/QueryExpressionRewriterTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void VisitInclude(string expressionText, string expectedTypes)
5353

5454
// Assert
5555
List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
56-
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
56+
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
5757

5858
visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
5959
visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -76,7 +76,7 @@ public void VisitSparseFieldSet(string expressionText, string expectedTypes)
7676

7777
// Assert
7878
List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
79-
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
79+
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
8080

8181
visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
8282
visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -136,7 +136,7 @@ public void VisitFilter(string expressionText, string expectedTypes)
136136

137137
// Assert
138138
List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
139-
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
139+
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
140140

141141
visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
142142
visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -160,7 +160,7 @@ public void VisitSort(string expressionText, string expectedTypes)
160160

161161
// Assert
162162
List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
163-
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
163+
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
164164

165165
visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
166166
visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -183,7 +183,7 @@ public void VisitPagination(string expressionText, string expectedTypes)
183183

184184
// Assert
185185
List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
186-
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
186+
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
187187

188188
visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
189189
visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -208,7 +208,7 @@ public void VisitParameterScope(string expressionText, string expectedTypes)
208208

209209
// Assert
210210
List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
211-
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
211+
List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
212212

213213
visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
214214
visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);

‎test/JsonApiDotNetCoreTests/UnitTests/ResourceDefinitions/CreateSortExpressionFromLambdaTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public void Cannot_convert_concatenation_operator()
317317
// Act
318318
Action action = () => resourceDefinition.GetSortExpressionFromLambda(new JsonApiResourceDefinition<FileEntry, long>.PropertySortOrder
319319
{
320-
(file => file.Name + ":" + file.Content, ListSortDirection.Ascending)
320+
(file => $"{file.Name}:{file.Content}", ListSortDirection.Ascending)
321321
});
322322

323323
// Assert

0 commit comments

Comments
 (0)