Use standard names in tests.

JohanLarsson · JohanLarsson · commit 51624cb160eb · 2019-12-05T10:45:08.000+01:00
diff --git a/IDisposableAnalyzers.Test/Helpers/Disposable.Disposes.cs b/IDisposableAnalyzers.Test/Helpers/Disposable.Disposes.cs
@@ -149,7 +149,7 @@ internal C(string fileName)
             public static void WhenAddedToFormComponents()
             {
                 var code = @"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
diff --git a/IDisposableAnalyzers.Test/Helpers/DisposableMemberTests.cs b/IDisposableAnalyzers.Test/Helpers/DisposableMemberTests.cs
@@ -75,7 +75,7 @@ protected override void M()
         public static void FieldAddedToFormComponents(string expression)
         {
             var syntaxTree = CSharpSyntaxTree.ParseText(@"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
diff --git a/IDisposableAnalyzers.Test/IDISP001DisposeCreatedTests/Valid.Winforms.cs b/IDisposableAnalyzers.Test/IDISP001DisposeCreatedTests/Valid.Winforms.cs
@@ -0,0 +1,56 @@
+﻿namespace IDisposableAnalyzers.Test.IDISP001DisposeCreatedTests
+{
+    using Gu.Roslyn.Asserts;
+    using NUnit.Framework;
+
+    public static partial class Valid<T>
+    {
+        [TestCase("this.components.Add(stream)")]
+        [TestCase("components.Add(stream)")]
+        public static void LocalAddedToFormComponents(string expression)
+        {
+            var code = @"
+namespace N
+{
+    using System.IO;
+    using System.Windows.Forms;
+
+    public class Winform : Form
+    {
+        Winform()
+        {
+            var stream = File.OpenRead(string.Empty);
+            // Since this is added to components, it is automatically disposed of with the form.
+            this.components.Add(stream);
+        }
+    }
+}".AssertReplace("this.components.Add(stream)", expression);
+            RoslynAssert.NoAnalyzerDiagnostics(Analyzer, code);
+        }
+
+        [TestCase("this.components.Add(this.stream)")]
+        [TestCase("components.Add(stream)")]
+        public static void FieldAddedToFormComponents(string expression)
+        {
+            var code = @"
+namespace N
+{
+    using System.IO;
+    using System.Windows.Forms;
+
+    public class Winform : Form
+    {
+        private readonly Stream stream;
+
+        Winform()
+        {
+            this.stream = File.OpenRead(string.Empty);
+            // Since this is added to components, it is automatically disposed of with the form.
+            this.components.Add(this.stream);
+        }
+    }
+}".AssertReplace("this.components.Add(this.stream)", expression);
+            RoslynAssert.NoAnalyzerDiagnostics(Analyzer, code);
+        }
+    }
+}
diff --git a/IDisposableAnalyzers.Test/IDISP001DisposeCreatedTests/Valid.cs b/IDisposableAnalyzers.Test/IDISP001DisposeCreatedTests/Valid.cs
@@ -586,53 +586,5 @@ public Pair(T item1, T item2)
 
             RoslynAssert.Valid(Analyzer, code);
         }
-
-        [TestCase("this.components.Add(stream)")]
-        [TestCase("components.Add(stream)")]
-        public static void LocalAddedToFormComponents(string expression)
-        {
-            var code = @"
-namespace ValidCode
-{
-    using System.IO;
-    using System.Windows.Forms;
-
-    public class Winform : Form
-    {
-        Winform()
-        {
-            var stream = File.OpenRead(string.Empty);
-            // Since this is added to components, it is automatically disposed of with the form.
-            this.components.Add(stream);
-        }
-    }
-}".AssertReplace("this.components.Add(stream)", expression);
-            RoslynAssert.NoAnalyzerDiagnostics(Analyzer, code);
-        }
-
-        [TestCase("this.components.Add(this.stream)")]
-        [TestCase("components.Add(stream)")]
-        public static void FieldAddedToFormComponents(string expression)
-        {
-            var code = @"
-namespace ValidCode
-{
-    using System.IO;
-    using System.Windows.Forms;
-
-    public class Winform : Form
-    {
-        private readonly Stream stream;
-
-        Winform()
-        {
-            this.stream = File.OpenRead(string.Empty);
-            // Since this is added to components, it is automatically disposed of with the form.
-            this.components.Add(this.stream);
-        }
-    }
-}".AssertReplace("this.components.Add(this.stream)", expression);
-            RoslynAssert.NoAnalyzerDiagnostics(Analyzer, code);
-        }
     }
 }
