From af8c3459e35ba64db9ac84b322c8ef49030bf0a8 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 30 Sep 2019 15:59:45 +0200 Subject: [PATCH] Moves Assert4A/B methods to methods and renames some parameters ... need to figure out what the rest mean --- src/Umbraco.Tests/Models/VariationTests.cs | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Tests/Models/VariationTests.cs b/src/Umbraco.Tests/Models/VariationTests.cs index 62c4849855..6ead404a09 100644 --- a/src/Umbraco.Tests/Models/VariationTests.cs +++ b/src/Umbraco.Tests/Models/VariationTests.cs @@ -70,18 +70,6 @@ namespace Umbraco.Tests.Models [Test] public void ValidateVariationTests() { - void Assert4A(ContentVariation v, string c, string s, bool xx) - { - Assert4B(v, c, s, xx, xx, xx, xx); - } - - void Assert4B(ContentVariation v, string c, string s, bool ew, bool nn, bool en, bool nw) - { - Assert.AreEqual(ew, v.ValidateVariation(c, s, true, true, false)); - Assert.AreEqual(nn, v.ValidateVariation(c, s, false, false, false)); - Assert.AreEqual(en, v.ValidateVariation(c, s, true, false, false)); - Assert.AreEqual(nw, v.ValidateVariation(c, s, false, true, false)); - } // All tests: // 1. if exact is set to true: culture cannot be null when the ContentVariation.Culture flag is set @@ -174,6 +162,19 @@ namespace Umbraco.Tests.Models #endregion } + private static void Assert4B(ContentVariation v, string culture, string segment, bool ew, bool nn, bool en, bool nw) + { + Assert.AreEqual(ew, v.ValidateVariation(culture, segment, true, true, false)); + Assert.AreEqual(nn, v.ValidateVariation(culture, segment, false, false, false)); + Assert.AreEqual(en, v.ValidateVariation(culture, segment, true, false, false)); + Assert.AreEqual(nw, v.ValidateVariation(culture, segment, false, true, false)); + } + + private static void Assert4A(ContentVariation v, string culture, string segment, bool xx) + { + Assert4B(v, culture, segment, xx, xx, xx, xx); + } + [Test] public void PropertyTests() {