diff --git a/TagCloud/WordsFilter/Dictionaries/EnUS.aff b/Shared/Dictionaries/EnUS.aff similarity index 100% rename from TagCloud/WordsFilter/Dictionaries/EnUS.aff rename to Shared/Dictionaries/EnUS.aff diff --git a/TagCloud/WordsFilter/Dictionaries/EnUS.dic b/Shared/Dictionaries/EnUS.dic similarity index 100% rename from TagCloud/WordsFilter/Dictionaries/EnUS.dic rename to Shared/Dictionaries/EnUS.dic diff --git a/TagCloud/WordsFilter/BoringWordsFilter.cs b/TagCloud/WordsFilter/BoringWordsFilter.cs index 58421174..d4aa6de6 100644 --- a/TagCloud/WordsFilter/BoringWordsFilter.cs +++ b/TagCloud/WordsFilter/BoringWordsFilter.cs @@ -5,8 +5,8 @@ namespace TagCloud.WordsFilter; public class BoringWordsFilter : IWordsFilter { private readonly WordList wordList = WordList.CreateFromFiles( - "../../../../TagCloud/WordsFilter/Dictionaries/EnUS.dic", - "../../../../TagCloud/WordsFilter/Dictionaries/EnUS.aff"); + "Dictionaries/EnUS.dic", + "Dictionaries/EnUS.aff"); public List ApplyFilter(List words) => words.Where(w => !IsBoring(w)).ToList(); diff --git a/TagCloudClient/TagCloudClient.csproj b/TagCloudClient/TagCloudClient.csproj index 63d7d16c..8ef78950 100644 --- a/TagCloudClient/TagCloudClient.csproj +++ b/TagCloudClient/TagCloudClient.csproj @@ -16,4 +16,11 @@ + + + PreserveNewest + %(RecursiveDir)\%(Filename)%(Extension) + + + diff --git a/TagCloudTests/TagCloudTests.csproj b/TagCloudTests/TagCloudTests.csproj index 0f2f9e1a..53f5a5f3 100644 --- a/TagCloudTests/TagCloudTests.csproj +++ b/TagCloudTests/TagCloudTests.csproj @@ -27,4 +27,17 @@ + + + PreserveNewest + %(RecursiveDir)\%(Filename)%(Extension) + + + + + + PreserveNewest + + + diff --git a/TagCloudTests/WordsReader/WordsReadersTest.cs b/TagCloudTests/WordsReader/WordsReadersTest.cs index 4e8ade1b..d8383ef0 100644 --- a/TagCloudTests/WordsReader/WordsReadersTest.cs +++ b/TagCloudTests/WordsReader/WordsReadersTest.cs @@ -8,16 +8,15 @@ namespace TagCloudTests.WordsReader; [TestFixture] public class WordsReadersTest { - private const string FileContent = - "Hello... Hello? Hello world!"; + private const string FileContent = "Hello... Hello? Hello world!"; private static IEnumerable WordsReadersTestCases { get { - yield return new TestCaseData(new WordFileReader("../../../WordsReader/Samples/text.docx")); - yield return new TestCaseData(new FileReader("../../../WordsReader/Samples/text.txt", Encoding.UTF8)); - yield return new TestCaseData(new CsvFileReader("../../../WordsReader/Samples/text.csv", CultureInfo.InvariantCulture)); + yield return new TestCaseData(new WordFileReader("WordsReader/Samples/text.docx")); + yield return new TestCaseData(new FileReader("WordsReader/Samples/text.txt", Encoding.UTF8)); + yield return new TestCaseData(new CsvFileReader("WordsReader/Samples/text.csv", CultureInfo.InvariantCulture)); } }