Skip to content

Commit 76c12a5

Browse files
committed
C#: Convert tests for cs/dereferenced-value-may-be-null to use inline expectations.
1 parent 46c02e7 commit 76c12a5

File tree

8 files changed

+131
-130
lines changed

8 files changed

+131
-130
lines changed

csharp/ql/test/query-tests/Nullness/C.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ public void AssertNullTest()
5959

6060
public void AssertNotNullTest()
6161
{
62-
var o1 = Maybe() ? null : new object();
62+
var o1 = Maybe() ? null : new object(); // $ Source[cs/dereferenced-value-may-be-null]
6363
AssertNonNull(o1);
64-
o1.ToString(); // GOOD (false positive)
64+
o1.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
6565

66-
var o2 = Maybe() ? null : new object();
66+
var o2 = Maybe() ? null : new object(); // $ Source[cs/dereferenced-value-may-be-null]
6767
AssertNonNull(o1);
68-
o2.ToString(); // BAD (maybe)
68+
o2.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
6969

7070
var o3 = Maybe() ? null : new object();
7171
Assert.IsNotNull(o3);
@@ -91,16 +91,16 @@ public void InstanceOf()
9191

9292
public void Lock()
9393
{
94-
var o = Maybe() ? null : new object();
95-
lock (o) // BAD (maybe)
94+
var o = Maybe() ? null : new object(); // $ Source[cs/dereferenced-value-may-be-null]
95+
lock (o) // $ Alert[cs/dereferenced-value-may-be-null]
9696
o.ToString(); // GOOD
9797
}
9898

9999
public void Foreach(IEnumerable<int> list)
100100
{
101101
if (Maybe())
102-
list = null;
103-
foreach (var x in list) // BAD (maybe)
102+
list = null; // $ Source[cs/dereferenced-value-may-be-null]
103+
foreach (var x in list) // $ Alert[cs/dereferenced-value-may-be-null]
104104
{
105105
x.ToString(); // GOOD
106106
list.ToString(); // GOOD
@@ -174,8 +174,8 @@ public void DoWhile()
174174
s = "";
175175
do
176176
{
177-
s.ToString(); // BAD (maybe)
178-
s = null;
177+
s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
178+
s = null; // $ Source[cs/dereferenced-value-may-be-null]
179179
}
180180
while (true);
181181
}
@@ -200,8 +200,8 @@ public void While()
200200
s = "";
201201
while (true)
202202
{
203-
s.ToString(); // BAD (maybe)
204-
s = null;
203+
s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
204+
s = null; // $ Source[cs/dereferenced-value-may-be-null]
205205
}
206206
}
207207

@@ -219,8 +219,8 @@ public void If()
219219

220220
s = "";
221221
if (s != null && s.Length % 2 == 0)
222-
s = null;
223-
s.ToString(); // BAD (maybe)
222+
s = null; // $ Source[cs/dereferenced-value-may-be-null]
223+
s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
224224
}
225225

226226
public void For()
@@ -237,9 +237,9 @@ public void For()
237237
s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
238238
}
239239

240-
for (s = ""; ; s = null)
240+
for (s = ""; ; s = null) // $ Source[cs/dereferenced-value-may-be-null]
241241
{
242-
s.ToString(); // BAD (maybe)
242+
s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
243243
}
244244
}
245245

0 commit comments

Comments
 (0)