Skip to content

Commit 20e49c5

Browse files
JohanLarssonJohanLarsson
committed
Include quotes in test strings.
1 parent 66532eb commit 20e49c5

3 files changed

Lines changed: 37 additions & 36 deletions

File tree

‎AspNetCoreAnalyzers.Tests/ASP004ParameterSyntaxTests/Diagnostics.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ public class Diagnostics
99
private static readonly DiagnosticAnalyzer Analyzer = new AttributeAnalyzer();
1010
private static readonly ExpectedDiagnostic ExpectedDiagnostic = ExpectedDiagnostic.Create(ASP004ParameterSyntax.Descriptor);
1111

12-
[TestCase("api/orders/{id:↓wrong}")]
13-
[TestCase("api/orders/{id:min1)}")]
14-
[TestCase("api/orders/{id:max1)}")]
15-
[TestCase("api/orders/{id:min(↓wrong))}")]
16-
[TestCase("api/orders/{id:max(↓wrong))}")]
17-
[TestCase("api/orders/{id:↓:long)}")]
18-
[TestCase("api/orders/{id:long:↓)}")]
19-
[TestCase("api/orders/{id:long:↓:)}")]
12+
[TestCase("\"api/orders/{id:↓wrong}\"")]
13+
[TestCase("\"api/orders/{id:min1)}\"")]
14+
[TestCase("\"api/orders/{id:max1)}\"")]
15+
[TestCase("\"api/orders/{id:min(↓wrong))}\"")]
16+
[TestCase("\"api/orders/{id:max(↓wrong))}\"")]
17+
[TestCase("\"api/orders/{id:↓:long)}\"")]
18+
[TestCase("\"api/orders/{id:long:↓)}\"")]
19+
[TestCase("\"api/orders/{id:long:↓:)}\"")]
2020
public void WhenLong(string before)
2121
{
2222
var code = @"
@@ -33,7 +33,7 @@ public IActionResult GetId(long id)
3333
return this.Ok(id);
3434
}
3535
}
36-
}".AssertReplace("api/orders/↓{id:wrong}", before);
36+
}".AssertReplace("\"api/orders/↓{id:wrong}\"", before);
3737

3838
AnalyzerAssert.Diagnostics(Analyzer, ExpectedDiagnostic, code);
3939
}

‎AspNetCoreAnalyzers.Tests/ASP005ParameterRegexTests/ValidCode.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,32 @@ public class ValidCode
88
{
99
private static readonly DiagnosticAnalyzer Analyzer = new AttributeAnalyzer();
1010

11-
[TestCase("{value}", "string")]
12-
[TestCase("{value?}", "string")]
13-
[TestCase("{value:bool}", "bool")]
14-
[TestCase("{value:datetime}", "System.DateTime")]
15-
[TestCase("{value:decimal}", "decimal")]
16-
[TestCase("{value:double}", "double")]
17-
[TestCase("{value:float}", "float")]
18-
[TestCase("{value:int}", "int")]
19-
[TestCase("api/orders/{value:int:min(1)}", "int")]
20-
[TestCase("api/orders/{value:int:max(1)}", "int")]
21-
[TestCase("api/orders/{value:int:range(1,10)}", "int")]
22-
[TestCase("api/orders/{value:int:required}", "int")]
23-
[TestCase("{value:long}", "long")]
24-
[TestCase("api/orders/{value:min(1)}", "long")]
25-
[TestCase("api/orders/{value:max(1)}", "long")]
26-
[TestCase("api/orders/{value:range(1,10)}", "long")]
27-
[TestCase("api/orders/{value:required}", "long")]
28-
[TestCase("{value:guid}", "System.Guid")]
29-
[TestCase("api/orders/{value:minlength(1)}", "string")]
30-
[TestCase("api/orders/{value:maxlength(1)}", "string")]
31-
[TestCase("api/orders/{value:length(1)}", "string")]
32-
[TestCase("api/orders/{value:length(1,3)}", "string")]
33-
[TestCase("api/orders/{value:alpha}", "string")]
34-
[TestCase("api/orders/{value:regex(a-(0|1))}", "string")]
35-
[TestCase("api/orders/{value:regex(^\\\\\\\\d{{3}}-\\\\\\\\d{{2}}-\\\\\\\\d{{4}}$)}", "string")]
36-
[TestCase("api/orders/{value:required}", "string")]
11+
[TestCase("\"{value}\"", "string")]
12+
[TestCase("\"{value?}\"", "string")]
13+
[TestCase("\"{value:bool}\"", "bool")]
14+
[TestCase("\"{value:datetime}\"", "System.DateTime")]
15+
[TestCase("\"{value:decimal}\"", "decimal")]
16+
[TestCase("\"{value:double}\"", "double")]
17+
[TestCase("\"{value:float}\"", "float")]
18+
[TestCase("\"{value:int}\"", "int")]
19+
[TestCase("\"api/orders/{value:int:min(1)}\"", "int")]
20+
[TestCase("\"api/orders/{value:int:max(1)}\"", "int")]
21+
[TestCase("\"api/orders/{value:int:range(1,10)}\"", "int")]
22+
[TestCase("\"api/orders/{value:int:required}\"", "int")]
23+
[TestCase("\"{value:long}\"", "long")]
24+
[TestCase("\"api/orders/{value:min(1)}\"", "long")]
25+
[TestCase("\"api/orders/{value:max(1)}\"", "long")]
26+
[TestCase("\"api/orders/{value:range(1,10)}\"", "long")]
27+
[TestCase("\"api/orders/{value:required}\"", "long")]
28+
[TestCase("\"{value:guid}\"", "System.Guid")]
29+
[TestCase("\"api/orders/{value:minlength(1)}\"", "string")]
30+
[TestCase("\"api/orders/{value:maxlength(1)}\"", "string")]
31+
[TestCase("\"api/orders/{value:length(1)}\"", "string")]
32+
[TestCase("\"api/orders/{value:length(1,3)}\"", "string")]
33+
[TestCase("\"api/orders/{value:alpha}\"", "string")]
34+
[TestCase("\"api/orders/{value:regex(a-(0|1))}\"", "string")]
35+
[TestCase("\"api/orders/{value:regex(^\\\\\\\\d{{3}}-\\\\\\\\d{{2}}-\\\\\\\\d{{4}}$)}\"", "string")]
36+
[TestCase("\"api/orders/{value:required}\"", "string")]
3737
public void WithParameter(string parameter, string type)
3838
{
3939
var code = @"
@@ -52,7 +52,7 @@ public IActionResult GetValue(string value)
5252
return this.Ok(value);
5353
}
5454
}
55-
}".AssertReplace("{value}", parameter)
55+
}".AssertReplace("\"api/{value}\"", parameter)
5656
.AssertReplace("string", type);
5757
AnalyzerAssert.Valid(Analyzer, code);
5858
}

‎AspNetCoreAnalyzers.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WPF/@EntryIndexedValue">WPF</s:String>
2323
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
2424
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
25+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
2526
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
2627
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=AutoRecoverer/@EntryIndexedValue">LIVE_MONITOR</s:String>
2728
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=Format/@EntryIndexedValue">LIVE_MONITOR</s:String>

0 commit comments

Comments
 (0)