core: relocate test classes (#9817)

Jackett · Oct 12, 2020 · 2654ba8 · 2654ba8
1 parent 056605e
commit 2654ba8
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/...est/Definitions/DefinitionsParserTests.cs → ...mon/Definitions/DefinitionsParserTests.cs b/...est/Definitions/DefinitionsParserTests.cs → ...mon/Definitions/DefinitionsParserTests.cs
@@ -7,7 +7,7 @@
 using YamlDotNet.Serialization.NamingConventions;
 using Assert = NUnit.Framework.Assert;
 
-namespace Jackett.Test.Definitions
+namespace Jackett.Test.Common.Definitions
 {
     [TestFixture]
     public class DefinitionsParserTests

diff --git a/src/Jackett.Test/Models/ResultPageTests.cs → ...ett.Test/Common/Models/ResultPageTests.cs b/src/Jackett.Test/Models/ResultPageTests.cs → ...ett.Test/Common/Models/ResultPageTests.cs
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using Assert = NUnit.Framework.Assert;
 
-namespace Jackett.Test.Models
+namespace Jackett.Test.Common.Models
 {
     class TestIndexer : BaseIndexer
     {

diff --git a/src/Jackett.Test/Utils/CookieUtilTests.cs → ...kett.Test/Common/Utils/CookieUtilTests.cs b/src/Jackett.Test/Utils/CookieUtilTests.cs → ...kett.Test/Common/Utils/CookieUtilTests.cs
@@ -6,7 +6,7 @@
 using Assert = NUnit.Framework.Assert;
 using CollectionAssert = NUnit.Framework.CollectionAssert;
 
-namespace Jackett.Test.Utils
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     public class CookieUtilTests

diff --git a/src/Jackett.Test/Utils/DateTimeUtilTests.cs → ...tt.Test/Common/Utils/DateTimeUtilTests.cs b/src/Jackett.Test/Utils/DateTimeUtilTests.cs → ...tt.Test/Common/Utils/DateTimeUtilTests.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Jackett.Common.Utils;
 using NUnit.Framework;
 
-namespace Jackett.Common.Utils.Tests
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     public class DateTimeUtilTests

diff --git a/src/Jackett.Test/Util/Invalid-RSS.xml → ...Jackett.Test/Common/Utils/Invalid-RSS.xml b/src/Jackett.Test/Util/Invalid-RSS.xml → ...Jackett.Test/Common/Utils/Invalid-RSS.xml
diff --git a/src/Jackett.Test/Util/ParseUtilTests.cs → ...ckett.Test/Common/Utils/ParseUtilTests.cs b/src/Jackett.Test/Util/ParseUtilTests.cs → ...ckett.Test/Common/Utils/ParseUtilTests.cs
@@ -6,7 +6,7 @@
 using Jackett.Common.Utils;
 using NUnit.Framework;
 
-namespace Jackett.Test.Util
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     public class ParseUtilTests

diff --git a/src/Jackett.Test/Util/ServerUtilTests.cs → ...kett.Test/Common/Utils/ServerUtilTests.cs b/src/Jackett.Test/Util/ServerUtilTests.cs → ...kett.Test/Common/Utils/ServerUtilTests.cs
@@ -2,7 +2,7 @@
 using Jackett.Common.Utils.Clients;
 using NUnit.Framework;
 
-namespace Jackett.Test.Util
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     internal class ServerUtilTests : TestBase

diff --git a/src/Jackett.Test/Utils/StringUtilTests.cs → ...kett.Test/Common/Utils/StringUtilTests.cs b/src/Jackett.Test/Utils/StringUtilTests.cs → ...kett.Test/Common/Utils/StringUtilTests.cs
@@ -2,9 +2,10 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Text;
+using Jackett.Common.Utils;
 using NUnit.Framework;
 
-namespace Jackett.Common.Utils.Tests
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     public class StringUtilTests

diff --git a/...ackett.Test/Util/TvCategoryParserTests.cs → ...est/Common/Utils/TvCategoryParserTests.cs b/...ackett.Test/Util/TvCategoryParserTests.cs → ...est/Common/Utils/TvCategoryParserTests.cs
@@ -1,7 +1,7 @@
 using Jackett.Common.Utils;
 using NUnit.Framework;
 
-namespace Jackett.Test.Util
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     internal class ParseTvShowQualityTest : TestBase

diff --git a/src/Jackett.Test/Jackett.Test.csproj b/src/Jackett.Test/Jackett.Test.csproj
@@ -10,15 +10,12 @@
   <ItemGroup>
     <Compile Remove="Indexers\**" />
     <EmbeddedResource Remove="Indexers\**" />
+    <EmbeddedResource Include="Common\Utils\Invalid-RSS.xml" />
     <None Remove="Indexers\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Util\Invalid-RSS.xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Util\Invalid-RSS.xml" />
+    <None Remove="Common\Utils\Invalid-RSS.xml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,7 +36,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Common" />
     <Folder Include="Properties\" />
+    <Folder Include="Server" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...t.Test/Services/ProtectionServiceTests.cs → ...Server/Services/ProtectionServiceTests.cs b/...t.Test/Services/ProtectionServiceTests.cs → ...Server/Services/ProtectionServiceTests.cs
@@ -3,19 +3,18 @@
 using Jackett.Common.Services.Interfaces;
 using NUnit.Framework;
 
-namespace Jackett.Test.Services
+namespace Jackett.Test.Server.Services
 {
     [TestFixture]
     internal class ProtectionServiceTests : TestBase
     {
-
         [Test]
         public void Should_be_able_to_encrypt_and_decrypt()
         {
             var ss = TestUtil.Container.Resolve<ServerConfig>();
             ss.InstanceId = "12345678";
             var ps = TestUtil.Container.Resolve<IProtectionService>();
-            var input = "test123";
+            const string input = "test123";
             var protectedInput = ps.Protect(input);
             var output = ps.UnProtect(protectedInput);