Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d1561e7

Browse files
carloscdscarloscds
authored
Merge pull request #999 from sharwell/test-library
Convert tests to Microsoft.CodeAnalysis.Testing
2 parents 6726a3d + a6e6342 commit d1561e7

28 files changed

+395
-180
lines changed

‎test/CSharp/CodeCracker.Test/Design/CatchEmptyTests.cs

+36-35
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
using CodeCracker.CSharp.Design;
2-
using System.Threading.Tasks;
1+
using System.Threading.Tasks;
2+
using CodeCracker.CSharp.Design;
33
using Xunit;
44

55
namespace CodeCracker.Test.CSharp.Design
66
{
7-
public class CatchEmptyTests : CodeFixVerifier<CatchEmptyAnalyzer, CatchEmptyCodeFixProvider>
8-
{
7+
using Verify = CSharpCodeFixVerifier<CatchEmptyAnalyzer, CatchEmptyCodeFixProvider>;
98

9+
public class CatchEmptyTests
10+
{
1011
[Fact]
1112
public async Task CatchEmptyAnalyserCreateDiagnostic()
1213
{
@@ -17,7 +18,7 @@ namespace ConsoleApplication1
1718
{
1819
class TypeName
1920
{
20-
public async Task Foo()
21+
public async {|CS0246:Task|} {|CS0161:{|CS1983:Foo|}|}()
2122
{
2223
try
2324
{
@@ -31,7 +32,7 @@ public async Task Foo()
3132
}
3233
}";
3334

34-
await VerifyCSharpHasNoDiagnosticsAsync(source);
35+
await Verify.VerifyAnalyzerAsync(source);
3536
}
3637

3738
[Fact]
@@ -44,7 +45,7 @@ namespace ConsoleApplication1
4445
{
4546
class TypeName
4647
{
47-
public async Task Foo()
48+
public async {|CS0246:Task|} {|CS0161:{|CS1983:Foo|}|}()
4849
{
4950
try
5051
{
@@ -57,7 +58,7 @@ public async Task Foo()
5758
}
5859
}
5960
}";
60-
await VerifyCSharpHasNoDiagnosticsAsync(source);
61+
await Verify.VerifyAnalyzerAsync(source);
6162
}
6263

6364
[Fact]
@@ -87,7 +88,7 @@ public void Foo()
8788
}
8889
}
8990
}";
90-
await VerifyCSharpHasNoDiagnosticsAsync(source);
91+
await Verify.VerifyAnalyzerAsync(source);
9192
}
9293
[Fact]
9394
public async Task NotAllowedToReturnOutOfEmtpyCatchBlock()
@@ -106,13 +107,13 @@ public void Foo()
106107
{
107108
// do something
108109
}
109-
catch
110+
[|catch
110111
{
111112
if (x == 1)
112113
throw;
113114
else
114115
return;
115-
}
116+
}|]
116117
}
117118
}
118119
}";
@@ -129,19 +130,19 @@ public void Foo()
129130
{
130131
try
131132
{
132-
// do something
133-
}
134-
catch (Exception ex)
135-
{
136-
if (x == 1)
137-
throw;
138-
else
139-
return;
133+
// do something
140134
}
135+
catch (Exception ex)
136+
{
137+
if (x == 1)
138+
throw;
139+
else
140+
return;
141141
}
142142
}
143+
}
143144
}";
144-
await VerifyCSharpFixAsync(test, fixtest, 0, allowNewCompilerDiagnostics: true);
145+
await Verify.VerifyCodeFixAsync(test, fixtest);
145146
}
146147
[Fact]
147148
public async Task WhenFindCatchEmptyThenPutExceptionClass()
@@ -159,10 +160,10 @@ public void Foo()
159160
{
160161
// do something
161162
}
162-
catch
163+
[|catch
163164
{
164165
int x = 0;
165-
}
166+
}|]
166167
}
167168
}
168169
}";
@@ -180,14 +181,14 @@ public void Foo()
180181
{
181182
// do something
182183
}
183-
catch (Exception ex)
184-
{
185-
int x = 0;
186-
}
184+
catch (Exception ex)
185+
{
186+
int x = 0;
187187
}
188188
}
189+
}
189190
}";
190-
await VerifyCSharpFixAsync(test, fixtest, 0, allowNewCompilerDiagnostics: true);
191+
await Verify.VerifyCodeFixAsync(test, fixtest);
191192
}
192193
[Fact]
193194
public async Task AddCatchEvenIfThereIsReturnInBlock()
@@ -205,11 +206,11 @@ public void Foo()
205206
{
206207
// do something
207208
}
208-
catch
209+
[|catch
209210
{
210211
int x = 0;
211212
return;
212-
}
213+
}|]
213214
}
214215
}
215216
}";
@@ -227,15 +228,15 @@ public void Foo()
227228
{
228229
// do something
229230
}
230-
catch (Exception ex)
231-
{
232-
int x = 0;
233-
return;
234-
}
231+
catch (Exception ex)
232+
{
233+
int x = 0;
234+
return;
235235
}
236236
}
237+
}
237238
}";
238-
await VerifyCSharpFixAsync(test, fixtest, 0, allowNewCompilerDiagnostics: true);
239+
await Verify.VerifyCodeFixAsync(test, fixtest);
239240
}
240241
}
241242
}

