From 59f4e90a99e082565f2d1613ebea99b20e4eac37 Mon Sep 17 00:00:00 2001
From: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date: Thu, 6 Oct 2022 02:13:43 +0200
Subject: [PATCH] Fix tests after reverting

---
 AssignAll/AssignAll.Test/UnitTests.cs         | 63 ++++++++++---------
 Samples.ConsoleNet6/Base.cs                   |  8 ---
 Samples.ConsoleNet6/Derived.cs                |  8 ---
 Samples.ConsoleNet6/Example004_Inheritance.cs | 14 +++++
 4 files changed, 46 insertions(+), 47 deletions(-)
 delete mode 100644 Samples.ConsoleNet6/Base.cs
 delete mode 100644 Samples.ConsoleNet6/Derived.cs

diff --git a/AssignAll/AssignAll.Test/UnitTests.cs b/AssignAll/AssignAll.Test/UnitTests.cs
index aef7be7..0c96d0b 100644
--- a/AssignAll/AssignAll.Test/UnitTests.cs
+++ b/AssignAll/AssignAll.Test/UnitTests.cs
@@ -533,7 +533,7 @@ public async Task FileWithTopLevelStatements_AddsDiagnostic()
         {
             var test = @"
 // AssignAll enable
-var foo = {|#0:new Foo
+var foo = {|#0:new Program.Foo
 {
     // PropInt and PropString not assigned, diagnostic error
 }|#0};
@@ -541,7 +541,7 @@ public async Task FileWithTopLevelStatements_AddsDiagnostic()
 // Add methods and nested types available to top level statements via a partial Program class.
 public static partial class Program
 {
-    private class Foo
+    internal class Foo
     {
         public int PropInt { get; set; }
         public string PropString { get; set; }
@@ -673,39 +673,40 @@ public async Task Inheritance_AnalyzesMembersOfBaseTypes()
             var test = @"
 // AssignAll enable
 // EXAMPLE 004 - Analyzer should also consider public members from any base types.
-namespace Samples.ConsoleNet6;
-
-public static class Example004_Inheritance
+namespace Samples.ConsoleNet6
 {
-    public static void Irrelevant()
+    public static class Example004_Inheritance
     {
-        // This should give analyzer error:
-        // Missing member assignments in object initializer for type 'Derived'. Properties: BasePropUnassigned, DerivedPropUnassigned
-        var foo = {|#0:new Derived
-        {
-            // Commented assignments after opening brace.
-            // BasePropCommented = ,
-            // DerivedPropCommented = ,
-
-            // Assigned property, OK by analyzer
-            BasePropAssigned = 1,
-            DerivedPropAssigned = 1,
-        }|#0};
-    }
-}
+        public static void Irrelevant()
+        {
+            // This should give analyzer error:
+            // Missing member assignments in object initializer for type 'Derived'. Properties: BasePropUnassigned, DerivedPropUnassigned
+            var foo = {|#0:new Derived
+            {
+                // Commented assignments after opening brace.
+                // BasePropCommented = ,
+                // DerivedPropCommented = ,
 
-internal class Base
-{
-    public int BasePropAssigned { get; set; }
-    public int BasePropCommented { get; set; }
-    public int BasePropUnassigned { get; set; }
-}
+                // Assigned property, OK by analyzer
+                BasePropAssigned = 1,
+                DerivedPropAssigned = 1,
+            }|#0};
+        }
 
-internal class Derived : Base
-{
-    public int DerivedPropAssigned { get; set; }
-    public int DerivedPropCommented { get; set; }
-    public int DerivedPropUnassigned { get; set; }
+        private class Base
+        {
+            public int BasePropAssigned { get; set; }
+            public int BasePropCommented { get; set; }
+            public int BasePropUnassigned { get; set; }
+        }
+
+        private class Derived : Base
+        {
+            public int DerivedPropAssigned { get; set; }
+            public int DerivedPropCommented { get; set; }
+            public int DerivedPropUnassigned { get; set; }
+        }
+    }
 }
 ";
 
diff --git a/Samples.ConsoleNet6/Base.cs b/Samples.ConsoleNet6/Base.cs
deleted file mode 100644
index 1ac7f89..0000000
--- a/Samples.ConsoleNet6/Base.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Samples.ConsoleNet6;
-
-internal class Base
-{
-    public int BasePropAssigned { get; set; }
-    public int BasePropCommented { get; set; }
-    public int BasePropUnassigned { get; set; }
-}
\ No newline at end of file
diff --git a/Samples.ConsoleNet6/Derived.cs b/Samples.ConsoleNet6/Derived.cs
deleted file mode 100644
index 707ba9a..0000000
--- a/Samples.ConsoleNet6/Derived.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Samples.ConsoleNet6;
-
-internal class Derived : Base
-{
-    public int DerivedPropAssigned { get; set; }
-    public int DerivedPropCommented { get; set; }
-    public int DerivedPropUnassigned { get; set; }
-}
\ No newline at end of file
diff --git a/Samples.ConsoleNet6/Example004_Inheritance.cs b/Samples.ConsoleNet6/Example004_Inheritance.cs
index cc58401..6094dfd 100644
--- a/Samples.ConsoleNet6/Example004_Inheritance.cs
+++ b/Samples.ConsoleNet6/Example004_Inheritance.cs
@@ -19,4 +19,18 @@ public static void Irrelevant()
             DerivedPropAssigned = 1,
         };
     }
+
+    private class Base
+    {
+        public int BasePropAssigned { get; set; }
+        public int BasePropCommented { get; set; }
+        public int BasePropUnassigned { get; set; }
+    }
+
+    private class Derived : Base
+    {
+        public int DerivedPropAssigned { get; set; }
+        public int DerivedPropCommented { get; set; }
+        public int DerivedPropUnassigned { get; set; }
+    }
 }