Add CSharpCodeGenerator tests (#33886)

* Add CSharpCodeGenerator tests
dotnet · Sep 21, 2020 · e489111 · e489111
1 parent 3def004
commit e489111
Show file tree

Hide file tree

Showing 6 changed files with 2,765 additions and 25 deletions.
diff --git a/src/libraries/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs
@@ -518,6 +518,11 @@ private void GenerateNamespace(CodeNamespace e)
 
         private void GenerateStatement(CodeStatement e)
         {
+            if (e == null)
+            {
+                throw new ArgumentNullException(nameof(e));
+            }
+
             if (e.StartDirectives.Count > 0)
             {
                 GenerateDirectives(e.StartDirectives);
@@ -683,26 +688,14 @@ private void GeneratePrimitiveExpression(CodePrimitiveExpression e)
                 Output.Write(((ulong)e.Value).ToString(CultureInfo.InvariantCulture));
                 Output.Write("ul");
             }
-            else
-            {
-                GeneratePrimitiveExpressionBase(e);
-            }
-        }
-
-        private void GeneratePrimitiveExpressionBase(CodePrimitiveExpression e)
-        {
-            if (e.Value == null)
+            else if (e.Value == null)
             {
                 Output.Write(NullToken);
             }
             else if (e.Value is string)
             {
                 Output.Write(QuoteSnippetString((string)e.Value));
             }
-            else if (e.Value is char)
-            {
-                Output.Write("'" + e.Value.ToString() + "'");
-            }
             else if (e.Value is byte)
             {
                 Output.Write(((byte)e.Value).ToString(CultureInfo.InvariantCulture));
@@ -744,7 +737,7 @@ private void GeneratePrimitiveExpressionBase(CodePrimitiveExpression e)
             }
             else
             {
-                throw new ArgumentException(SR.Format(SR.InvalidPrimitiveType, e.Value.GetType()));
+                throw new ArgumentException(SR.Format(SR.InvalidPrimitiveType, e.Value.GetType()), nameof(e));
             }
         }
 
@@ -929,8 +922,8 @@ private void GenerateConditionStatement(CodeConditionStatement e)
             GenerateStatements(e.TrueStatements);
             Indent--;
 
-            CodeStatementCollection falseStatemetns = e.FalseStatements;
-            if (falseStatemetns.Count > 0)
+            CodeStatementCollection falseStatements = e.FalseStatements;
+            if (falseStatements.Count > 0)
             {
                 Output.Write('}');
                 if (_options.ElseOnClosing)
@@ -2557,7 +2550,11 @@ private void GenerateNamespaceImport(CodeNamespaceImport e)
 
         private void GenerateAttributes(CodeAttributeDeclarationCollection attributes, string prefix, bool inLine)
         {
-            if (attributes.Count == 0) return;
+            if (attributes.Count == 0)
+            {
+                return;
+            }
+
             bool paramArray = false;
             foreach (CodeAttributeDeclaration current in attributes)
             {
@@ -2666,12 +2663,17 @@ public void ValidateIdentifier(string value)
         {
             if (!IsValidIdentifier(value))
             {
-                throw new ArgumentException(SR.Format(SR.InvalidIdentifier, value));
+                throw new ArgumentException(SR.Format(SR.InvalidIdentifier, value), nameof(value));
             }
         }
 
         public string CreateValidIdentifier(string name)
         {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
             if (CSharpHelpers.IsPrefixTwoUnderscore(name))
             {
                 name = "_" + name;
@@ -2687,6 +2689,11 @@ public string CreateValidIdentifier(string name)
 
         public string CreateEscapedIdentifier(string name)
         {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
             return CSharpHelpers.CreateEscapedIdentifier(name);
         }
 

diff --git a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs
@@ -1271,8 +1271,8 @@ protected override void GenerateConditionStatement(CodeConditionStatement e)
             GenerateVBStatements(e.TrueStatements);
             Indent--;
 
-            CodeStatementCollection falseStatemetns = e.FalseStatements;
-            if (falseStatemetns.Count > 0)
+            CodeStatementCollection falseStatements = e.FalseStatements;
+            if (falseStatements.Count > 0)
             {
                 Output.Write("Else");
                 Output.WriteLine();

diff --git a/src/libraries/System.CodeDom/src/System/CodeDom/Compiler/CodeValidator.cs b/src/libraries/System.CodeDom/src/System/CodeDom/Compiler/CodeValidator.cs
@@ -547,8 +547,8 @@ private void ValidateConditionStatement(CodeConditionStatement e)
             ValidateExpression(e.Condition);
             ValidateStatements(e.TrueStatements);
 
-            CodeStatementCollection falseStatemetns = e.FalseStatements;
-            if (falseStatemetns.Count > 0)
+            CodeStatementCollection falseStatements = e.FalseStatements;
+            if (falseStatements.Count > 0)
             {
                 ValidateStatements(e.FalseStatements);
             }

diff --git a/...ibraries/System.CodeDom/src/System/CodeDom/Compiler/ExposedTabStringIndentedTextWriter.cs b/...ibraries/System.CodeDom/src/System/CodeDom/Compiler/ExposedTabStringIndentedTextWriter.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.IO;
 
 namespace System.CodeDom.Compiler
@@ -9,7 +10,8 @@ internal sealed class ExposedTabStringIndentedTextWriter : IndentedTextWriter
     {
         public ExposedTabStringIndentedTextWriter(TextWriter writer, string tabString) : base(writer, tabString)
         {
-            TabString = tabString ?? IndentedTextWriter.DefaultTabString;
+            Debug.Assert(tabString != null, "CodeGeneratorOptions can never have a null TabString");
+            TabString = tabString;
         }
 
         internal void InternalOutputTabs()
@@ -46,14 +48,16 @@ internal string IndentationString
 
                     switch (_indent)
                     {
-                        case 0: _s = string.Empty; break;
                         case 1: _s = tabString; break;
                         case 2: _s = tabString + tabString; break;
                         case 3: _s = tabString + tabString + tabString; break;
                         case 4: _s = tabString + tabString + tabString + tabString; break;
                         default:
                             var args = new string[_indent];
-                            for (int i = 0; i < args.Length; i++) args[i] = tabString;
+                            for (int i = 0; i < args.Length; i++)
+                            {
+                                args[i] = tabString;
+                            }
                             return string.Concat(args);
                     }
                 }

diff --git a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj
@@ -29,6 +29,7 @@
     <Compile Include="System\CodeDom\Compiler\CompilerInfoTests.cs" />
     <Compile Include="System\CodeDom\Compiler\CompilerParametersTests.cs" />
     <Compile Include="System\CodeDom\Compiler\CompilerResultsTests.cs" />
+    <Compile Include="System\CodeDom\Compiler\CSharpCodeGeneratorTests.cs" />
     <Compile Include="System\CodeDom\TempFileCollectionTests.cs" />
     <Compile Include="System\CodeDom\CodeObjectCreateExpressionTests.cs" />
     <Compile Include="System\CodeDom\CodeParameterDeclarationExpressionTests.cs" />