diff --git a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs index 98d02be..c638416 100644 --- a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs +++ b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs @@ -74,7 +74,7 @@ namespace Filtration.Parser.Tests.Services } [Test] - public void TranslateStringToItemFilterBlock_ShowBlock_SetsBlockGroupIsCheckedCorrectly() + public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_ShowBlock_SetsBlockGroupIsCheckedCorrectly() { // Arrange var inputString = "Show # TestBlockGroup" + Environment.NewLine; @@ -82,14 +82,14 @@ namespace Filtration.Parser.Tests.Services // Act _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny>())).Returns(inputBlockGroup).Verifiable(); - _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of()); + _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of(i => i.BlockGroupsEnabled)); // Assert Assert.AreEqual(true, inputBlockGroup.IsChecked); } [Test] - public void TranslateStringToItemFilterBlock_HideBlock_SetsBlockGroupIsCheckedCorrectly() + public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_HideBlock_SetsBlockGroupIsCheckedCorrectly() { // Arrange var inputString = "Hide # TestBlockGroup" + Environment.NewLine; @@ -97,7 +97,7 @@ namespace Filtration.Parser.Tests.Services // Act _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny>())).Returns(inputBlockGroup).Verifiable(); - _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of()); + _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of(i => i.BlockGroupsEnabled)); // Assert Assert.AreEqual(false, inputBlockGroup.IsChecked); diff --git a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs index cb8000c..61657b4 100644 --- a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs +++ b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs @@ -348,6 +348,7 @@ namespace Filtration.Parser.Tests.Services Assert.AreEqual("This is a disabled block", secondBlock.Description); } + [Ignore("Ignored until toggling block group parsing can be controlled from the filter script input")] [Test] public void TranslateStringToItemFilterScript_DisabledBlockWithBlockGroup_ReturnsCorrectBlock() { @@ -363,6 +364,7 @@ namespace Filtration.Parser.Tests.Services "#Disabled Block End"; + var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object); _testUtility.MockBlockGroupHierarchyBuilder.Setup( b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny>()))