From 9b38141a5bee1c4caa9dd74016bd727aaaff06f0 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Wed, 2 Sep 2020 11:20:34 -0700 Subject: [PATCH 1/2] Fix source file encoding --- samples/CSharp/SolutionExplorer/Properties/AssemblyInfo.cs | 2 +- .../ConvertToAutoProperty.Vsix/My Project/AssemblyInfo.vb | 1 + .../My Project/AssemblyInfo.vb | 1 + .../RemoveByVal/RemoveByVal.Vsix/My Project/AssemblyInfo.vb | 1 + .../Roslyn.SDK/ItemTemplates/CSharp/Analyzer/Analyzer.cs | 2 +- .../Roslyn.SDK/ItemTemplates/CSharp/CodeFix/CodeFix.cs | 2 +- .../Roslyn.SDK/ItemTemplates/CSharp/Refactoring/Refactoring.cs | 2 +- .../Roslyn.SDK/ItemTemplates/VisualBasic/Analyzer/Analyzer.vb | 2 +- .../Roslyn.SDK/ItemTemplates/VisualBasic/CodeFix/CodeFix.vb | 2 +- .../ItemTemplates/VisualBasic/Refactoring/Refactoring.vb | 2 +- .../CSharp/CodeRefactoring/Ref/CodeRefactoringProvider.cs | 2 +- .../ProjectTemplates/CSharp/ConsoleApplication/Program.cs | 2 +- .../CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.cs | 2 +- .../CSharp/Diagnostic/Analyzer/Resources.Designer.cs | 2 +- .../VisualBasic/CodeRefactoring/Ref/CodeRefactoringProvider.vb | 2 +- .../VisualBasic/CodeRefactoring/Vsix/AssemblyInfo.vb | 1 + .../Roslyn.SyntaxVisualizer.Control/SyntaxKindHelper.cs | 2 +- .../Roslyn.SyntaxVisualizer.Extension/GuidList.cs | 2 +- .../Roslyn.SyntaxVisualizer.Extension/PkgCmdIDList.cs | 2 +- 19 files changed, 19 insertions(+), 15 deletions(-) diff --git a/samples/CSharp/SolutionExplorer/Properties/AssemblyInfo.cs b/samples/CSharp/SolutionExplorer/Properties/AssemblyInfo.cs index d81045c1c3..c16eabac9e 100644 --- a/samples/CSharp/SolutionExplorer/Properties/AssemblyInfo.cs +++ b/samples/CSharp/SolutionExplorer/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/samples/VisualBasic/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/My Project/AssemblyInfo.vb b/samples/VisualBasic/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/My Project/AssemblyInfo.vb index e69de29bb2..5f282702bb 100644 --- a/samples/VisualBasic/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/My Project/AssemblyInfo.vb +++ b/samples/VisualBasic/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/My Project/AssemblyInfo.vb @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/samples/VisualBasic/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/My Project/AssemblyInfo.vb b/samples/VisualBasic/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/My Project/AssemblyInfo.vb index e69de29bb2..5f282702bb 100644 --- a/samples/VisualBasic/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/My Project/AssemblyInfo.vb +++ b/samples/VisualBasic/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/My Project/AssemblyInfo.vb @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/samples/VisualBasic/RemoveByVal/RemoveByVal.Vsix/My Project/AssemblyInfo.vb b/samples/VisualBasic/RemoveByVal/RemoveByVal.Vsix/My Project/AssemblyInfo.vb index e69de29bb2..5f282702bb 100644 --- a/samples/VisualBasic/RemoveByVal/RemoveByVal.Vsix/My Project/AssemblyInfo.vb +++ b/samples/VisualBasic/RemoveByVal/RemoveByVal.Vsix/My Project/AssemblyInfo.vb @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/Analyzer/Analyzer.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/Analyzer/Analyzer.cs index fd52005aa7..abbe4d7ed0 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/Analyzer/Analyzer.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/Analyzer/Analyzer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/CodeFix/CodeFix.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/CodeFix/CodeFix.cs index 489b3743ed..36af2f56d1 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/CodeFix/CodeFix.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/CodeFix/CodeFix.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Composition; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/Refactoring/Refactoring.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/Refactoring/Refactoring.cs index 82f7511244..e5b04f7e31 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/Refactoring/Refactoring.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/CSharp/Refactoring/Refactoring.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Composition; using System.Collections.Generic; using System.Linq; diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/Analyzer/Analyzer.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/Analyzer/Analyzer.vb index 34725d49c9..87ea8f188b 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/Analyzer/Analyzer.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/Analyzer/Analyzer.vb @@ -1,4 +1,4 @@ -Imports System.Collections.Immutable +Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Diagnostics diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/CodeFix/CodeFix.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/CodeFix/CodeFix.vb index 69d440f0b6..6b749c7e2c 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/CodeFix/CodeFix.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/CodeFix/CodeFix.vb @@ -1,4 +1,4 @@ -Imports System.Composition +Imports System.Composition Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/Refactoring/Refactoring.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/Refactoring/Refactoring.vb index 416dd6e7ac..4da10df920 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/Refactoring/Refactoring.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ItemTemplates/VisualBasic/Refactoring/Refactoring.vb @@ -1,4 +1,4 @@ -Imports System.Composition +Imports System.Composition Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeActions diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/CodeRefactoring/Ref/CodeRefactoringProvider.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/CodeRefactoring/Ref/CodeRefactoringProvider.cs index d80381d0e3..4d4c7de6d5 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/CodeRefactoring/Ref/CodeRefactoringProvider.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/CodeRefactoring/Ref/CodeRefactoringProvider.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Composition; using System.Linq; using System.Threading; diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/ConsoleApplication/Program.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/ConsoleApplication/Program.cs index 83f4e19cca..d7659b6671 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/ConsoleApplication/Program.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/ConsoleApplication/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.cs index 9b3329cdfd..70434dffb4 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Analyzer/Resources.Designer.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Analyzer/Resources.Designer.cs index 8f98a010aa..133bebe156 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Analyzer/Resources.Designer.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Analyzer/Resources.Designer.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.0 diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/CodeRefactoring/Ref/CodeRefactoringProvider.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/CodeRefactoring/Ref/CodeRefactoringProvider.vb index 8f40efa041..93afc6df82 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/CodeRefactoring/Ref/CodeRefactoringProvider.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/CodeRefactoring/Ref/CodeRefactoringProvider.vb @@ -1,4 +1,4 @@ -Imports System.Collections.Generic +Imports System.Collections.Generic Imports System.Composition Imports System.Linq Imports System.Threading diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/CodeRefactoring/Vsix/AssemblyInfo.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/CodeRefactoring/Vsix/AssemblyInfo.vb index e69de29bb2..5f282702bb 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/CodeRefactoring/Vsix/AssemblyInfo.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/CodeRefactoring/Vsix/AssemblyInfo.vb @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Control/SyntaxKindHelper.cs b/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Control/SyntaxKindHelper.cs index b476b5f1ec..15ce4a2611 100644 --- a/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Control/SyntaxKindHelper.cs +++ b/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Control/SyntaxKindHelper.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.CodeAnalysis; using CSharpExtensions = Microsoft.CodeAnalysis.CSharp.CSharpExtensions; diff --git a/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/GuidList.cs b/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/GuidList.cs index 55a28d6784..8fb8cfbc03 100644 --- a/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/GuidList.cs +++ b/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/GuidList.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; diff --git a/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/PkgCmdIDList.cs b/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/PkgCmdIDList.cs index d6d5957553..2600434181 100644 --- a/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/PkgCmdIDList.cs +++ b/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/PkgCmdIDList.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. namespace Roslyn.SyntaxVisualizer.Extension { From 97112583226ba24fb2a101635839a2dcc0b4f6ac Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Wed, 2 Sep 2020 12:35:47 -0700 Subject: [PATCH 2/2] Renormalize all source files --- SECURITY.md | 28 +- .../NUnitVerifierTests.cs | 482 +++++++++--------- 2 files changed, 255 insertions(+), 255 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 030ac0c065..27ff07f700 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,15 +1,15 @@ -# Security Policy - -## Supported Versions - -The .NET Core and ASP.NET Core support policy, including supported versions can be found at the [.NET Core Support Policy Page](https://dotnet.microsoft.com/platform/support/policy/dotnet-core). - -## Reporting a Vulnerability - -Security issues and bugs should be reported privately to the Microsoft Security Response Center (MSRC), either by emailing secure@microsoft.com or via the portal at https://msrc.microsoft.com. -You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your -original message. Further information, including the MSRC PGP key, can be found in the [MSRC Report an Issue FAQ](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue). - -Reports via MSRC may qualify for the .NET Core Bug Bounty. Details of the .NET Core Bug Bounty including terms and conditions are at [https://aka.ms/corebounty](https://aka.ms/corebounty). - +# Security Policy + +## Supported Versions + +The .NET Core and ASP.NET Core support policy, including supported versions can be found at the [.NET Core Support Policy Page](https://dotnet.microsoft.com/platform/support/policy/dotnet-core). + +## Reporting a Vulnerability + +Security issues and bugs should be reported privately to the Microsoft Security Response Center (MSRC), either by emailing secure@microsoft.com or via the portal at https://msrc.microsoft.com. +You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your +original message. Further information, including the MSRC PGP key, can be found in the [MSRC Report an Issue FAQ](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue). + +Reports via MSRC may qualify for the .NET Core Bug Bounty. Details of the .NET Core Bug Bounty including terms and conditions are at [https://aka.ms/corebounty](https://aka.ms/corebounty). + Please do not open issues for anything you think might have a security implication. \ No newline at end of file diff --git a/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit.UnitTests/NUnitVerifierTests.cs b/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit.UnitTests/NUnitVerifierTests.cs index a0b792c3ee..5935cc0c06 100644 --- a/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit.UnitTests/NUnitVerifierTests.cs +++ b/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit.UnitTests/NUnitVerifierTests.cs @@ -1,241 +1,241 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using NUnit.Framework; - -namespace Microsoft.CodeAnalysis.Testing.Verifiers -{ - [TestFixture] - public class NUnitVerifierTests - { - [Test] - public void TestEmptyMessage() - { - var actual = new int[1]; - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.Empty("someCollectionName", actual)); - verifier.EqualOrDiff($" Expected 'someCollectionName' to be empty, contains '1' elements{Environment.NewLine} Expected: {Environment.NewLine} But was: < 0 >{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestEmptyMessageWithContext() - { - var actual = new int[1]; - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.Empty("someCollectionName", actual)); - verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Expected 'someCollectionName' to be empty, contains '1' elements{Environment.NewLine} Expected: {Environment.NewLine} But was: < 0 >{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestEqualMessage() - { - var expected = 0; - var actual = 1; - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.Equal(expected, actual)); - verifier.EqualOrDiff($" Expected: 0{Environment.NewLine} But was: 1{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestEqualMessageWithContext() - { - var expected = 0; - var actual = 1; - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.Equal(expected, actual)); - verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}{Environment.NewLine} Expected: 0{Environment.NewLine} But was: 1{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestEqualCustomMessage() - { - var expected = 0; - var actual = 1; - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.Equal(expected, actual, "Custom message")); - verifier.EqualOrDiff($" Custom message{Environment.NewLine} Expected: 0{Environment.NewLine} But was: 1{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestEqualCustomMessageWithContext() - { - var expected = 0; - var actual = 1; - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.Equal(expected, actual, "Custom message")); - verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Custom message{Environment.NewLine} Expected: 0{Environment.NewLine} But was: 1{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestTrueMessage() - { - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.True(false)); - verifier.EqualOrDiff($" Expected: True{Environment.NewLine} But was: False{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestTrueMessageWithContext() - { - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.True(false)); - verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}{Environment.NewLine} Expected: True{Environment.NewLine} But was: False{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestTrueCustomMessage() - { - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.True(false, "Custom message")); - verifier.EqualOrDiff($" Custom message{Environment.NewLine} Expected: True{Environment.NewLine} But was: False{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestTrueCustomMessageWithContext() - { - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.True(false, "Custom message")); - verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Custom message{Environment.NewLine} Expected: True{Environment.NewLine} But was: False{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestFalseMessage() - { - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.False(true)); - verifier.EqualOrDiff($" Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestFalseMessageWithContext() - { - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.False(true)); - verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestFalseCustomMessage() - { - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.False(true, "Custom message")); - verifier.EqualOrDiff($" Custom message{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestFalseCustomMessageWithContext() - { - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.False(true, "Custom message")); - verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Custom message{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestFailMessage() - { - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.Fail()); - verifier.EqualOrDiff(string.Empty, exception.Message); - } - - [Test] - public void TestFailMessageWithContext() - { - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.Fail()); - verifier.EqualOrDiff($"Context: Known Context{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestFailCustomMessage() - { - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.Fail("Custom message")); - verifier.EqualOrDiff($"Custom message", exception.Message); - } - - [Test] - public void TestFailCustomMessageWithContext() - { - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.Fail("Custom message")); - verifier.EqualOrDiff($"Context: Known Context{Environment.NewLine}Custom message", exception.Message); - } - - [Test] - public void TestLanguageIsSupportedMessage() - { - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.LanguageIsSupported("NonLanguage")); - verifier.EqualOrDiff($" Unsupported Language: 'NonLanguage'{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestLanguageIsSupportedMessageWithContext() - { - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.LanguageIsSupported("NonLanguage")); - verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Unsupported Language: 'NonLanguage'{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestNotEmptyMessage() - { - var actual = new int[0]; - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.NotEmpty("someCollectionName", actual)); - verifier.EqualOrDiff($" expected 'someCollectionName' to be non-empty, contains{Environment.NewLine} Expected: not {Environment.NewLine} But was: {Environment.NewLine}", exception.Message); - } - - [Test] - public void TestNotEmptyMessageWithContext() - { - var actual = new int[0]; - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.NotEmpty("someCollectionName", actual)); - verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}expected 'someCollectionName' to be non-empty, contains{Environment.NewLine} Expected: not {Environment.NewLine} But was: {Environment.NewLine}", exception.Message); - } - - [Test] - public void TestSequenceEqualMessage() - { - var expected = new int[] { 0 }; - var actual = new int[] { 1 }; - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.SequenceEqual(expected, actual)); - verifier.EqualOrDiff(string.Empty, exception.Message); - } - - [Test] - public void TestSequenceEqualMessageWithContext() - { - var expected = new int[] { 0 }; - var actual = new int[] { 1 }; - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.SequenceEqual(expected, actual)); - verifier.EqualOrDiff($"Context: Known Context{Environment.NewLine}", exception.Message); - } - - [Test] - public void TestSequenceEqualCustomMessage() - { - var expected = new int[] { 0 }; - var actual = new int[] { 1 }; - var verifier = new NUnitVerifier(); - var exception = Assert.Throws(() => verifier.SequenceEqual(expected, actual, message: "Custom message")); - verifier.EqualOrDiff($"Custom message", exception.Message); - } - - [Test] - public void TestSequenceEqualCustomMessageWithContext() - { - var expected = new int[] { 0 }; - var actual = new int[] { 1 }; - var verifier = new NUnitVerifier().PushContext("Known Context"); - var exception = Assert.Throws(() => verifier.SequenceEqual(expected, actual, message: "Custom message")); - verifier.EqualOrDiff($"Context: Known Context{Environment.NewLine}Custom message", exception.Message); - } - } -} +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using NUnit.Framework; + +namespace Microsoft.CodeAnalysis.Testing.Verifiers +{ + [TestFixture] + public class NUnitVerifierTests + { + [Test] + public void TestEmptyMessage() + { + var actual = new int[1]; + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.Empty("someCollectionName", actual)); + verifier.EqualOrDiff($" Expected 'someCollectionName' to be empty, contains '1' elements{Environment.NewLine} Expected: {Environment.NewLine} But was: < 0 >{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestEmptyMessageWithContext() + { + var actual = new int[1]; + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.Empty("someCollectionName", actual)); + verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Expected 'someCollectionName' to be empty, contains '1' elements{Environment.NewLine} Expected: {Environment.NewLine} But was: < 0 >{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestEqualMessage() + { + var expected = 0; + var actual = 1; + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.Equal(expected, actual)); + verifier.EqualOrDiff($" Expected: 0{Environment.NewLine} But was: 1{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestEqualMessageWithContext() + { + var expected = 0; + var actual = 1; + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.Equal(expected, actual)); + verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}{Environment.NewLine} Expected: 0{Environment.NewLine} But was: 1{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestEqualCustomMessage() + { + var expected = 0; + var actual = 1; + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.Equal(expected, actual, "Custom message")); + verifier.EqualOrDiff($" Custom message{Environment.NewLine} Expected: 0{Environment.NewLine} But was: 1{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestEqualCustomMessageWithContext() + { + var expected = 0; + var actual = 1; + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.Equal(expected, actual, "Custom message")); + verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Custom message{Environment.NewLine} Expected: 0{Environment.NewLine} But was: 1{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestTrueMessage() + { + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.True(false)); + verifier.EqualOrDiff($" Expected: True{Environment.NewLine} But was: False{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestTrueMessageWithContext() + { + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.True(false)); + verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}{Environment.NewLine} Expected: True{Environment.NewLine} But was: False{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestTrueCustomMessage() + { + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.True(false, "Custom message")); + verifier.EqualOrDiff($" Custom message{Environment.NewLine} Expected: True{Environment.NewLine} But was: False{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestTrueCustomMessageWithContext() + { + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.True(false, "Custom message")); + verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Custom message{Environment.NewLine} Expected: True{Environment.NewLine} But was: False{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestFalseMessage() + { + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.False(true)); + verifier.EqualOrDiff($" Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestFalseMessageWithContext() + { + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.False(true)); + verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestFalseCustomMessage() + { + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.False(true, "Custom message")); + verifier.EqualOrDiff($" Custom message{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestFalseCustomMessageWithContext() + { + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.False(true, "Custom message")); + verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Custom message{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestFailMessage() + { + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.Fail()); + verifier.EqualOrDiff(string.Empty, exception.Message); + } + + [Test] + public void TestFailMessageWithContext() + { + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.Fail()); + verifier.EqualOrDiff($"Context: Known Context{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestFailCustomMessage() + { + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.Fail("Custom message")); + verifier.EqualOrDiff($"Custom message", exception.Message); + } + + [Test] + public void TestFailCustomMessageWithContext() + { + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.Fail("Custom message")); + verifier.EqualOrDiff($"Context: Known Context{Environment.NewLine}Custom message", exception.Message); + } + + [Test] + public void TestLanguageIsSupportedMessage() + { + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.LanguageIsSupported("NonLanguage")); + verifier.EqualOrDiff($" Unsupported Language: 'NonLanguage'{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestLanguageIsSupportedMessageWithContext() + { + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.LanguageIsSupported("NonLanguage")); + verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}Unsupported Language: 'NonLanguage'{Environment.NewLine} Expected: False{Environment.NewLine} But was: True{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestNotEmptyMessage() + { + var actual = new int[0]; + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.NotEmpty("someCollectionName", actual)); + verifier.EqualOrDiff($" expected 'someCollectionName' to be non-empty, contains{Environment.NewLine} Expected: not {Environment.NewLine} But was: {Environment.NewLine}", exception.Message); + } + + [Test] + public void TestNotEmptyMessageWithContext() + { + var actual = new int[0]; + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.NotEmpty("someCollectionName", actual)); + verifier.EqualOrDiff($" Context: Known Context{Environment.NewLine}expected 'someCollectionName' to be non-empty, contains{Environment.NewLine} Expected: not {Environment.NewLine} But was: {Environment.NewLine}", exception.Message); + } + + [Test] + public void TestSequenceEqualMessage() + { + var expected = new int[] { 0 }; + var actual = new int[] { 1 }; + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.SequenceEqual(expected, actual)); + verifier.EqualOrDiff(string.Empty, exception.Message); + } + + [Test] + public void TestSequenceEqualMessageWithContext() + { + var expected = new int[] { 0 }; + var actual = new int[] { 1 }; + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.SequenceEqual(expected, actual)); + verifier.EqualOrDiff($"Context: Known Context{Environment.NewLine}", exception.Message); + } + + [Test] + public void TestSequenceEqualCustomMessage() + { + var expected = new int[] { 0 }; + var actual = new int[] { 1 }; + var verifier = new NUnitVerifier(); + var exception = Assert.Throws(() => verifier.SequenceEqual(expected, actual, message: "Custom message")); + verifier.EqualOrDiff($"Custom message", exception.Message); + } + + [Test] + public void TestSequenceEqualCustomMessageWithContext() + { + var expected = new int[] { 0 }; + var actual = new int[] { 1 }; + var verifier = new NUnitVerifier().PushContext("Known Context"); + var exception = Assert.Throws(() => verifier.SequenceEqual(expected, actual, message: "Custom message")); + verifier.EqualOrDiff($"Context: Known Context{Environment.NewLine}Custom message", exception.Message); + } + } +}