Skip to content

Commit 1de65f9

Browse files
JohanLarssonJohanLarsson
committed
Simplify.
1 parent 6995e2e commit 1de65f9

19 files changed

Lines changed: 131 additions & 217 deletions

IDisposableAnalyzers.Test/Helpers/DisposableWalkerTests.Assigns.cs renamed to IDisposableAnalyzers.Test/Helpers/Disposable.Assigns.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Microsoft.CodeAnalysis.CSharp;
77
using NUnit.Framework;
88

9-
public static partial class DisposableWalkerTests
9+
public static partial class DisposableTests
1010
{
1111
public static class Assigns
1212
{
@@ -31,7 +31,7 @@ internal C(IDisposable disposable)
3131
var value = syntaxTree.FindParameter("IDisposable disposable");
3232
var symbol = semanticModel.GetDeclaredSymbol(value, CancellationToken.None);
3333
Assert.AreEqual(true, LocalOrParameter.TryCreate(symbol, out var localOrParameter));
34-
Assert.AreEqual(false, DisposableWalker.Assigns(localOrParameter, semanticModel, CancellationToken.None, out _));
34+
Assert.AreEqual(false, Disposable.Assigns(localOrParameter, semanticModel, CancellationToken.None, out _));
3535
}
3636

3737
[Test]
@@ -56,7 +56,7 @@ internal C(IDisposable disposable)
5656
var value = syntaxTree.FindParameter("IDisposable disposable");
5757
var symbol = semanticModel.GetDeclaredSymbol(value, CancellationToken.None);
5858
Assert.AreEqual(true, LocalOrParameter.TryCreate(symbol, out var localOrParameter));
59-
Assert.AreEqual(false, DisposableWalker.Assigns(localOrParameter, semanticModel, CancellationToken.None, out _));
59+
Assert.AreEqual(false, Disposable.Assigns(localOrParameter, semanticModel, CancellationToken.None, out _));
6060
}
6161

