Fill out all tests

dotnet · Dec 21, 2022 · f936bbc · f936bbc
1 parent f3905fa
commit f936bbc
Show file tree

Hide file tree

Showing 3 changed files with 627 additions and 52 deletions.
diff --git a/src/Compilers/Test/Core/CommonTestBase.cs b/src/Compilers/Test/Core/CommonTestBase.cs
@@ -14,6 +14,7 @@
 using System.Text;
 using System.Xml.Linq;
 using Microsoft.CodeAnalysis.CodeGen;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
 using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE;
 using Microsoft.CodeAnalysis.Emit;
 using Microsoft.CodeAnalysis.Operations;
@@ -302,9 +303,33 @@ protected CSharp.CSharpCompilation CreateCSharpCompilation(
             IEnumerable<MetadataReference> referencedAssemblies = null,
             IEnumerable<Compilation> referencedCompilations = null)
         {
+            return CreateCSharpCompilation(assemblyName, assemblyIdentity: null, code, parseOptions, compilationOptions, referencedAssemblies, referencedCompilations);
+        }
+
+        protected CSharp.CSharpCompilation CreateCSharpCompilation(
+            AssemblyIdentity assemblyIdentity,
+            string code,
+            CSharp.CSharpParseOptions parseOptions = null,
+            CSharp.CSharpCompilationOptions compilationOptions = null,
+            IEnumerable<MetadataReference> referencedAssemblies = null,
+            IEnumerable<Compilation> referencedCompilations = null)
+        {
+            return CreateCSharpCompilation(assemblyName: null, assemblyIdentity, code, parseOptions, compilationOptions, referencedAssemblies, referencedCompilations);
+        }
+
+        private CSharp.CSharpCompilation CreateCSharpCompilation(
+            string assemblyName,
+            AssemblyIdentity assemblyIdentity,
+            string code,
+            CSharp.CSharpParseOptions parseOptions = null,
+            CSharp.CSharpCompilationOptions compilationOptions = null,
+            IEnumerable<MetadataReference> referencedAssemblies = null,
+            IEnumerable<Compilation> referencedCompilations = null)
+        {
+            Debug.Assert(assemblyName == null || assemblyIdentity == null || assemblyIdentity.Name == assemblyName);
             if (assemblyName == null)
             {
-                assemblyName = GetUniqueName();
+                assemblyName = assemblyIdentity?.Name ?? GetUniqueName();
             }
 
             if (parseOptions == null)
@@ -336,7 +361,14 @@ protected CSharp.CSharpCompilation CreateCSharpCompilation(
 
             var tree = CSharp.SyntaxFactory.ParseSyntaxTree(SourceText.From(code, encoding: null, SourceHashAlgorithms.Default), options: parseOptions);
 
-            return CSharp.CSharpCompilation.Create(assemblyName, new[] { tree }, references, compilationOptions);
+            var compilation = CSharp.CSharpCompilation.Create(assemblyName, new[] { tree }, references, compilationOptions);
+
+            if (assemblyIdentity != null)
+            {
+                ((SourceAssemblySymbol)compilation.Assembly).lazyAssemblyIdentity = assemblyIdentity;
+            }
+
+            return compilation;
         }
 
         protected VisualBasic.VisualBasicCompilation CreateVisualBasicCompilation(

diff --git a/src/Compilers/Test/Utilities/VisualBasic/CompilationTestUtils.vb b/src/Compilers/Test/Utilities/VisualBasic/CompilationTestUtils.vb
@@ -947,7 +947,7 @@ Friend Module CompilationUtils
             actualLine = actualReader.ReadLine()
         End While
 
-        Assert.Equal(expectedPooledBuilder.ToStringAndFree(), actualPooledBuilder.ToStringAndFree())
+        AssertEx.Equal(expectedPooledBuilder.ToStringAndFree(), actualPooledBuilder.ToStringAndFree())
     End Sub
 
     ' There are certain cases where multiple distinct errors are