diff --git a/Filtration.Tests/Filtration.Tests.csproj b/Filtration.Tests/Filtration.Tests.csproj index 8a100cd..13323d6 100644 --- a/Filtration.Tests/Filtration.Tests.csproj +++ b/Filtration.Tests/Filtration.Tests.csproj @@ -46,13 +46,13 @@ - - + + - + - - + + @@ -70,7 +70,7 @@ PreserveNewest - + PreserveNewest diff --git a/Filtration.Tests/Models/TestLootFilterBlock.cs b/Filtration.Tests/Models/TestItemFilterBlock.cs similarity index 76% rename from Filtration.Tests/Models/TestLootFilterBlock.cs rename to Filtration.Tests/Models/TestItemFilterBlock.cs index 5a06e88..661247b 100644 --- a/Filtration.Tests/Models/TestLootFilterBlock.cs +++ b/Filtration.Tests/Models/TestItemFilterBlock.cs @@ -5,13 +5,13 @@ using NUnit.Framework; namespace Filtration.Tests.Models { [TestFixture] - public class TestLootFilterBlock + public class TestItemFilterBlock { [Test] - public void LootFilterBlock_BlockCount_ReturnsCorrectNumber() + public void ItemFilterBlock_BlockCount_ReturnsCorrectNumber() { // Arrange - var block = new LootFilterBlock(); + var block = new ItemFilterBlock(); block.BlockItems.Add(new ItemLevelBlockItem()); block.BlockItems.Add(new ItemLevelBlockItem()); block.BlockItems.Add(new ItemLevelBlockItem()); @@ -25,10 +25,10 @@ namespace Filtration.Tests.Models } [Test] - public void LootFilterBlock_AddBlockItemAllowed_LessThanMaximum_ReturnsTrue() + public void ItemFilterBlock_AddBlockItemAllowed_LessThanMaximum_ReturnsTrue() { // Arrange - var block = new LootFilterBlock(); + var block = new ItemFilterBlock(); block.BlockItems.Add(new ItemLevelBlockItem()); // Act @@ -39,10 +39,10 @@ namespace Filtration.Tests.Models } [Test] - public void LootFilterBlock_AddBlockItemAllowed_MoreThanMaximum_ReturnsFalse() + public void ItemFilterBlock_AddBlockItemAllowed_MoreThanMaximum_ReturnsFalse() { // Arrange - var block = new LootFilterBlock(); + var block = new ItemFilterBlock(); block.BlockItems.Add(new SoundBlockItem()); // Act diff --git a/Filtration.Tests/Models/TestLootFilterScript.cs b/Filtration.Tests/Models/TestItemFilterScript.cs similarity index 83% rename from Filtration.Tests/Models/TestLootFilterScript.cs rename to Filtration.Tests/Models/TestItemFilterScript.cs index fb5f7b6..8a0acbe 100644 --- a/Filtration.Tests/Models/TestLootFilterScript.cs +++ b/Filtration.Tests/Models/TestItemFilterScript.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; +using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Media; using Filtration.Models; using Filtration.Models.BlockItemTypes; @@ -12,14 +8,14 @@ using NUnit.Framework; namespace Filtration.Tests.Models { [TestFixture] - public class TestLootFilterScript + public class TestItemFilterScript { [Test] public void Validate_AtLeastOneBlock_Fail_ReturnsListWithCorrectError() { // Arrange - var script = new LootFilterScript(); + var script = new ItemFilterScript(); // Act var result = script.Validate(); @@ -33,9 +29,9 @@ namespace Filtration.Tests.Models { // Arrange - var script = new LootFilterScript + var script = new ItemFilterScript { - LootFilterBlocks = new ObservableCollection {new LootFilterBlock()} + ItemFilterBlocks = new ObservableCollection {new ItemFilterBlock()} }; // Act @@ -59,16 +55,16 @@ namespace Filtration.Tests.Models ReplaceBackgroundColor = true }; - var testInputBlock1 = new LootFilterBlock(); + var testInputBlock1 = new ItemFilterBlock(); testInputBlock1.BlockItems.Add(new BackgroundColorBlockItem(new Color {A = 255, R = 255, G = 0, B = 0})); - var testInputBlock2 = new LootFilterBlock(); + var testInputBlock2 = new ItemFilterBlock(); testInputBlock2.BlockItems.Add(new BackgroundColorBlockItem(new Color { A = 255, R = 255, G = 1, B = 0 })); - var testInputBlock3 = new LootFilterBlock(); + var testInputBlock3 = new ItemFilterBlock(); testInputBlock3.BlockItems.Add(new BackgroundColorBlockItem(new Color { A = 255, R = 255, G = 0, B = 0 })); - var script = new LootFilterScript() + var script = new ItemFilterScript() { - LootFilterBlocks = new ObservableCollection + ItemFilterBlocks = new ObservableCollection { testInputBlock1, testInputBlock2, @@ -105,16 +101,16 @@ namespace Filtration.Tests.Models ReplaceTextColor = true }; - var testInputBlock1 = new LootFilterBlock(); + var testInputBlock1 = new ItemFilterBlock(); testInputBlock1.BlockItems.Add(new BackgroundColorBlockItem(oldBackgroundColor)); testInputBlock1.BlockItems.Add(new TextColorBlockItem(oldTextColor)); - var testInputBlock2 = new LootFilterBlock(); + var testInputBlock2 = new ItemFilterBlock(); testInputBlock2.BlockItems.Add(new BackgroundColorBlockItem(oldBackgroundColor)); testInputBlock2.BlockItems.Add(new TextColorBlockItem(new Color {A = 1, R = 2, G = 3, B = 4})); - var script = new LootFilterScript + var script = new ItemFilterScript { - LootFilterBlocks = new ObservableCollection + ItemFilterBlocks = new ObservableCollection { testInputBlock1, testInputBlock2 diff --git a/Filtration.Tests/Resources/ThioleLootFilter.txt b/Filtration.Tests/Resources/ThioleItemFilter.txt similarity index 100% rename from Filtration.Tests/Resources/ThioleLootFilter.txt rename to Filtration.Tests/Resources/ThioleItemFilter.txt diff --git a/Filtration.Tests/Resources/testscript.txt b/Filtration.Tests/Resources/testscript.txt index 4265427..3171a39 100644 --- a/Filtration.Tests/Resources/testscript.txt +++ b/Filtration.Tests/Resources/testscript.txt @@ -1,4 +1,4 @@ -# Loot Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration +# Item Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration # Begin Script Description # This is a test script # diff --git a/Filtration.Tests/Services/TestLootFilterPersistenceService.cs b/Filtration.Tests/Services/TestItemFilterPersistenceService.cs similarity index 57% rename from Filtration.Tests/Services/TestLootFilterPersistenceService.cs rename to Filtration.Tests/Services/TestItemFilterPersistenceService.cs index f059ddf..2261372 100644 --- a/Filtration.Tests/Services/TestLootFilterPersistenceService.cs +++ b/Filtration.Tests/Services/TestItemFilterPersistenceService.cs @@ -7,55 +7,55 @@ using NUnit.Framework; namespace Filtration.Tests.Services { [TestFixture] - public class TestLootFilterPersistenceService + public class TestItemFilterPersistenceService { [Test] - public void LoadLootFilterScript_CallsTranslatorAndFileSystemService() + public void LoadItemFilterScript_CallsTranslatorAndFileSystemService() { // Arrange const string TestInputPath = "C:\\Test Path\\Script.Filter"; - const string TestScriptString = "This is a test loot filter script"; - var testLootFilterScript = new LootFilterScript(); + const string TestScriptString = "This is a test item filter script"; + var testItemFilterScript = new ItemFilterScript(); var mockFileSystemService = new Mock(); mockFileSystemService.Setup(s => s.ReadFileAsString(TestInputPath)).Returns(TestScriptString).Verifiable(); - var mockLootFilterScriptTranslator = new Mock(); - mockLootFilterScriptTranslator.Setup(t => t.TranslateStringToLootFilterScript(TestScriptString)).Returns(testLootFilterScript).Verifiable(); + var mockItemFilterScriptTranslator = new Mock(); + mockItemFilterScriptTranslator.Setup(t => t.TranslateStringToItemFilterScript(TestScriptString)).Returns(testItemFilterScript).Verifiable(); - var service = new LootFilterPersistenceService(mockFileSystemService.Object, mockLootFilterScriptTranslator.Object); + var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object); // Act - var script = service.LoadLootFilterScript(TestInputPath); + var script = service.LoadItemFilterScript(TestInputPath); // Assert mockFileSystemService.Verify(); - mockLootFilterScriptTranslator.Verify(); - Assert.AreEqual(testLootFilterScript, script); + mockItemFilterScriptTranslator.Verify(); + Assert.AreEqual(testItemFilterScript, script); } [Test] - public void SaveLootFilterScript_CallsTranslatorAndFileSystemService() + public void SaveItemFilterScript_CallsTranslatorAndFileSystemService() { // Arrange var testFilePath = "C:\\Test\\File.txt"; - var testScript = new LootFilterScript {FilePath = testFilePath}; + var testScript = new ItemFilterScript {FilePath = testFilePath}; var testTranslatedScript = "Test translated script"; var mockFileSystemService = new Mock(); mockFileSystemService.Setup(s => s.WriteFileFromString(testFilePath, testTranslatedScript)).Verifiable(); - var mockLootFilterScriptTranslator = new Mock(); - mockLootFilterScriptTranslator.Setup(t => t.TranslateLootFilterScriptToString(testScript)).Returns(testTranslatedScript).Verifiable(); + var mockItemFilterScriptTranslator = new Mock(); + mockItemFilterScriptTranslator.Setup(t => t.TranslateItemFilterScriptToString(testScript)).Returns(testTranslatedScript).Verifiable(); - var service = new LootFilterPersistenceService(mockFileSystemService.Object, mockLootFilterScriptTranslator.Object); + var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object); // Act - service.SaveLootFilterScript(testScript); + service.SaveItemFilterScript(testScript); // Assert mockFileSystemService.Verify(); - mockLootFilterScriptTranslator.Verify(); + mockItemFilterScriptTranslator.Verify(); } [Test] @@ -69,9 +69,9 @@ namespace Filtration.Tests.Services mockFileSystemService.Setup(f => f.GetUserProfilePath()).Returns(TestUserProfilePath).Verifiable(); mockFileSystemService.Setup(f => f.DirectoryExists(TestUserProfilePath + "\\Documents\\My Games\\Path of Exile")).Returns(true).Verifiable(); - var mockLootFilterScriptTranslator = new Mock(); + var mockItemFilterScriptTranslator = new Mock(); - var service = new LootFilterPersistenceService(mockFileSystemService.Object, mockLootFilterScriptTranslator.Object); + var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object); // Act var result = service.DefaultPathOfExileDirectory(); diff --git a/Filtration.Tests/Services/TestStaticDataService.cs b/Filtration.Tests/Services/TestStaticDataService.cs index 94f9943..c6dc5c8 100644 --- a/Filtration.Tests/Services/TestStaticDataService.cs +++ b/Filtration.Tests/Services/TestStaticDataService.cs @@ -13,7 +13,7 @@ namespace Filtration.Tests.Services // Arrange var mockFileSystemService = new Mock(); - mockFileSystemService.Setup(f => f.ReadFileAsString(It.IsAny())).Verifiable(); + mockFileSystemService.Setup(f => f.ReadFileAsString(It.IsAny())).Returns("TestResult").Verifiable(); var service = new StaticDataService(mockFileSystemService.Object); diff --git a/Filtration.Tests/Translators/TestLootFilterBlockTranslator.cs b/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs similarity index 86% rename from Filtration.Tests/Translators/TestLootFilterBlockTranslator.cs rename to Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs index 8d83214..75ec9e6 100644 --- a/Filtration.Tests/Translators/TestLootFilterBlockTranslator.cs +++ b/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs @@ -11,25 +11,25 @@ using NUnit.Framework; namespace Filtration.Tests.Translators { [TestFixture] - public class TestLootFilterBlockTranslator + public class TestItemFilterBlockTranslator { - private LootFilterBlockTranslatorTestUtility _testUtility; + private ItemFilterBlockTranslatorTestUtility _testUtility; [SetUp] - public void LootFilterBlockTranslatorTestSetUp() + public void ItemFilterBlockTranslatorTestSetUp() { - _testUtility = new LootFilterBlockTranslatorTestUtility(); + _testUtility = new ItemFilterBlockTranslatorTestUtility(); } [Test] - public void TranslateStringToLootFilterBlock_NoDescriptionComment_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_NoDescriptionComment_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " ItemLevel >= 55"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is ItemLevelBlockItem)); @@ -39,13 +39,13 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_Hide_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_Hide_ReturnsCorrectObject() { // Arrange var inputString = "Hide" + Environment.NewLine; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is ActionBlockItem)); @@ -53,7 +53,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_DescriptionComment_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_DescriptionComment_ReturnsCorrectObject() { // Arrange var inputString = "# This is a test Block" + Environment.NewLine + @@ -61,7 +61,7 @@ namespace Filtration.Tests.Translators " ItemLevel >= 55"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual("This is a test Block", result.Description); @@ -72,7 +72,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_MultiLineDescriptionComment_OnlyAddsLastCommentLineToDescription() + public void TranslateStringToItemFilterBlock_MultiLineDescriptionComment_OnlyAddsLastCommentLineToDescription() { // Arrange var inputString = "#First line" + Environment.NewLine + @@ -81,7 +81,7 @@ namespace Filtration.Tests.Translators " ItemLevel >= 55"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual("Second Line", result.Description); @@ -92,14 +92,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_DropLevel_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_DropLevel_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " DropLevel = 40"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert @@ -110,14 +110,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_Quality_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_Quality_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " Quality < 18"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert @@ -128,14 +128,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_Rarity_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_Rarity_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " Rarity > Normal"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert @@ -146,14 +146,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_Rarity_WorksWithoutPredicateOperator() + public void TranslateStringToItemFilterBlock_Rarity_WorksWithoutPredicateOperator() { // Arrange var inputString = "Show" + Environment.NewLine + " Rarity Normal"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is RarityBlockItem)); @@ -163,14 +163,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_Class_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_Class_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + @" Class ""Test Class 1"" ""TestOneWordClassInQuotes"" TestOneWordClassNotInQuotes ""Test Class 2"""; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is ClassBlockItem)); @@ -182,14 +182,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_BaseType_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_BaseType_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + @" BaseType ""Test Base Type 1"" ""TestOneWordBaseTypeInQuotes"" TestOneWordBaseTypeNotInQuotes ""Test BaseType 2"""; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is BaseTypeBlockItem)); @@ -201,14 +201,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_Sockets_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_Sockets_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " Sockets > 2"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert @@ -219,14 +219,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_LinkedSockets_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_LinkedSockets_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " LinkedSockets != 1"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert @@ -237,14 +237,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_Width_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_Width_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " Width != 1"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert @@ -255,14 +255,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_Height_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_Height_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " Height <= 3"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert @@ -273,14 +273,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_Height_PredicatesWorkWithoutSpaceBetweenOperatorAndOperand() + public void TranslateStringToItemFilterBlock_Height_PredicatesWorkWithoutSpaceBetweenOperatorAndOperand() { // Arrange var inputString = "Show" + Environment.NewLine + " Height <=3"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is HeightBlockItem)); @@ -290,14 +290,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_SocketGroup_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_SocketGroup_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " SocketGroup RRGB"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is SocketGroupBlockItem)); @@ -308,14 +308,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_SetTextColor_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_SetTextColor_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " SetTextColor 255 20 100"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is TextColorBlockItem)); @@ -326,14 +326,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_SetTextColorWithAlpha_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_SetTextColorWithAlpha_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " SetTextColor 65 0 255 12"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is TextColorBlockItem)); @@ -345,14 +345,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_SetBackgroundColor_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_SetBackgroundColor_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " SetBackgroundColor 255 20 100"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is BackgroundColorBlockItem)); @@ -364,14 +364,14 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_SetBorderColor_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_SetBorderColor_ReturnsCorrectObject() { // Arrange var inputString = "Show" + Environment.NewLine + " SetBorderColor 255 20 100"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is BorderColorBlockItem)); @@ -382,7 +382,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_SetFontSize_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_SetFontSize_ReturnsCorrectObject() { // Arrange @@ -390,7 +390,7 @@ namespace Filtration.Tests.Translators " SetFontSize 15"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is FontSizeBlockItem)); @@ -399,7 +399,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_PlayAlertSoundWithoutVolume_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_PlayAlertSoundWithoutVolume_ReturnsCorrectObject() { // Arrange @@ -407,7 +407,7 @@ namespace Filtration.Tests.Translators " PlayAlertSound 4"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is SoundBlockItem)); @@ -417,7 +417,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_PlayAlertSoundWithVolume_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_PlayAlertSoundWithVolume_ReturnsCorrectObject() { // Arrange @@ -425,7 +425,7 @@ namespace Filtration.Tests.Translators " PlayAlertSound 2 95"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is SoundBlockItem)); @@ -435,22 +435,22 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_SectionComment_ReturnsLootFilterSectionObjectWithCorrectDescription() + public void TranslateStringToItemFilterBlock_SectionComment_ReturnsItemFilterSectionObjectWithCorrectDescription() { // Arrange const string TestInputSectionDescription = "Wonderful items that you definitely won't want to miss!"; var inputString = "# Section: " + TestInputSectionDescription; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert - Assert.IsInstanceOf(result); + Assert.IsInstanceOf(result); Assert.AreEqual(TestInputSectionDescription, result.Description); } [Test] - public void TranslateStringToLootFilterBlock_Everything_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_Everything_ReturnsCorrectObject() { // Arrange @@ -475,7 +475,7 @@ namespace Filtration.Tests.Translators " PlayAlertSound 3"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual("Test filter with everything", result.Description); @@ -546,7 +546,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_MultipleValues_ReturnsCorrectObject() + public void TranslateStringToItemFilterBlock_MultipleValues_ReturnsCorrectObject() { // Arrange @@ -557,7 +557,7 @@ namespace Filtration.Tests.Translators " Quality < 17"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(2, result.BlockItems.Count(b => b is ItemLevelBlockItem)); @@ -578,7 +578,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_MultipleTextColorItems_OnlyLastOneUsed() + public void TranslateStringToItemFilterBlock_MultipleTextColorItems_OnlyLastOneUsed() { // Arrange var inputString = "Show" + Environment.NewLine + @@ -586,7 +586,7 @@ namespace Filtration.Tests.Translators " SetTextColor 255 20 100"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is TextColorBlockItem)); @@ -597,7 +597,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_MultipleFontSizeItems_OnlyLastOneUsed() + public void TranslateStringToItemFilterBlock_MultipleFontSizeItems_OnlyLastOneUsed() { // Arrange @@ -607,7 +607,7 @@ namespace Filtration.Tests.Translators " SetFontSize 27" + Environment.NewLine; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is FontSizeBlockItem)); @@ -616,7 +616,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_MultipleSoundItems_OnlyLastOneUsed() + public void TranslateStringToItemFilterBlock_MultipleSoundItems_OnlyLastOneUsed() { // Arrange @@ -626,7 +626,7 @@ namespace Filtration.Tests.Translators " PlayAlertSound 2" + Environment.NewLine; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is SoundBlockItem)); @@ -636,7 +636,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_MultipleBackgroundColorItems_OnlyLastOneUsed() + public void TranslateStringToItemFilterBlock_MultipleBackgroundColorItems_OnlyLastOneUsed() { // Arrange var inputString = "Show" + Environment.NewLine + @@ -644,7 +644,7 @@ namespace Filtration.Tests.Translators " SetBackgroundColor 255 20 100"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is BackgroundColorBlockItem)); @@ -655,7 +655,7 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateStringToLootFilterBlock_MultipleBorderColorItems_OnlyLastOneUsed() + public void TranslateStringToItemFilterBlock_MultipleBorderColorItems_OnlyLastOneUsed() { // Arrange var inputString = "Show" + Environment.NewLine + @@ -663,7 +663,7 @@ namespace Filtration.Tests.Translators " SetBorderColor 255 20 100"; // Act - var result = _testUtility.Translator.TranslateStringToLootFilterBlock(inputString); + var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString); // Assert Assert.AreEqual(1, result.BlockItems.Count(b => b is BorderColorBlockItem)); @@ -674,20 +674,20 @@ namespace Filtration.Tests.Translators } [Test] - public void TranslateLootFilterBlockToString_NothingPopulated_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_NothingPopulated_ReturnsCorrectString() { // Arrange var expectedResult = "Show"; // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_FilterTypeHide_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_FilterTypeHide_ReturnsCorrectString() { // Arrange var expectedResult = "Hide"; @@ -695,14 +695,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.Action = BlockAction.Hide; // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_FilterDescription_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_FilterDescription_ReturnsCorrectString() { // Arrange var expectedResult = "# Test Block Description" + Environment.NewLine + @@ -711,14 +711,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.Description = "Test Block Description"; // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_FilterDescriptionWithApostraphes_DoesNotDuplicateApostraphes() + public void TranslateItemFilterBlockToString_FilterDescriptionWithApostraphes_DoesNotDuplicateApostraphes() { // Arrange var expectedResult = "# Test Block Descr'iption" + Environment.NewLine + @@ -727,14 +727,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.Description = "Test Block Descr'iption"; // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_ItemLevel_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_ItemLevel_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -743,14 +743,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThanOrEqual, 56)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_DropLevel_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_DropLevel_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -759,14 +759,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new DropLevelBlockItem(FilterPredicateOperator.Equal, 23)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Quality_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_Quality_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -775,14 +775,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new QualityBlockItem(FilterPredicateOperator.LessThan, 10)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Rarity_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_Rarity_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -792,14 +792,14 @@ namespace Filtration.Tests.Translators (int) ItemRarity.Rare)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Classes_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_Classes_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -812,14 +812,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(classBlockItem); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Classes_DoesNotDuplicateApostraphes() + public void TranslateItemFilterBlockToString_Classes_DoesNotDuplicateApostraphes() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -830,14 +830,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(classBlockItem); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_BaseTypes_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_BaseTypes_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -850,14 +850,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(baseTypeBlockItem); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Sockets_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_Sockets_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -866,14 +866,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new SocketsBlockItem(FilterPredicateOperator.GreaterThanOrEqual, 5)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_SocketGroup_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_SocketGroup_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -885,14 +885,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(socketGroupBlockItem); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_LinkedSockets_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_LinkedSockets_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -901,14 +901,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new LinkedSocketsBlockItem(FilterPredicateOperator.NotEqual, 3)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Width_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_Width_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -917,14 +917,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 4)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Height_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_Height_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -933,14 +933,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new HeightBlockItem(FilterPredicateOperator.GreaterThan, 1)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_TextColorMaxAlpha_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_TextColorMaxAlpha_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -949,14 +949,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem(new Color {A = 255, R = 54, G = 102, B = 255})); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_TextColorNotMaxAlpha_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_TextColorNotMaxAlpha_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -965,14 +965,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem(new Color {A = 66, R = 54, G = 102, B = 255})); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_BackgroundColorNotMaxAlpha_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_BackgroundColorNotMaxAlpha_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -982,14 +982,14 @@ namespace Filtration.Tests.Translators new BackgroundColorBlockItem(new Color {A = 69, R = 12, G = 0, B = 212})); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_BorderColorNotMaxAlpha_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_BorderColorNotMaxAlpha_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -998,14 +998,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new BorderColorBlockItem(new Color {A = 1, R = 128, G = 32, B = 0})); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_FontSize_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_FontSize_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -1014,14 +1014,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new FontSizeBlockItem(15)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Sound_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_Sound_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -1030,14 +1030,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new SoundBlockItem(2, 50)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_MultipleItemLevel_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_MultipleItemLevel_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -1050,14 +1050,14 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.LessThan, 100)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_MultipleFontSize_UsesFirstFontSize() + public void TranslateItemFilterBlockToString_MultipleFontSize_UsesFirstFontSize() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -1070,30 +1070,30 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new FontSizeBlockItem(15)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Section_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_Section_ReturnsCorrectString() { // Arrange var TestInputSectionText = "Ermagerd it's a section!"; var expectedResult = "# Section: " + TestInputSectionText; - _testUtility.TestBlock = new LootFilterSection { Description = TestInputSectionText }; + _testUtility.TestBlock = new ItemFilterSection { Description = TestInputSectionText }; // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } [Test] - public void TranslateLootFilterBlockToString_Everything_ReturnsCorrectString() + public void TranslateItemFilterBlockToString_Everything_ReturnsCorrectString() { // Arrange var expectedResult = "Show" + Environment.NewLine + @@ -1145,25 +1145,25 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new SoundBlockItem(6, 90)); // Act - var result = _testUtility.Translator.TranslateLootFilterBlockToString(_testUtility.TestBlock); + var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); // Assert Assert.AreEqual(expectedResult, result); } - private class LootFilterBlockTranslatorTestUtility + private class ItemFilterBlockTranslatorTestUtility { - public LootFilterBlockTranslatorTestUtility() + public ItemFilterBlockTranslatorTestUtility() { // Test Data - TestBlock = new LootFilterBlock(); + TestBlock = new ItemFilterBlock(); // Class under test instantiation - Translator = new LootFilterBlockTranslator(); + Translator = new ItemFilterBlockTranslator(); } - public LootFilterBlock TestBlock { get; set; } - public LootFilterBlockTranslator Translator { get; private set; } + public ItemFilterBlock TestBlock { get; set; } + public ItemFilterBlockTranslator Translator { get; private set; } } } } diff --git a/Filtration.Tests/Translators/TestLootFilterScriptTranslator.cs b/Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs similarity index 60% rename from Filtration.Tests/Translators/TestLootFilterScriptTranslator.cs rename to Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs index 74f2dcf..1b44add 100644 --- a/Filtration.Tests/Translators/TestLootFilterScriptTranslator.cs +++ b/Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs @@ -11,45 +11,45 @@ using NUnit.Framework; namespace Filtration.Tests.Translators { [TestFixture] - public class TestLootFilterScriptTranslator + public class TestItemFilterScriptTranslator { [Test] - public void TranslateStringToLootFilterScript_ReturnsScriptWithCorrectNumberOfBlocks() + public void TranslateStringToItemFilterScript_ReturnsScriptWithCorrectNumberOfBlocks() { // Arrange var testInput = File.ReadAllText(@"Resources/testscript.txt"); - var mockLootFilterBlockTranslator = new Mock(); - mockLootFilterBlockTranslator.Setup(t => t.TranslateStringToLootFilterBlock(It.IsAny())).Verifiable(); + var mockItemFilterBlockTranslator = new Mock(); + mockItemFilterBlockTranslator.Setup(t => t.TranslateStringToItemFilterBlock(It.IsAny())).Verifiable(); - var translator = new LootFilterScriptTranslator(mockLootFilterBlockTranslator.Object); + var translator = new ItemFilterScriptTranslator(mockItemFilterBlockTranslator.Object); // Act - var script = translator.TranslateStringToLootFilterScript(testInput); + var script = translator.TranslateStringToItemFilterScript(testInput); // Assert - Assert.AreEqual(5, script.LootFilterBlocks.Count); - mockLootFilterBlockTranslator.Verify(); + Assert.AreEqual(5, script.ItemFilterBlocks.Count); + mockItemFilterBlockTranslator.Verify(); } [Test] - public void TranslateStringToLootFilterScript_ReturnsScriptWithDescriptionCorrectlySet() + public void TranslateStringToItemFilterScript_ReturnsScriptWithDescriptionCorrectlySet() { // Arrange var testInput = File.ReadAllText(@"Resources/testscript.txt"); - var expectedDescription = "Loot Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration" + Environment.NewLine + + var expectedDescription = "Item Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration" + Environment.NewLine + "Begin Script Description" + Environment.NewLine + "This is a test script" + Environment.NewLine + Environment.NewLine + "End Script Description"; - var mockLootFilterBlockTranslator = new Mock(); - mockLootFilterBlockTranslator.Setup(t => t.TranslateStringToLootFilterBlock(It.IsAny())).Verifiable(); + var mockItemFilterBlockTranslator = new Mock(); + mockItemFilterBlockTranslator.Setup(t => t.TranslateStringToItemFilterBlock(It.IsAny())).Verifiable(); - var translator = new LootFilterScriptTranslator(mockLootFilterBlockTranslator.Object); + var translator = new ItemFilterScriptTranslator(mockItemFilterBlockTranslator.Object); // Act - var script = translator.TranslateStringToLootFilterScript(testInput); + var script = translator.TranslateStringToItemFilterScript(testInput); // Assert Assert.AreEqual(expectedDescription, script.Description); @@ -57,69 +57,68 @@ namespace Filtration.Tests.Translators [Ignore("Integration Test")] [Test] - public void TranslateStringToLootFilterScript_ThioleLootFilterTest() + public void TranslateStringToItemFilterScript_ThioleItemFilterTest() { // Arrange - var testInput = File.ReadAllText(@"Resources/ThioleLootFilter.txt"); + var testInput = File.ReadAllText(@"Resources/ThioleItemFilter.txt"); - var BlockTranslator = new LootFilterBlockTranslator(); - var translator = new LootFilterScriptTranslator(BlockTranslator); + var BlockTranslator = new ItemFilterBlockTranslator(); + var translator = new ItemFilterScriptTranslator(BlockTranslator); // Act - var script = translator.TranslateStringToLootFilterScript(testInput); + var script = translator.TranslateStringToItemFilterScript(testInput); // Assert // Not crashing out when loading a huge script means this integration test has passed! } [Test] - public void TranslateLootFilterScriptToString_OneBlock_CallsTranslator() + public void TranslateItemFilterScriptToString_OneBlock_CallsTranslator() { // Arrange - var testScript = new LootFilterScript(); + var testScript = new ItemFilterScript(); - var testBlock = new LootFilterBlock(); + var testBlock = new ItemFilterBlock(); testBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.Equal, 5)); var BlockOutput = "Test Script Output"; var expectedOutput = "Test Script Output" + Environment.NewLine + Environment.NewLine; - testScript.LootFilterBlocks.Add(testBlock); + testScript.ItemFilterBlocks.Add(testBlock); - var mockLootFilterBlockTranslator = new Mock(); - mockLootFilterBlockTranslator.Setup(t => t.TranslateLootFilterBlockToString(testBlock)).Returns(BlockOutput).Verifiable(); + var mockItemFilterBlockTranslator = new Mock(); + mockItemFilterBlockTranslator.Setup(t => t.TranslateItemFilterBlockToString(testBlock)).Returns(BlockOutput).Verifiable(); - var translator = new LootFilterScriptTranslator(mockLootFilterBlockTranslator.Object); + var translator = new ItemFilterScriptTranslator(mockItemFilterBlockTranslator.Object); // Act - var result = translator.TranslateLootFilterScriptToString(testScript); + var result = translator.TranslateItemFilterScriptToString(testScript); // Assert - Assert.AreEqual(expectedOutput, result); - mockLootFilterBlockTranslator.Verify(); + mockItemFilterBlockTranslator.Verify(); } [Test] - public void TranslateLootFilterScriptToString_FullScript_ReturnsCorrectOutput() + public void TranslateItemFilterScriptToString_FullScript_ReturnsCorrectOutput() { - var script = new LootFilterScript + var script = new ItemFilterScript { Description = "Test script description" + Environment.NewLine + "This is a really great script!" + Environment.NewLine + "Multiple line script descriptions are fun!" }; - var block1 = new LootFilterBlock {Description = "Test Filter 1"}; + var block1 = new ItemFilterBlock {Description = "Test Filter 1"}; block1.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 5)); - var block2 = new LootFilterBlock(); + var block2 = new ItemFilterBlock(); block2.BlockItems.Add(new QualityBlockItem(FilterPredicateOperator.LessThan, 15)); block2.BlockItems.Add(new FontSizeBlockItem(7)); block2.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 3)); - script.LootFilterBlocks.Add(block1); - script.LootFilterBlocks.Add(block2); + script.ItemFilterBlocks.Add(block1); + script.ItemFilterBlocks.Add(block2); - var expectedOutput = "# Script edited with Filtration - http://ben-wallis.github.io/Filtration/" + Environment.NewLine + + var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine + "# Test script description" + Environment.NewLine + "# This is a really great script!" + Environment.NewLine + "# Multiple line script descriptions are fun!" + Environment.NewLine + @@ -133,41 +132,41 @@ namespace Filtration.Tests.Translators " Width = 3" + Environment.NewLine + " SetFontSize 7" + Environment.NewLine + Environment.NewLine; - var blockTranslator = new LootFilterBlockTranslator(); - var translator = new LootFilterScriptTranslator(blockTranslator); + var blockTranslator = new ItemFilterBlockTranslator(); + var translator = new ItemFilterScriptTranslator(blockTranslator); // Act - var result = translator.TranslateLootFilterScriptToString(script); + var result = translator.TranslateItemFilterScriptToString(script); // Assert Assert.AreEqual(expectedOutput, result); } [Test] - public void TranslateLootFilterScriptToString_FullScriptWithExistingFiltrationTagline_ReturnsCorrectOutput() + public void TranslateItemFilterScriptToString_FullScriptWithExistingFiltrationTagline_ReturnsCorrectOutput() { - var script = new LootFilterScript + var script = new ItemFilterScript { - Description = "Script edited with Filtration - http://ben-wallis.github.io/Filtration/" + Environment.NewLine + + Description = "Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine + "Test script description" + Environment.NewLine }; - var expectedOutput = "# Script edited with Filtration - http://ben-wallis.github.io/Filtration/" + + var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine + "# Test script description" + Environment.NewLine + Environment.NewLine; - var blockTranslator = new LootFilterBlockTranslator(); - var translator = new LootFilterScriptTranslator(blockTranslator); + var blockTranslator = new ItemFilterBlockTranslator(); + var translator = new ItemFilterScriptTranslator(blockTranslator); // Act - var result = translator.TranslateLootFilterScriptToString(script); + var result = translator.TranslateItemFilterScriptToString(script); // Assert Assert.AreEqual(expectedOutput, result); } [Test] - public void TranslateStringToLootFilterScript_SectionDirectlyBeforeBlockWithoutDescription_ReturnsCorrectObject() + public void TranslateStringToItemFilterScript_SectionDirectlyBeforeBlockWithoutDescription_ReturnsCorrectObject() { // Arrange var testInputScript = "# My Script" + Environment.NewLine + @@ -178,15 +177,15 @@ namespace Filtration.Tests.Translators " SetBorderColor 255 0 255" + Environment.NewLine + " SetFontSize 25"; - var blockTranslator = new LootFilterBlockTranslator(); - var translator = new LootFilterScriptTranslator(blockTranslator); + var blockTranslator = new ItemFilterBlockTranslator(); + var translator = new ItemFilterScriptTranslator(blockTranslator); // Act - var result = translator.TranslateStringToLootFilterScript(testInputScript); + var result = translator.TranslateStringToItemFilterScript(testInputScript); // Assert - Assert.AreEqual(2, result.LootFilterBlocks.Count); - var block = result.LootFilterBlocks.First(l => l.GetType() != typeof(LootFilterSection)); + Assert.AreEqual(2, result.ItemFilterBlocks.Count); + var block = result.ItemFilterBlocks.First(l => l.GetType() != typeof(ItemFilterSection)); Assert.AreEqual(4, block.BlockItems.Count); var baseTypeItem = block.BlockItems.OfType().First(); Assert.AreEqual(2, baseTypeItem.Items.Count); diff --git a/Filtration/Converters/BlockItemTypeToStringConverter.cs b/Filtration/Converters/BlockItemTypeToStringConverter.cs index 55d37d6..b851583 100644 --- a/Filtration/Converters/BlockItemTypeToStringConverter.cs +++ b/Filtration/Converters/BlockItemTypeToStringConverter.cs @@ -9,7 +9,7 @@ namespace Filtration.Converters { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var test = (ILootFilterBlockItem)Activator.CreateInstance((Type) value); + var test = (IItemFilterBlockItem)Activator.CreateInstance((Type) value); return test.DisplayHeading; } diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj index 5d3958f..e132367 100644 --- a/Filtration/Filtration.csproj +++ b/Filtration/Filtration.csproj @@ -130,19 +130,20 @@ - - - - + + + + + - + - - + + @@ -153,27 +154,27 @@ - - - - + + + + - - LootFilterBlockDisplaySettingsView.xaml + + ItemFilterBlockDisplaySettingsView.xaml - - LootFilterScriptView.xaml + + ItemFilterScriptView.xaml - - LootFilterBlockView.xaml + + ItemFilterBlockView.xaml NumericFilterPredicateControl.xaml - - LootFilterSectionView.xaml + + ItemFilterSectionView.xaml AboutWindow.xaml @@ -206,7 +207,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -214,15 +215,15 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/Filtration/Models/BlockItemBaseTypes/BlockItembase.cs b/Filtration/Models/BlockItemBaseTypes/BlockItembase.cs index 0a352c2..48a9e2b 100644 --- a/Filtration/Models/BlockItemBaseTypes/BlockItembase.cs +++ b/Filtration/Models/BlockItemBaseTypes/BlockItembase.cs @@ -5,7 +5,7 @@ using Filtration.Annotations; namespace Filtration.Models.BlockItemBaseTypes { - abstract class BlockItemBase : ILootFilterBlockItem + abstract class BlockItemBase : IItemFilterBlockItem { public abstract string PrefixText { get; } public abstract int MaximumAllowed { get; } diff --git a/Filtration/Models/ILootFilterBlockItem.cs b/Filtration/Models/IItemFilterBlockItem.cs similarity index 85% rename from Filtration/Models/ILootFilterBlockItem.cs rename to Filtration/Models/IItemFilterBlockItem.cs index 4bccfd9..feb5a96 100644 --- a/Filtration/Models/ILootFilterBlockItem.cs +++ b/Filtration/Models/IItemFilterBlockItem.cs @@ -3,7 +3,7 @@ using System.Windows.Media; namespace Filtration.Models { - internal interface ILootFilterBlockItem : INotifyPropertyChanged + internal interface IItemFilterBlockItem : INotifyPropertyChanged { string PrefixText { get; } int MaximumAllowed { get; } diff --git a/Filtration/Models/LootFilterBlock.cs b/Filtration/Models/ItemFilterBlock.cs similarity index 79% rename from Filtration/Models/LootFilterBlock.cs rename to Filtration/Models/ItemFilterBlock.cs index d8cb7e9..0f16372 100644 --- a/Filtration/Models/LootFilterBlock.cs +++ b/Filtration/Models/ItemFilterBlock.cs @@ -3,15 +3,14 @@ using System.Collections.ObjectModel; using System.Linq; using Filtration.Enums; using Filtration.Models.BlockItemBaseTypes; -using Filtration.Models.BlockItemTypes; namespace Filtration.Models { - internal class LootFilterBlock + internal class ItemFilterBlock { - public LootFilterBlock() + public ItemFilterBlock() { - BlockItems = new ObservableCollection {new ActionBlockItem(BlockAction.Show)}; + BlockItems = new ObservableCollection {new ActionBlockItem(BlockAction.Show)}; } public string Description { get; set; } @@ -30,7 +29,7 @@ namespace Filtration.Models } } - public ObservableCollection BlockItems { get; private set; } + public ObservableCollection BlockItems { get; private set; } public int BlockCount(Type type) { @@ -39,7 +38,7 @@ namespace Filtration.Models public bool AddBlockItemAllowed(Type type) { - var blockItem = (ILootFilterBlockItem)Activator.CreateInstance(type); + var blockItem = (IItemFilterBlockItem)Activator.CreateInstance(type); return BlockCount(type) < blockItem.MaximumAllowed; } diff --git a/Filtration/Models/ItemFilterBlockGroup.cs b/Filtration/Models/ItemFilterBlockGroup.cs new file mode 100644 index 0000000..5c56259 --- /dev/null +++ b/Filtration/Models/ItemFilterBlockGroup.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Filtration.Models +{ + class ItemFilterBlockGroup + { + } +} diff --git a/Filtration/Models/LootFilterScript.cs b/Filtration/Models/ItemFilterScript.cs similarity index 89% rename from Filtration/Models/LootFilterScript.cs rename to Filtration/Models/ItemFilterScript.cs index 3f0908a..fc25075 100644 --- a/Filtration/Models/LootFilterScript.cs +++ b/Filtration/Models/ItemFilterScript.cs @@ -3,19 +3,17 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using Filtration.Models.BlockItemTypes; -using Filtration.ViewModels; -using Filtration.Views; namespace Filtration.Models { - internal class LootFilterScript + internal class ItemFilterScript { - public LootFilterScript() + public ItemFilterScript() { - LootFilterBlocks = new ObservableCollection(); + ItemFilterBlocks = new ObservableCollection(); } - public ObservableCollection LootFilterBlocks { get; set; } + public ObservableCollection ItemFilterBlocks { get; set; } public string FilePath { get; set; } public string Description { get; set; } public DateTime DateModified { get; set; } @@ -24,7 +22,7 @@ namespace Filtration.Models { var validationErrors = new List(); - if (LootFilterBlocks.Count == 0) + if (ItemFilterBlocks.Count == 0) { validationErrors.Add("A script must have at least one block"); } @@ -37,7 +35,7 @@ namespace Filtration.Models foreach ( var block in - LootFilterBlocks.Where(b => BlockIsColorReplacementCandidate(replaceColorsParameterSet, b))) + ItemFilterBlocks.Where(b => BlockIsColorReplacementCandidate(replaceColorsParameterSet, b))) { if (replaceColorsParameterSet.ReplaceTextColor) { @@ -58,7 +56,7 @@ namespace Filtration.Models } - private bool BlockIsColorReplacementCandidate(ReplaceColorsParameterSet replaceColorsParameterSet, LootFilterBlock block) + private bool BlockIsColorReplacementCandidate(ReplaceColorsParameterSet replaceColorsParameterSet, ItemFilterBlock block) { var textColorItem = block.HasBlockItemOfType() ? block.BlockItems.OfType().First() diff --git a/Filtration/Models/ItemFilterSection.cs b/Filtration/Models/ItemFilterSection.cs new file mode 100644 index 0000000..83d54f6 --- /dev/null +++ b/Filtration/Models/ItemFilterSection.cs @@ -0,0 +1,6 @@ +namespace Filtration.Models +{ + internal class ItemFilterSection : ItemFilterBlock + { + } +} diff --git a/Filtration/Models/LootFilterSection.cs b/Filtration/Models/LootFilterSection.cs deleted file mode 100644 index 19c9de2..0000000 --- a/Filtration/Models/LootFilterSection.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Filtration.Models -{ - internal class LootFilterSection : LootFilterBlock - { - } -} diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs index 20ec38e..e5838f4 100644 --- a/Filtration/Properties/AssemblyInfo.cs +++ b/Filtration/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Filtration")] -[assembly: AssemblyDescription("A loot filter script manager for Path of Exile")] +[assembly: AssemblyDescription("An item filter script manager for Path of Exile")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("XVar Industries Inc.")] [assembly: AssemblyProduct("Filtration")] diff --git a/Filtration/Services/LootFilterPersistenceService.cs b/Filtration/Services/ItemFilterPersistenceService.cs similarity index 52% rename from Filtration/Services/LootFilterPersistenceService.cs rename to Filtration/Services/ItemFilterPersistenceService.cs index 254df27..1b1fb98 100644 --- a/Filtration/Services/LootFilterPersistenceService.cs +++ b/Filtration/Services/ItemFilterPersistenceService.cs @@ -3,41 +3,41 @@ using Filtration.Translators; namespace Filtration.Services { - internal interface ILootFilterPersistenceService + internal interface IItemFilterPersistenceService { - string LootFilterScriptDirectory { get; set; } - LootFilterScript LoadLootFilterScript(string filePath); - void SaveLootFilterScript(LootFilterScript script); + string ItemFilterScriptDirectory { get; set; } + ItemFilterScript LoadItemFilterScript(string filePath); + void SaveItemFilterScript(ItemFilterScript script); string DefaultPathOfExileDirectory(); } - internal class LootFilterPersistenceService : ILootFilterPersistenceService + internal class ItemFilterPersistenceService : IItemFilterPersistenceService { private readonly IFileSystemService _fileSystemService; - private readonly ILootFilterScriptTranslator _lootFilterScriptTranslator; + private readonly IItemFilterScriptTranslator _itemFilterScriptTranslator; - public LootFilterPersistenceService(IFileSystemService fileSystemService, ILootFilterScriptTranslator lootFilterScriptTranslator) + public ItemFilterPersistenceService(IFileSystemService fileSystemService, IItemFilterScriptTranslator itemFilterScriptTranslator) { _fileSystemService = fileSystemService; - _lootFilterScriptTranslator = lootFilterScriptTranslator; + _itemFilterScriptTranslator = itemFilterScriptTranslator; } - public string LootFilterScriptDirectory { get; set; } + public string ItemFilterScriptDirectory { get; set; } - public LootFilterScript LoadLootFilterScript(string filePath) + public ItemFilterScript LoadItemFilterScript(string filePath) { var script = - _lootFilterScriptTranslator.TranslateStringToLootFilterScript( + _itemFilterScriptTranslator.TranslateStringToItemFilterScript( _fileSystemService.ReadFileAsString(filePath)); script.FilePath = filePath; return script; } - public void SaveLootFilterScript(LootFilterScript script) + public void SaveItemFilterScript(ItemFilterScript script) { _fileSystemService.WriteFileFromString(script.FilePath, - _lootFilterScriptTranslator.TranslateLootFilterScriptToString(script)); + _itemFilterScriptTranslator.TranslateItemFilterScriptToString(script)); } public string DefaultPathOfExileDirectory() diff --git a/Filtration/Translators/LootFilterBlockTranslator.cs b/Filtration/Translators/ItemFilterBlockTranslator.cs similarity index 93% rename from Filtration/Translators/LootFilterBlockTranslator.cs rename to Filtration/Translators/ItemFilterBlockTranslator.cs index 377ff56..2a10f7e 100644 --- a/Filtration/Translators/LootFilterBlockTranslator.cs +++ b/Filtration/Translators/ItemFilterBlockTranslator.cs @@ -13,28 +13,28 @@ using Filtration.Utilities; namespace Filtration.Translators { - internal interface ILootFilterBlockTranslator + internal interface IItemFilterBlockTranslator { - LootFilterBlock TranslateStringToLootFilterBlock(string inputString); - string TranslateLootFilterBlockToString(LootFilterBlock block); + ItemFilterBlock TranslateStringToItemFilterBlock(string inputString); + string TranslateItemFilterBlockToString(ItemFilterBlock block); } - internal class LootFilterBlockTranslator : ILootFilterBlockTranslator + internal class ItemFilterBlockTranslator : IItemFilterBlockTranslator { private const string Indent = " "; private readonly string _newLine = Environment.NewLine + Indent; - // This method converts a string into a LootFilterBlock. This is used for pasting LootFilterBlocks - // and reading LootFilterScripts from a file. - public LootFilterBlock TranslateStringToLootFilterBlock(string inputString) + // This method converts a string into a ItemFilterBlock. This is used for pasting ItemFilterBlocks + // and reading ItemFilterScripts from a file. + public ItemFilterBlock TranslateStringToItemFilterBlock(string inputString) { - var block = new LootFilterBlock(); + var block = new ItemFilterBlock(); var showHideFound = false; foreach (var line in new LineReader(() => new StringReader(inputString))) { if (line.StartsWith(@"# Section:")) { - var section = new LootFilterSection + var section = new ItemFilterSection { Description = line.Substring(line.IndexOf(":", StringComparison.Ordinal) + 1).Trim() }; @@ -215,7 +215,7 @@ namespace Filtration.Translators return block; } - private static void RemoveExistingBlockItemsOfType(LootFilterBlock block) + private static void RemoveExistingBlockItemsOfType(ItemFilterBlock block) { var existingBlockItemCount = block.BlockItems.Count(b => b.GetType() == typeof(T)); if (existingBlockItemCount > 0) @@ -225,7 +225,7 @@ namespace Filtration.Translators } } - private static void AddNumericFilterPredicateItemToBlockItems(LootFilterBlock block, string inputString) where T : NumericFilterPredicateBlockItem + private static void AddNumericFilterPredicateItemToBlockItems(ItemFilterBlock block, string inputString) where T : NumericFilterPredicateBlockItem { var blockItem = Activator.CreateInstance(); @@ -243,7 +243,7 @@ namespace Filtration.Translators predicate.PredicateOperand = Convert.ToInt16(result.Groups[2].Value); } - private static void AddStringListItemToBlockItems(LootFilterBlock block, string inputString) where T : StringListBlockItem + private static void AddStringListItemToBlockItems(ItemFilterBlock block, string inputString) where T : StringListBlockItem { var blockItem = Activator.CreateInstance(); PopulateListFromString(blockItem.Items, inputString.Substring(inputString.IndexOf(" ", StringComparison.Ordinal) + 1).Trim()); @@ -261,7 +261,7 @@ namespace Filtration.Translators } } - private static void AddColorItemToBlockItems(LootFilterBlock block, string inputString) where T : ColorBlockItem + private static void AddColorItemToBlockItems(ItemFilterBlock block, string inputString) where T : ColorBlockItem { var blockItem = Activator.CreateInstance(); blockItem.Color = GetColorFromString(inputString); @@ -294,11 +294,11 @@ namespace Filtration.Translators return new Color(); } - // This method converts a LootFilterBlock object into a string. This is used for copying a LootFilterBlock - // to the clipboard, and when saving a LootFilterScript. - public string TranslateLootFilterBlockToString(LootFilterBlock block) + // This method converts a ItemFilterBlock object into a string. This is used for copying a ItemFilterBlock + // to the clipboard, and when saving a ItemFilterScript. + public string TranslateItemFilterBlockToString(ItemFilterBlock block) { - if (block.GetType() == typeof (LootFilterSection)) + if (block.GetType() == typeof (ItemFilterSection)) { return "# Section: " + block.Description; } @@ -312,7 +312,7 @@ namespace Filtration.Translators outputString += block.Action.GetAttributeDescription(); - // This could be refactored to use the upcasted NumericFilterPredicateBlockItem (or even ILootFilterBlockItem) instead + // This could be refactored to use the upcasted NumericFilterPredicateBlockItem (or even IItemFilterBlockItem) instead // of the specific downcasts. Leaving it like this currently to preserve sorting since the different // downcasts have no defined sort order (yet). foreach (var blockItem in block.BlockItems.OfType()) diff --git a/Filtration/Translators/LootFilterScriptTranslator.cs b/Filtration/Translators/ItemFilterScriptTranslator.cs similarity index 80% rename from Filtration/Translators/LootFilterScriptTranslator.cs rename to Filtration/Translators/ItemFilterScriptTranslator.cs index e3102fe..5aceb5e 100644 --- a/Filtration/Translators/LootFilterScriptTranslator.cs +++ b/Filtration/Translators/ItemFilterScriptTranslator.cs @@ -7,24 +7,24 @@ using Filtration.Utilities; namespace Filtration.Translators { - internal interface ILootFilterScriptTranslator + internal interface IItemFilterScriptTranslator { - LootFilterScript TranslateStringToLootFilterScript(string inputString); - string TranslateLootFilterScriptToString(LootFilterScript script); + ItemFilterScript TranslateStringToItemFilterScript(string inputString); + string TranslateItemFilterScriptToString(ItemFilterScript script); } - internal class LootFilterScriptTranslator : ILootFilterScriptTranslator + internal class ItemFilterScriptTranslator : IItemFilterScriptTranslator { - private readonly ILootFilterBlockTranslator _blockTranslator; + private readonly IItemFilterBlockTranslator _blockTranslator; - public LootFilterScriptTranslator(ILootFilterBlockTranslator blockTranslator) + public ItemFilterScriptTranslator(IItemFilterBlockTranslator blockTranslator) { _blockTranslator = blockTranslator; } - public LootFilterScript TranslateStringToLootFilterScript(string inputString) + public ItemFilterScript TranslateStringToItemFilterScript(string inputString) { - var script = new LootFilterScript(); + var script = new ItemFilterScript(); inputString = inputString.Replace("\t", ""); var conditionBoundaries = IdentifyBlockBoundaries(inputString); @@ -40,8 +40,8 @@ namespace Filtration.Translators } script.Description = script.Description.TrimEnd('\n').TrimEnd('\r'); - // Extract each block from between boundaries and translate it into a LootFilterBlock object - // and add that object to the LootFilterBlocks list + // Extract each block from between boundaries and translate it into a ItemFilterBlock object + // and add that object to the ItemFilterBlocks list for (var boundary = conditionBoundaries.First; boundary != null; boundary = boundary.Next) { var begin = boundary.Value; @@ -49,7 +49,7 @@ namespace Filtration.Translators var block = new string[end - begin]; Array.Copy(lines, begin, block, 0, end - begin); var blockString = string.Join("\r\n", block); - script.LootFilterBlocks.Add(_blockTranslator.TranslateStringToLootFilterBlock(blockString)); + script.ItemFilterBlocks.Add(_blockTranslator.TranslateStringToItemFilterBlock(blockString)); } return script; @@ -78,7 +78,7 @@ namespace Filtration.Translators return blockBoundaries; } - public string TranslateLootFilterScriptToString(LootFilterScript script) + public string TranslateItemFilterScriptToString(ItemFilterScript script) { var outputString = string.Empty; @@ -99,9 +99,9 @@ namespace Filtration.Translators } // ReSharper disable once LoopCanBeConvertedToQuery - foreach (var block in script.LootFilterBlocks) + foreach (var block in script.ItemFilterBlocks) { - outputString += _blockTranslator.TranslateLootFilterBlockToString(block) + Environment.NewLine + Environment.NewLine; + outputString += _blockTranslator.TranslateItemFilterBlockToString(block) + Environment.NewLine + Environment.NewLine; } return outputString; diff --git a/Filtration/UserControls/EditableListBoxControl.xaml b/Filtration/UserControls/EditableListBoxControl.xaml index c2accdc..d5aba6d 100644 --- a/Filtration/UserControls/EditableListBoxControl.xaml +++ b/Filtration/UserControls/EditableListBoxControl.xaml @@ -26,7 +26,7 @@ VerticalAlignment="Stretch" SelectionMode="Single" x:Name="ControlListBox" BorderBrush="#CCCCCC">