6262
[Test]
@@ -83,7 +83,7 @@ internal C(IDisposable disposable)
8383
var value = syntaxTree.FindParameter("IDisposable disposable");
8484
var symbol = semanticModel.GetDeclaredSymbol(value, CancellationToken.None);
8585
Assert.AreEqual(true, LocalOrParameter.TryCreate(symbol, out var localOrParameter));
86-
Assert.AreEqual(true, DisposableWalker.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
86+
Assert.AreEqual(true, Disposable.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
8787
Assert.AreEqual("N.C.disposable", field.Symbol.ToString());
8888
}
8989

@@ -116,7 +116,7 @@ private void M(IDisposable disposable)
116116
var value = syntaxTree.FindParameter("IDisposable disposable");
117117
var symbol = semanticModel.GetDeclaredSymbol(value, CancellationToken.None);
118118
Assert.AreEqual(true, LocalOrParameter.TryCreate(symbol, out var localOrParameter));
119-
Assert.AreEqual(true, DisposableWalker.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
119+
Assert.AreEqual(true, Disposable.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
120120
Assert.AreEqual("N.C.disposable", field.Symbol.ToString());
121121
}
122122

@@ -145,7 +145,7 @@ internal C(IDisposable disposable)
145145
var value = syntaxTree.FindParameter("IDisposable disposable");
146146
var symbol = semanticModel.GetDeclaredSymbol(value, CancellationToken.None);
147147
Assert.AreEqual(true, LocalOrParameter.TryCreate(symbol, out var localOrParameter));
148-
Assert.AreEqual(true, DisposableWalker.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
148+
Assert.AreEqual(true, Disposable.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
149149
Assert.AreEqual("N.C.disposable", field.Symbol.ToString());
150150
}
151151

@@ -173,7 +173,7 @@ internal C(IDisposable disposable)
173173
var value = syntaxTree.FindParameter("IDisposable disposable");
174174
var symbol = semanticModel.GetDeclaredSymbol(value, CancellationToken.None);
175175
Assert.AreEqual(true, LocalOrParameter.TryCreate(symbol, out var localOrParameter));
176-
Assert.AreEqual(true, DisposableWalker.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
176+
Assert.AreEqual(true, Disposable.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
177177
Assert.AreEqual("N.C.Disposable", field.Symbol.ToString());
178178
}
179179

@@ -206,7 +206,7 @@ private void M(IDisposable arg)
206206
var value = syntaxTree.FindParameter("IDisposable disposable");
207207
var symbol = semanticModel.GetDeclaredSymbol(value, CancellationToken.None);
208208
Assert.AreEqual(true, LocalOrParameter.TryCreate(symbol, out var localOrParameter));
209-
Assert.AreEqual(true, DisposableWalker.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
209+
Assert.AreEqual(true, Disposable.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
210210
Assert.AreEqual("N.C.Disposable", field.Symbol.ToString());
211211
}
212212

@@ -236,7 +236,7 @@ internal C(IDisposable disposable)
236236
var value = syntaxTree.FindParameter("IDisposable disposable");
237237
var symbol = semanticModel.GetDeclaredSymbol(value, CancellationToken.None);
238238
Assert.AreEqual(true, LocalOrParameter.TryCreate(symbol, out var localOrParameter));
239-
Assert.AreEqual(true, DisposableWalker.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
239+
Assert.AreEqual(true, Disposable.Assigns(localOrParameter, semanticModel, CancellationToken.None, out var field));
240240
Assert.AreEqual("N.C.Disposable", field.Symbol.ToString());
241241
}
242242

@@ -274,7 +274,7 @@ public void Dispose()
274274
var compilation = CSharpCompilation.Create("test", new[] { syntaxTree }, MetadataReferences.FromAttributes());
275275
var semanticModel = compilation.GetSemanticModel(syntaxTree);
276276
var value = syntaxTree.FindExpression("File.OpenRead(fileName)");
277-
Assert.AreEqual(true, DisposableWalker.Assigns(value, semanticModel, CancellationToken.None, out var fieldOrProperty));
277+
Assert.AreEqual(true, Disposable.Assigns(value, semanticModel, CancellationToken.None, out var fieldOrProperty));
278278
Assert.AreEqual("disposable", fieldOrProperty.Name);
279279
}
280280

@@ -313,7 +313,7 @@ public void Dispose()
313313
var compilation = CSharpCompilation.Create("test", new[] { syntaxTree }, MetadataReferences.FromAttributes());
314314
var semanticModel = compilation.GetSemanticModel(syntaxTree);
315315
var value = syntaxTree.FindExpression("File.OpenRead(fileName)");
316-
Assert.AreEqual(true, DisposableWalker.Assigns(value, semanticModel, CancellationToken.None, out var fieldOrProperty));
316+
Assert.AreEqual(true, Disposable.Assigns(value, semanticModel, CancellationToken.None, out var fieldOrProperty));
317317
Assert.AreEqual("disposable", fieldOrProperty.Name);
318318
}
319319
}

IDisposableAnalyzers.Test/Helpers/DisposableWalkerTests.DisposedByReturnValue.cs renamed to IDisposableAnalyzers.Test/Helpers/Disposable.DisposedByReturnValue.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.CodeAnalysis.CSharp;
66
using NUnit.Framework;
77

8-
public static partial class DisposableWalkerTests
8+
public static partial class DisposableTests
99
{
1010
public static class DisposedByReturnValue
1111
{
@@ -39,7 +39,7 @@ public void Dispose()
3939
var compilation = CSharpCompilation.Create("test", new[] { syntaxTree }, MetadataReferences.FromAttributes());
4040
var semanticModel = compilation.GetSemanticModel(syntaxTree);
4141
var value = syntaxTree.FindArgument("File.OpenRead(string.Empty)");
42-
Assert.AreEqual(true, DisposableWalker.DisposedByReturnValue(value, semanticModel, CancellationToken.None, out _));
42+
Assert.AreEqual(true, Disposable.DisposedByReturnValue(value, semanticModel, CancellationToken.None, out _));
4343
}
4444
}
4545
}

IDisposableAnalyzers.Test/Helpers/DisposableWalkerTests.Disposes.cs renamed to IDisposableAnalyzers.Test/Helpers/Disposable.Disposes.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.CodeAnalysis.CSharp;
88
using NUnit.Framework;
99

10-
public static partial class DisposableWalkerTests
10+
public static partial class DisposableTests
1111
{
1212
public static class Disposes
1313
{
@@ -33,7 +33,7 @@ internal C(string fileName)
3333
var semanticModel = compilation.GetSemanticModel(syntaxTree);
3434
var value = syntaxTree.FindVariableDeclaration("disposable = File.OpenRead(fileName)");
3535
Assert.AreEqual(true, semanticModel.TryGetSymbol(value, CancellationToken.None, out ILocalSymbol symbol));
36-
Assert.AreEqual(false, DisposableWalker.Disposes(symbol, semanticModel, CancellationToken.None));
36+
Assert.AreEqual(false, Disposable.Disposes(symbol, semanticModel, CancellationToken.None));
3737
}
3838

3939
[TestCase("disposable.Dispose()")]
@@ -62,7 +62,7 @@ internal C(string fileName)
6262
var semanticModel = compilation.GetSemanticModel(syntaxTree);
6363
var value = syntaxTree.FindVariableDeclaration("disposable = File.OpenRead(fileName)");
6464
Assert.AreEqual(true, semanticModel.TryGetSymbol(value, CancellationToken.None, out ILocalSymbol symbol));
65-
Assert.AreEqual(true, DisposableWalker.Disposes(symbol, semanticModel, CancellationToken.None));
65+
Assert.AreEqual(true, Disposable.Disposes(symbol, semanticModel, CancellationToken.None));
6666
}
6767

6868
[Test]
@@ -89,7 +89,7 @@ internal C(string fileName)
8989
var semanticModel = compilation.GetSemanticModel(syntaxTree);
9090
var value = syntaxTree.FindVariableDeclaration("disposable");
9191
Assert.AreEqual(true, semanticModel.TryGetSymbol(value, CancellationToken.None, out ILocalSymbol symbol));
92-
Assert.AreEqual(true, DisposableWalker.Disposes(symbol, semanticModel, CancellationToken.None));
92+
Assert.AreEqual(true, Disposable.Disposes(symbol, semanticModel, CancellationToken.None));
9393
}
9494