diff --git a/IDisposableAnalyzers.Test/IDISP002DisposeMemberTests/Valid.cs b/IDisposableAnalyzers.Test/IDISP002DisposeMemberTests/Valid.cs
@@ -881,7 +881,7 @@ public void TearDown()
         public static void Issue150()
         {
             var code = @"
-namespace ValidCode
+namespace N
 {
     using System.Collections.Generic;
     using System.IO;
@@ -1070,7 +1070,7 @@ protected override void M()
         public static void LocalAddedToFormComponents(string expression)
         {
             var code = @"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
@@ -1093,7 +1093,7 @@ public class Winform : Form
         public static void FieldAddedToFormComponents(string expression)
         {
             var code = @"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
diff --git a/IDisposableAnalyzers.Test/IDISP003DisposeBeforeReassigningTests/Valid.cs b/IDisposableAnalyzers.Test/IDISP003DisposeBeforeReassigningTests/Valid.cs
@@ -1413,7 +1413,7 @@ public C1 GetOrCreateFoo()
         public static void LocalAddedToFormComponents(string expression)
         {
             var code = @"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
@@ -1436,7 +1436,7 @@ public class Winform : Form
         public static void FieldAddedToFormComponents(string expression)
         {
             var code = @"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
diff --git a/IDisposableAnalyzers.Test/IDISP004DoNotIgnoreCreatedTests/Valid.cs b/IDisposableAnalyzers.Test/IDISP004DoNotIgnoreCreatedTests/Valid.cs
@@ -796,7 +796,7 @@ public async Task M()
         public static void LocalAddedToFormComponents(string expression)
         {
             var code = @"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
@@ -819,7 +819,7 @@ public class Winform : Form
         public static void FieldAddedToFormComponents(string expression)
         {
             var code = @"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
diff --git a/IDisposableAnalyzers.Test/IDISP006ImplementIDisposableTests/ValidCode.Inheritance.cs b/IDisposableAnalyzers.Test/IDISP006ImplementIDisposableTests/ValidCode.Inheritance.cs
@@ -219,7 +219,7 @@ protected override void M()
             public static void LocalAddedToFormComponents(string expression)
             {
                 var code = @"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
@@ -242,7 +242,7 @@ public class Winform : Form
             public static void FieldAddedToFormComponents(string expression)
             {
                 var code = @"
-namespace ValidCode
+namespace N
 {
     using System.IO;
     using System.Windows.Forms;
diff --git a/IDisposableAnalyzers.Test/IDISP006ImplementIDisposableTests/ValidCode.Repro.cs b/IDisposableAnalyzers.Test/IDISP006ImplementIDisposableTests/ValidCode.Repro.cs
@@ -125,7 +125,7 @@ public void Dispose()
             public static void Issue150()
             {
                 var code = @"
-namespace ValidCode
+namespace N
 {
     using System.Collections.Generic;
     using System.IO;

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ internal C(string fileName)`
`149`	`149`	`public static void WhenAddedToFormComponents()`
`150`	`150`	`{`
`151`	`151`	`var code = @"`
`152`		`-namespace ValidCode`
	`152`	`+namespace N`
`153`	`153`	`{`
`154`	`154`	`using System.IO;`
`155`	`155`	`using System.Windows.Forms;`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ protected override void M()`
`75`	`75`	`public static void FieldAddedToFormComponents(string expression)`
`76`	`76`	`{`
`77`	`77`	`var syntaxTree = CSharpSyntaxTree.ParseText(@"`
`78`		`-namespace ValidCode`
	`78`	`+namespace N`
`79`	`79`	`{`
`80`	`80`	`using System.IO;`
`81`	`81`	`using System.Windows.Forms;`
Original file line number	Diff line number	Diff line change
`@@ -881,7 +881,7 @@ public void TearDown()`
`881`	`881`	`public static void Issue150()`
`882`	`882`	`{`
`883`	`883`	`var code = @"`
`884`		`-namespace ValidCode`
	`884`	`+namespace N`
`885`	`885`	`{`
`886`	`886`	`using System.Collections.Generic;`
`887`	`887`	`using System.IO;`
`@@ -1070,7 +1070,7 @@ protected override void M()`
`1070`	`1070`	`public static void LocalAddedToFormComponents(string expression)`
`1071`	`1071`	`{`
`1072`	`1072`	`var code = @"`
`1073`		`-namespace ValidCode`
	`1073`	`+namespace N`
`1074`	`1074`	`{`
`1075`	`1075`	`using System.IO;`
`1076`	`1076`	`using System.Windows.Forms;`
`@@ -1093,7 +1093,7 @@ public class Winform : Form`
`1093`	`1093`	`public static void FieldAddedToFormComponents(string expression)`
`1094`	`1094`	`{`
`1095`	`1095`	`var code = @"`
`1096`		`-namespace ValidCode`
	`1096`	`+namespace N`
`1097`	`1097`	`{`
`1098`	`1098`	`using System.IO;`
`1099`	`1099`	`using System.Windows.Forms;`
Original file line number	Diff line number	Diff line change
`@@ -1413,7 +1413,7 @@ public C1 GetOrCreateFoo()`
`1413`	`1413`	`public static void LocalAddedToFormComponents(string expression)`
`1414`	`1414`	`{`
`1415`	`1415`	`var code = @"`
`1416`		`-namespace ValidCode`
	`1416`	`+namespace N`
`1417`	`1417`	`{`
`1418`	`1418`	`using System.IO;`
`1419`	`1419`	`using System.Windows.Forms;`
`@@ -1436,7 +1436,7 @@ public class Winform : Form`
`1436`	`1436`	`public static void FieldAddedToFormComponents(string expression)`
`1437`	`1437`	`{`
`1438`	`1438`	`var code = @"`
`1439`		`-namespace ValidCode`
	`1439`	`+namespace N`
`1440`	`1440`	`{`
`1441`	`1441`	`using System.IO;`
`1442`	`1442`	`using System.Windows.Forms;`
Original file line number	Diff line number	Diff line change
`@@ -796,7 +796,7 @@ public async Task M()`
`796`	`796`	`public static void LocalAddedToFormComponents(string expression)`
`797`	`797`	`{`
`798`	`798`	`var code = @"`
`799`		`-namespace ValidCode`
	`799`	`+namespace N`
`800`	`800`	`{`
`801`	`801`	`using System.IO;`
`802`	`802`	`using System.Windows.Forms;`
`@@ -819,7 +819,7 @@ public class Winform : Form`
`819`	`819`	`public static void FieldAddedToFormComponents(string expression)`
`820`	`820`	`{`
`821`	`821`	`var code = @"`
`822`		`-namespace ValidCode`
	`822`	`+namespace N`
`823`	`823`	`{`
`824`	`824`	`using System.IO;`
`825`	`825`	`using System.Windows.Forms;`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ protected override void M()`
`219`	`219`	`public static void LocalAddedToFormComponents(string expression)`
`220`	`220`	`{`
`221`	`221`	`var code = @"`
`222`		`-namespace ValidCode`
	`222`	`+namespace N`
`223`	`223`	`{`
`224`	`224`	`using System.IO;`
`225`	`225`	`using System.Windows.Forms;`
`@@ -242,7 +242,7 @@ public class Winform : Form`
`242`	`242`	`public static void FieldAddedToFormComponents(string expression)`
`243`	`243`	`{`
`244`	`244`	`var code = @"`
`245`		`-namespace ValidCode`
	`245`	`+namespace N`
`246`	`246`	`{`
`247`	`247`	`using System.IO;`
`248`	`248`	`using System.Windows.Forms;`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public void Dispose()`
`125`	`125`	`public static void Issue150()`
`126`	`126`	`{`
`127`	`127`	`var code = @"`
`128`		`-namespace ValidCode`
	`128`	`+namespace N`
`129`	`129`	`{`
`130`	`130`	`using System.Collections.Generic;`
`131`	`131`	`using System.IO;`