Resolve compiler warnings from C# tests

jcoglan · Sep 4, 2023 · 4220f61 · 4220f61
1 parent fc7fb0a
commit 4220f61
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 34 deletions.
diff --git a/test/cs/ChoicesTest.cs b/test/cs/ChoicesTest.cs
@@ -94,11 +94,10 @@ public NodeSpec<Label> node(String text, int offset) {
         }
     }
 
-    #pragma warning disable CS8602
     public class NodeWrapper : Node<Label> {
-        private TreeNode? node;
+        private TreeNode node;
 
-        public NodeWrapper(TreeNode? node) {
+        public NodeWrapper(TreeNode node) {
             this.node = node;
         }
 
@@ -126,5 +125,4 @@ public void toMatch(NodeSpec<Label> spec) {
             spec.assertMatches(this);
         }
     }
-    #pragma warning restore CS8602
 }
diff --git a/test/cs/NodeActionsTest.cs b/test/cs/NodeActionsTest.cs
@@ -272,11 +272,11 @@ public TreeNode make_empty_list(String input, int start, int end, List<TreeNode>
             return null;
         }
     }
-    #pragma warning disable CS0108
+
     public class CustomNode : TreeNode {
         public String type, input;
         public int start, end;
-        public List<TreeNode> elements;
+        new public List<TreeNode> elements;
         public ElementsSpec<Label> elemsSpec = new ElementsSpec<Label>();
 
         public CustomNode(String type, String input, int start, int end) : this(type, input, start, end, null){
@@ -300,7 +300,6 @@ public CustomNode elem(NodeSpec<Label> elem) {
             return this;
         }
     }
-    #pragma warning restore CS0108
 
     public class ParseHelper {
         public Node<Label> expect(TreeNode node) {
@@ -320,11 +319,10 @@ public void assertNode(CustomNode expected, CustomNode actual) {
         }
     }
 
-    #pragma warning disable CS8602
     public class NodeWrapper : Node<Label> {
-        private TreeNode? node;
+        private TreeNode node;
 
-        public NodeWrapper(TreeNode? node) {
+        public NodeWrapper(TreeNode node) {
             this.node = node;
         }
 
@@ -352,5 +350,4 @@ public void toMatch(NodeSpec<Label> spec) {
             spec.assertMatches(this);
         }
     }
-    #pragma warning restore CS8602
 }
diff --git a/test/cs/PredicatesTest.cs b/test/cs/PredicatesTest.cs
@@ -139,11 +139,11 @@ public NodeSpec<Label> node(String text, int offset) {
             return new NodeSpec<Label>(text, offset);
         }
     }
-    #pragma warning disable CS8602
+
     public class NodeWrapper : Node<Label> {
-        private TreeNode? node;
+        private TreeNode node;
 
-        public NodeWrapper(TreeNode? node) {
+        public NodeWrapper(TreeNode node) {
             this.node = node;
         }
 
@@ -171,5 +171,4 @@ public void toMatch(NodeSpec<Label> spec) {
             spec.assertMatches(this);
         }
     }
-    #pragma warning restore CS8602
 }
diff --git a/test/cs/QuantifiersTest.cs b/test/cs/QuantifiersTest.cs
@@ -291,11 +291,11 @@ public NodeSpec<Label> node(String text, int offset) {
             return new NodeSpec<Label>(text, offset);
         }
     }
-    #pragma warning disable CS8602
+
     public class NodeWrapper : Node<Label> {
-        private TreeNode? node;
+        private TreeNode node;
 
-        public NodeWrapper(TreeNode? node) {
+        public NodeWrapper(TreeNode node) {
             this.node = node;
         }
 
@@ -323,5 +323,4 @@ public void toMatch(NodeSpec<Label> spec) {
             spec.assertMatches(this);
         }
     }
-    #pragma warning restore CS8602
 }
diff --git a/test/cs/SequencesTest.cs b/test/cs/SequencesTest.cs
@@ -5,8 +5,7 @@ namespace canopy.sequences {
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     using canopy.test.grammars.sequences;
-    #pragma warning disable CS8600
-    #pragma warning disable CS8604
+
     [TestClass]
     public class SequenceStringsTest : ParseHelper {
         [TestMethod]
@@ -381,6 +380,4 @@ public void toMatch(NodeSpec<Label> spec) {
             spec.assertMatches(this);
         }
     }
-    #pragma warning restore CS8600
-    #pragma warning restore CS8604
 }
diff --git a/test/cs/TerminalsTest.cs b/test/cs/TerminalsTest.cs
@@ -176,11 +176,11 @@ public NodeSpec<Label> node(String text, int offset) {
             return new NodeSpec<Label>(text, offset);
         }
     }
-    #pragma warning disable CS8602
+
     public class NodeWrapper : Node<Label> {
-        private TreeNode? node;
+        private TreeNode node;
 
-        public NodeWrapper(TreeNode? node) {
+        public NodeWrapper(TreeNode node) {
             this.node = node;
         }
 
@@ -207,5 +207,4 @@ public void toMatch(NodeSpec<Label> spec) {
             spec.assertMatches(this);
         }
     }
-    #pragma warning restore CS8602
 }
diff --git a/test/cs/canopy.csproj b/test/cs/canopy.csproj
@@ -12,10 +12,6 @@
     <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
     <PackageReference Include="coverlet.collector" Version="3.1.0" />
 
-    <Compile Include="./helpers/ElementsSpec.cs" />
-    <Compile Include="./helpers/Node.cs" />
-    <Compile Include="./helpers/NodeSpec.cs" />
-
     <Compile Include="../grammars/choices/Actions.cs" />
     <Compile Include="../grammars/choices/CacheRecord.cs" />
     <Compile Include="../grammars/choices/Grammar.cs" />

diff --git a/test/cs/helpers/ElementsSpec.cs b/test/cs/helpers/ElementsSpec.cs
@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 public class ElementsSpec<L> {
-    private List<NodeSpec<L>>? elements = null;
+    private List<NodeSpec<L>> elements;
 
     public void noElems() {
         elements = new List<NodeSpec<L>>();

diff --git a/test/cs/helpers/NodeSpec.cs b/test/cs/helpers/NodeSpec.cs
@@ -5,10 +5,9 @@
 public class NodeSpec<L> {
     private String text_value;
     private int offset_value;
-#pragma warning disable CS8714
     private ElementsSpec<L> elements = new ElementsSpec<L>();
     private Dictionary<L, NodeSpec<L>> labelled = new Dictionary<L, NodeSpec<L>>();
-#pragma warning restore CS8714
+
     public NodeSpec(String text, int offset) {
         this.text_value = text;
         this.offset_value = offset;