9595
[Test]
@@ -114,7 +114,7 @@ internal C(string fileName)
114114
var semanticModel = compilation.GetSemanticModel(syntaxTree);
115115
var value = syntaxTree.FindVariableDeclaration("disposable");
116116
Assert.AreEqual(true, semanticModel.TryGetSymbol(value, CancellationToken.None, out ILocalSymbol symbol));
117-
Assert.AreEqual(true, DisposableWalker.Disposes(symbol, semanticModel, CancellationToken.None));
117+
Assert.AreEqual(true, Disposable.Disposes(symbol, semanticModel, CancellationToken.None));
118118
}
119119

120120
[Test]
@@ -142,7 +142,7 @@ internal C(string fileName)
142142
var semanticModel = compilation.GetSemanticModel(syntaxTree);
143143
var value = syntaxTree.FindVariableDeclaration("disposable = File.OpenRead(fileName)");
144144
Assert.AreEqual(true, semanticModel.TryGetSymbol(value, CancellationToken.None, out ILocalSymbol symbol));
145-
Assert.AreEqual(true, DisposableWalker.Disposes(symbol, semanticModel, CancellationToken.None));
145+
Assert.AreEqual(true, Disposable.Disposes(symbol, semanticModel, CancellationToken.None));
146146
}
147147

148148
[Test]
@@ -169,7 +169,7 @@ public class Winform : Form
169169
var semanticModel = compilation.GetSemanticModel(syntaxTree);
170170
var value = syntaxTree.FindVariableDeclaration("stream = File.OpenRead(string.Empty)");
171171
Assert.AreEqual(true, semanticModel.TryGetSymbol(value, CancellationToken.None, out ILocalSymbol symbol));
172-
Assert.AreEqual(true, DisposableWalker.Disposes(symbol, semanticModel, CancellationToken.None));
172+
Assert.AreEqual(true, Disposable.Disposes(symbol, semanticModel, CancellationToken.None));
173173
}
174174
}
175175
}

0 commit comments

Comments
 (0)