From 9002e25add1b70fc88052e8696e0580f6f7ab324 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sun, 14 Feb 2021 21:50:49 +1100 Subject: [PATCH] remove instance based clipboard settings fixes https://github.com/VerifyTests/Verify/issues/304 --- docs/build-server.md | 2 +- docs/mdsource/clipboard.source.md | 12 ------------ src/Verify.DerivePaths.Tests/Tests.cs | 3 +-- src/Verify.Tests/Comparer/ComparerTests.cs | 2 -- src/Verify.Tests/Snippets/Snippets.cs | 20 -------------------- src/Verify.Tests/Tests.cs | 3 --- src/Verify/Clipboard/ClipboardEnabled.cs | 7 +------ src/Verify/Clipboard/VerifySettings.cs | 17 ----------------- src/Verify/SettingsTask.cs | 12 ------------ src/Verify/Verifier/VerifyEngine.cs | 2 +- src/Verify/VerifySettings.cs | 1 - 11 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 src/Verify/Clipboard/VerifySettings.cs diff --git a/docs/build-server.md b/docs/build-server.md index 2c572c323b..fecc0103d1 100644 --- a/docs/build-server.md +++ b/docs/build-server.md @@ -63,5 +63,5 @@ if (BuildServerDetector.Detected) }); } ``` -snippet source | anchor +snippet source | anchor diff --git a/docs/mdsource/clipboard.source.md b/docs/mdsource/clipboard.source.md index 107ea9d536..679f83ba43 100644 --- a/docs/mdsource/clipboard.source.md +++ b/docs/mdsource/clipboard.source.md @@ -51,20 +51,8 @@ Add a variable named `Verify.DeleteCommand` where `{0}` will be replaced with th The clipboard behavior can be disable using the following: - -### Per Test - -snippet: DisableClipboard - - -### For all tests - snippet: DisableClipboardGlobal -If clipboard is disabled for all tests, it can be re-enabled at the test level: - -snippet: EnableClipboard - ### For a machine diff --git a/src/Verify.DerivePaths.Tests/Tests.cs b/src/Verify.DerivePaths.Tests/Tests.cs index a5e6e49e04..db4c3b9fb5 100644 --- a/src/Verify.DerivePaths.Tests/Tests.cs +++ b/src/Verify.DerivePaths.Tests/Tests.cs @@ -29,8 +29,7 @@ static Task Run() { return Verifier.Verify("Value") .UseMethodName("Conflict") - .DisableDiff() - .DisableClipboard(); + .DisableDiff(); } try diff --git a/src/Verify.Tests/Comparer/ComparerTests.cs b/src/Verify.Tests/Comparer/ComparerTests.cs index 694e878ed5..c64de0fbe4 100644 --- a/src/Verify.Tests/Comparer/ComparerTests.cs +++ b/src/Verify.Tests/Comparer/ComparerTests.cs @@ -14,7 +14,6 @@ public async Task Instance_with_message() VerifySettings settings = new(); settings.UseStringComparer(CompareWithMessage); settings.DisableDiff(); - settings.DisableClipboard(); var exception = await Assert.ThrowsAsync(() => Verifier.Verify("NotTheText", settings)); Assert.Contains("theMessage", exception.Message); } @@ -37,7 +36,6 @@ public async Task Static_with_message() VerifySettings settings = new(); settings.UseExtension("staticComparerExtMessage"); settings.DisableDiff(); - settings.DisableClipboard(); var exception = await Assert.ThrowsAsync(() => Verifier.Verify("TheText", settings)); Assert.Equal( @"Results do not match. diff --git a/src/Verify.Tests/Snippets/Snippets.cs b/src/Verify.Tests/Snippets/Snippets.cs index 70c789e965..a64779f8ce 100644 --- a/src/Verify.Tests/Snippets/Snippets.cs +++ b/src/Verify.Tests/Snippets/Snippets.cs @@ -34,16 +34,6 @@ public async Task OnHandlersSample() #endregion - void DisableClipboard() - { - #region DisableClipboard - - VerifySettings settings = new(); - settings.DisableClipboard(); - - #endregion - } - void TreatAsString() { #region TreatAsString @@ -59,16 +49,6 @@ class ClassWithToString public string Property { get; set; } = null!; } - void EnableClipboard() - { - #region EnableClipboard - - VerifySettings settings = new(); - settings.EnableClipboard(); - - #endregion - } - void DisableClipboardGlobal() { #region DisableClipboardGlobal diff --git a/src/Verify.Tests/Tests.cs b/src/Verify.Tests/Tests.cs index 08fbd4533c..1678df8145 100644 --- a/src/Verify.Tests/Tests.cs +++ b/src/Verify.Tests/Tests.cs @@ -140,7 +140,6 @@ public async Task OnVerifyMismatch() { VerifySettings settings = new(); settings.DisableDiff(); - settings.DisableClipboard(); var onFirstVerifyCalled = false; var onVerifyMismatchCalled = false; VerifierSettings.OnFirstVerify( @@ -169,7 +168,6 @@ public async Task OnFirstVerify() { VerifySettings settings = new(); settings.DisableDiff(); - settings.DisableClipboard(); var onFirstVerifyCalled = false; var onVerifyMismatchCalled = false; VerifierSettings.OnFirstVerify( @@ -379,7 +377,6 @@ public async Task ShouldNotIgnoreCase() { await Verifier.Verify("A"); VerifySettings settings = new(); - settings.DisableClipboard(); settings.DisableDiff(); await Assert.ThrowsAsync(() => Verifier.Verify("a", settings)); } diff --git a/src/Verify/Clipboard/ClipboardEnabled.cs b/src/Verify/Clipboard/ClipboardEnabled.cs index 396d07b289..8ccfbe1f6f 100644 --- a/src/Verify/Clipboard/ClipboardEnabled.cs +++ b/src/Verify/Clipboard/ClipboardEnabled.cs @@ -43,11 +43,6 @@ public static bool IsEnabled(VerifySettings settings) return false; } - if (settings.clipboardEnabled == null) - { - return !VerifierSettings.clipboardDisabled; - } - - return settings.clipboardEnabled.Value; + return !VerifierSettings.clipboardDisabled; } } \ No newline at end of file diff --git a/src/Verify/Clipboard/VerifySettings.cs b/src/Verify/Clipboard/VerifySettings.cs deleted file mode 100644 index 2d97e5ae7a..0000000000 --- a/src/Verify/Clipboard/VerifySettings.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace VerifyTests -{ - public partial class VerifySettings - { - internal bool? clipboardEnabled; - - public void DisableClipboard() - { - clipboardEnabled = false; - } - - public void EnableClipboard() - { - clipboardEnabled = true; - } - } -} \ No newline at end of file diff --git a/src/Verify/SettingsTask.cs b/src/Verify/SettingsTask.cs index 41df3e4f06..cada8d4ecb 100644 --- a/src/Verify/SettingsTask.cs +++ b/src/Verify/SettingsTask.cs @@ -68,18 +68,6 @@ public SettingsTask ScrubInlineGuids() return this; } - public SettingsTask DisableClipboard() - { - CurrentSettings.DisableClipboard(); - return this; - } - - public SettingsTask EnableClipboard() - { - CurrentSettings.EnableClipboard(); - return this; - } - public SettingsTask UseStreamComparer(StreamCompare compare) { CurrentSettings.UseStreamComparer(compare); diff --git a/src/Verify/Verifier/VerifyEngine.cs b/src/Verify/Verifier/VerifyEngine.cs index ea4fc9478a..df6002af01 100644 --- a/src/Verify/Verifier/VerifyEngine.cs +++ b/src/Verify/Verifier/VerifyEngine.cs @@ -51,7 +51,7 @@ public async Task HandleResults(List results) } } - public void HandleCompareResult(EqualityResult compareResult, in FilePair file) + void HandleCompareResult(EqualityResult compareResult, in FilePair file) { switch (compareResult.Equality) { diff --git a/src/Verify/VerifySettings.cs b/src/Verify/VerifySettings.cs index d691beb208..4b19b986e3 100644 --- a/src/Verify/VerifySettings.cs +++ b/src/Verify/VerifySettings.cs @@ -15,7 +15,6 @@ public VerifySettings(VerifySettings? settings) instanceScrubbers = new(settings.instanceScrubbers); extension = settings.extension; - clipboardEnabled = settings.clipboardEnabled; diffEnabled = settings.diffEnabled; methodName = settings.methodName; typeName = settings.typeName;