fix: now using relative paths instead of conventional paths

kontur-courses · Dec 26, 2024 · 69a8c1f · 69a8c1f
1 parent a462b92
commit 69a8c1f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/TagCloud/WordsFilter/Dictionaries/EnUS.aff → Shared/Dictionaries/EnUS.aff b/TagCloud/WordsFilter/Dictionaries/EnUS.aff → Shared/Dictionaries/EnUS.aff
diff --git a/TagCloud/WordsFilter/Dictionaries/EnUS.dic → Shared/Dictionaries/EnUS.dic b/TagCloud/WordsFilter/Dictionaries/EnUS.dic → Shared/Dictionaries/EnUS.dic
diff --git 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<string> ApplyFilter(List<string> words) => 
         words.Where(w => !IsBoring(w)).ToList();

diff --git a/TagCloudClient/TagCloudClient.csproj b/TagCloudClient/TagCloudClient.csproj
@@ -16,4 +16,11 @@
       <PackageReference Include="CommandLineParser" Version="2.9.1" />
     </ItemGroup>
 
+    <ItemGroup>
+        <ContentWithTargetPath Include="../Shared/**">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <TargetPath>%(RecursiveDir)\%(Filename)%(Extension)</TargetPath>
+        </ContentWithTargetPath>
+    </ItemGroup>
+
 </Project>
diff --git a/TagCloudTests/TagCloudTests.csproj b/TagCloudTests/TagCloudTests.csproj
@@ -27,4 +27,17 @@
       <ProjectReference Include="..\TagCloud\TagCloud.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+        <ContentWithTargetPath Include="../Shared/**">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <TargetPath>%(RecursiveDir)\%(Filename)%(Extension)</TargetPath>
+        </ContentWithTargetPath>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Update="WordsReader/Samples/*">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
 </Project>
diff --git 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<TestCaseData> 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));
         }
     }