C#: Remove the CIL related parts of the Disposal tests.

Author: michaelnebel

csharp/ql/test/library-tests/commons/Disposal/Class1.cs_

@@ -14,11 +14,11 @@ void IDisposable.Dispose()
         Close();
     }
 
-    public Disposal(IDisposable p1, object p2, System.IO.TextWriter fs)
+    public Disposal(IDisposable p1, object p2, System.IO.TextWriter fs, IDisposable p3)
     {
         field1 = p1;
-        if(p2 is IDisposable d)
+        if (p2 is IDisposable d)
             d.Dispose();
-        DisposalTests.Class1.Dispose(fs);
+        fs.Dispose();
     }
 }

csharp/ql/test/library-tests/commons/Disposal/Disposal.cs

@@ -1,6 +1,3 @@
-| CapturesDisposable(MyType, MyType) | 0 |
-| Dispose(IDisposable) | 0 |
-| DisposesParameter(IDisposable, IDisposable) | 0 |
-| System.Void DisposalTests.Class1.CapturesDisposable(DisposalTests.MyType,DisposalTests.MyType) | 0 |
-| System.Void DisposalTests.Class1.Dispose(System.IDisposable) | 0 |
-| System.Void DisposalTests.Class1.DisposesParameter(System.IDisposable,System.IDisposable) | 0 |
+| Disposal(IDisposable, object, TextWriter, IDisposable) | 0 |
+| Disposal(IDisposable, object, TextWriter, IDisposable) | 1 |
+| Disposal(IDisposable, object, TextWriter, IDisposable) | 2 |

csharp/ql/test/library-tests/commons/Disposal/DisposalTests.dll

@@ -5,5 +5,5 @@ from DotNet::Callable c, DotNet::Parameter param, int p
 where
   mayBeDisposed(param) and
   param = c.getParameter(p) and
-  c.getDeclaringType().hasFullyQualifiedName("DisposalTests", "Class1")
+  c.getDeclaringType().hasFullyQualifiedName("", "Disposal")
 select c.toStringWithTypes(), p

csharp/ql/test/library-tests/commons/Disposal/DisposedFields.expected

@@ -2,4 +2,4 @@
 | Disposal.cs:17:33:17:34 | p1 |
 | Disposal.cs:17:44:17:45 | p2 |
 | Disposal.cs:17:69:17:70 | fs |
-| Disposal.cs:20:30:20:30 | d |
+| Disposal.cs:20:31:20:31 | d |

csharp/ql/test/library-tests/commons/Disposal/DisposedFields.ql

@@ -1,4 +1 @@
-| CapturesDisposable(MyType, MyType) | 1 |
-| DisposesParameter(IDisposable, IDisposable) | 1 |
-| System.Void DisposalTests.Class1.CapturesDisposable(DisposalTests.MyType,DisposalTests.MyType) | 1 |
-| System.Void DisposalTests.Class1.DisposesParameter(System.IDisposable,System.IDisposable) | 1 |
+| Disposal(IDisposable, object, TextWriter, IDisposable) | 3 |

csharp/ql/test/library-tests/commons/Disposal/DisposedParameter.expected

@@ -6,5 +6,5 @@ from DotNet::Callable c, DotNet::Parameter param, int p
 where
   not mayBeDisposed(param) and
   param = c.getParameter(p) and
-  c.getDeclaringType().hasFullyQualifiedName("DisposalTests", "Class1")
+  c.getDeclaringType().hasFullyQualifiedName("", "Disposal")
 select c.toStringWithTypes(), p