‎test/CSharp/CodeCracker.Test/Design/EmptyCatchBlockTests.cs

+33-21
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
namespace CodeCracker.Test.CSharp.Design
66
{
7-
public class EmptyCatchBlockTests : CodeFixVerifier<EmptyCatchBlockAnalyzer, EmptyCatchBlockCodeFixProvider>
7+
using Verify = CSharpCodeFixVerifier<EmptyCatchBlockAnalyzer, EmptyCatchBlockCodeFixProvider>;
8+
9+
public class EmptyCatchBlockTests
810
{
911
readonly string test = @"
1012
using System;
@@ -20,9 +22,9 @@ public async Task Foo()
2022
{
2123
// do something
2224
}
23-
catch
25+
[|catch
2426
{
25-
}
27+
}|]
2628
}
2729
}
2830
}";
@@ -36,7 +38,7 @@ namespace ConsoleApplication1
3638
{
3739
class TypeName
3840
{
39-
public async Task Foo()
41+
public async {|CS0246:Task|} {|CS0161:{|CS1983:Foo|}|}()
4042
{
4143
try
4244
{
@@ -49,7 +51,7 @@ public async Task Foo()
4951
}
5052
}
5153
}";
52-
await VerifyCSharpHasNoDiagnosticsAsync(test);
54+
await Verify.VerifyAnalyzerAsync(test);
5355
}
5456

5557
[Fact]
@@ -72,7 +74,7 @@ public async Task Foo()
7274
}
7375
}
7476
}";
75-
await VerifyCSharpFixAsync(test, fixtest, 0, allowNewCompilerDiagnostics: false, formatBeforeCompare: true);
77+
await Verify.VerifyCodeFixAsync(test, fixtest);
7678
}
7779

7880
[Fact]
@@ -88,15 +90,20 @@ class TypeName
8890
{
8991
public async Task Foo()
9092
{
91-
{
92-
// do something
93-
}
94-
//TODO: Consider reading MSDN Documentation about how to use Try...Catch => http://msdn.microsoft.com/en-us/library/0yd65esw.aspx
93+
{
94+
// do something
9595
}
96+
//TODO: Consider reading MSDN Documentation about how to use Try...Catch => http://msdn.microsoft.com/en-us/library/0yd65esw.aspx
97+
}
9698
}
9799
}";
98100

99-
await VerifyCSharpFixAsync(test, fixtest, 1, allowNewCompilerDiagnostics: false, formatBeforeCompare: true);
101+
await new Verify.Test
102+
{
103+
TestCode = test,
104+
FixedCode = fixtest,
105+
CodeFixIndex = 1,
106+
}.RunAsync();
100107
}
101108

102109
[Fact]
@@ -116,14 +123,19 @@ public async Task Foo()
116123
{
117124
// do something
118125
}
119-
catch (Exception ex)
120-
{
121-
throw;
122-
}
126+
catch (Exception ex)
127+
{
128+
throw;
123129
}
124130
}
131+
}
125132
}";
126-
await VerifyCSharpFixAsync(test, fixtest, 2, allowNewCompilerDiagnostics: true, formatBeforeCompare: true);
133+
await new Verify.Test
134+
{
135+
TestCode = test,
136+
FixedCode = fixtest,
137+
CodeFixIndex = 2,
138+
}.RunAsync();
127139
}
128140

129141

@@ -137,16 +149,16 @@ namespace ConsoleApplication1
137149
{
138150
class TypeName
139151
{
140-
public async Task Foo()
152+
public async {|CS0246:Task|} {|CS0161:{|CS1983:Foo|}|}()
141153
{
142154
int x;
143155
try
144156
{
145157
// do something
146158
}
147-
catch (System.ArgumentException ae)
159+
[|catch (System.ArgumentException ae)
148160
{
149-
}
161+
}|]
150162
catch (System.Exception ex)
151163
{
152164
x = 1;
@@ -162,7 +174,7 @@ namespace ConsoleApplication1
162174
{
163175
class TypeName
164176
{
165-
public async Task Foo()
177+
public async {|CS0246:Task|} {|CS0161:{|CS1983:Foo|}|}()
166178
{
167179
int x;
168180
try
@@ -176,7 +188,7 @@ public async Task Foo()
176188
}
177189
}
178190
}";
179-
await VerifyCSharpFixAsync(test, fixtest, 0);
191+
await Verify.VerifyCodeFixAsync(test, fixtest);
180192
}
181193
}
182194
}

0 commit comments

Comments
 (0)