diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs index b77f0807dc56f1557bd8eec1d92695bad8500fa8..0268f9846e4ae65f94625e3346d4dfe61aae5340 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs @@ -2778,7 +2778,9 @@ public void Clone_01() Assert.True(clone.ContainingType.IsSealed); Assert.True(clone.ContainingType.IsAbstract); - Assert.Equal("record C1", comp.GlobalNamespace.GetTypeMember("C1") + var namedTypeSymbol = comp.GlobalNamespace.GetTypeMember("C1"); + Assert.True(namedTypeSymbol.IsRecord); + Assert.Equal("record C1", namedTypeSymbol .ToDisplayString(SymbolDisplayFormat.TestFormat.AddKindOptions(SymbolDisplayKindOptions.IncludeTypeKeyword))); } @@ -2807,7 +2809,9 @@ public void Clone_02() Assert.True(clone.ContainingType.IsSealed); Assert.True(clone.ContainingType.IsAbstract); - Assert.Equal("record C1", comp.GlobalNamespace.GetTypeMember("C1") + var namedTypeSymbol = comp.GlobalNamespace.GetTypeMember("C1"); + Assert.True(namedTypeSymbol.IsRecord); + Assert.Equal("record C1", namedTypeSymbol .ToDisplayString(SymbolDisplayFormat.TestFormat.AddKindOptions(SymbolDisplayKindOptions.IncludeTypeKeyword))); } @@ -2864,7 +2868,9 @@ public void Clone_04() Assert.True(clone.ContainingType.IsSealed); Assert.True(clone.ContainingType.IsAbstract); - Assert.Equal("record C1", comp.GlobalNamespace.GetTypeMember("C1") + var namedTypeSymbol = comp.GlobalNamespace.GetTypeMember("C1"); + Assert.True(namedTypeSymbol.IsRecord); + Assert.Equal("record C1", namedTypeSymbol .ToDisplayString(SymbolDisplayFormat.TestFormat.AddKindOptions(SymbolDisplayKindOptions.IncludeTypeKeyword))); } @@ -3064,7 +3070,9 @@ static void Main() Diagnostic(ErrorCode.ERR_NoSingleCloneMethod, "new A()").WithArguments("A").WithLocation(6, 15) ); - Assert.Equal("class A", comp.GlobalNamespace.GetTypeMember("A") + var namedTypeSymbol = comp.GlobalNamespace.GetTypeMember("A"); + Assert.True(namedTypeSymbol.IsRecord); + Assert.Equal("class A", namedTypeSymbol .ToDisplayString(SymbolDisplayFormat.TestFormat.AddKindOptions(SymbolDisplayKindOptions.IncludeTypeKeyword))); } @@ -7615,6 +7623,7 @@ public static void Main() var withExpr = root.DescendantNodes().OfType().Single(); var typeInfo = model.GetTypeInfo(withExpr); var c = comp.GlobalNamespace.GetTypeMember("C"); + Assert.True(c.IsRecord); Assert.True(c.ISymbol.Equals(typeInfo.Type)); var x = c.GetMembers("X").Single(); @@ -24147,6 +24156,7 @@ public void RecordLoadedInVisualBasicDisplaysAsClass() var compRef = CreateCompilation(src).EmitToImageReference(); var vbComp = CreateVisualBasicCompilation("", referencedAssemblies: new[] { compRef }); var symbol = vbComp.GlobalNamespace.GetTypeMember("A"); + Assert.False(symbol.IsRecord); Assert.Equal("class A", SymbolDisplay.ToDisplayString(symbol, SymbolDisplayFormat.TestFormat.AddKindOptions(SymbolDisplayKindOptions.IncludeTypeKeyword))); }