Explorar el Código

Move StreamBuilderTests to correct project (#7461)

Bond-009 hace 3 años
padre
commit
bb7068cb63
Se han modificado 35 ficheros con 10 adiciones y 10 borrados
  1. 0 1
      MediaBrowser.Model/Properties/AssemblyInfo.cs
  2. 0 6
      tests/Jellyfin.Dlna.Tests/Jellyfin.Dlna.Tests.csproj
  3. 3 3
      tests/Jellyfin.Model.Tests/Dlna/StreamBuilderTests.cs
  4. 7 0
      tests/Jellyfin.Model.Tests/Jellyfin.Model.Tests.csproj
  5. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-AndroidPixel.json
  6. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Chrome-NoHLS.json
  7. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Chrome.json
  8. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-DirectMedia.json
  9. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Firefox.json
  10. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-JellyfinMediaPlayer.json
  11. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-LowBandwidth.json
  12. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Null.json
  13. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-RokuSSPlus.json
  14. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-RokuSSPlusNext.json
  15. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-SafariNext.json
  16. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-TranscodeMedia.json
  17. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Yatse.json
  18. 0 0
      tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Yatse2.json
  19. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-av1-aac-srt-2600k.json
  20. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-av1-vorbis-srt-2600k.json
  21. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-vp9-aac-srt-2600k.json
  22. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-vp9-ac3-srt-2600k.json
  23. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-vp9-vorbis-srt-2600k.json
  24. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-vp9-vorbis-vtt-2600k.json
  25. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-aac-srt-2600k.json
  26. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-aac-vtt-2600k.json
  27. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-aac-srt-2600k.json
  28. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-aacDef-srt-2600k.json
  29. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-aacExt-srt-2600k.json
  30. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-srt-2600k.json
  31. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-hevc-aac-srt-15200k.json
  32. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-hevc-ac3-aac-srt-15200k.json
  33. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-hevc-ac3-aacExt-srt-15200k.json
  34. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-hevc-ac3-srt-15200k.json
  35. 0 0
      tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-raw.json

+ 0 - 1
MediaBrowser.Model/Properties/AssemblyInfo.cs

@@ -16,7 +16,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en")]
 [assembly: InternalsVisibleTo("Jellyfin.Model.Tests")]
-[assembly: InternalsVisibleTo("Jellyfin.Dlna.Tests")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

+ 0 - 6
tests/Jellyfin.Dlna.Tests/Jellyfin.Dlna.Tests.csproj

@@ -14,12 +14,6 @@
     <PackageReference Include="coverlet.collector" Version="3.1.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Test Data\**\*.*">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <!-- Code Analyzers -->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3">

+ 3 - 3
tests/Jellyfin.Dlna.Tests/StreamBuilderTests.cs → tests/Jellyfin.Model.Tests/Dlna/StreamBuilderTests.cs

@@ -14,7 +14,7 @@ using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using Xunit;
 
-namespace Jellyfin.MediaBrowser.Model.Tests
+namespace Jellyfin.Model.Tests
 {
     public class StreamBuilderTests
     {
@@ -453,8 +453,8 @@ namespace Jellyfin.MediaBrowser.Model.Tests
             var queryString = href.ElementAtOrDefault(1);
             var query = string.IsNullOrEmpty(queryString) ? System.Web.HttpUtility.ParseQueryString(queryString ?? string.Empty) : new NameValueCollection();
 
-            var filename = System.IO.Path.GetFileNameWithoutExtension(path);
-            var extension = System.IO.Path.GetExtension(path);
+            var filename = Path.GetFileNameWithoutExtension(path);
+            var extension = Path.GetExtension(path);
             if (extension.Length > 0)
             {
                 extension = extension.Substring(1);

+ 7 - 0
tests/Jellyfin.Model.Tests/Jellyfin.Model.Tests.csproj

@@ -8,12 +8,19 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Moq" Version="4.17.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="coverlet.collector" Version="3.1.2" />
     <PackageReference Include="FsCheck.Xunit" Version="2.16.4" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="Test Data\**\*.*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <!-- Code Analyzers -->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3">

+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-AndroidPixel.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-AndroidPixel.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-Chrome-NoHLS.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Chrome-NoHLS.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-Chrome.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Chrome.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-DirectMedia.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-DirectMedia.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-Firefox.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Firefox.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-JellyfinMediaPlayer.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-JellyfinMediaPlayer.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-LowBandwidth.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-LowBandwidth.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-Null.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Null.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-RokuSSPlus.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-RokuSSPlus.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-RokuSSPlusNext.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-RokuSSPlusNext.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-SafariNext.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-SafariNext.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-TranscodeMedia.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-TranscodeMedia.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-Yatse.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Yatse.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/DeviceProfile-Yatse2.json → tests/Jellyfin.Model.Tests/Test Data/DeviceProfile-Yatse2.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mkv-av1-aac-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-av1-aac-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mkv-av1-vorbis-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-av1-vorbis-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mkv-vp9-aac-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-vp9-aac-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mkv-vp9-ac3-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-vp9-ac3-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mkv-vp9-vorbis-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-vp9-vorbis-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mkv-vp9-vorbis-vtt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mkv-vp9-vorbis-vtt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-h264-aac-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-aac-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-h264-aac-vtt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-aac-vtt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-aac-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-aac-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-aacDef-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-aacDef-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-aacExt-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-aacExt-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-srt-2600k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-h264-ac3-srt-2600k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-hevc-aac-srt-15200k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-hevc-aac-srt-15200k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-hevc-ac3-aac-srt-15200k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-hevc-ac3-aac-srt-15200k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-hevc-ac3-aacExt-srt-15200k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-hevc-ac3-aacExt-srt-15200k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-mp4-hevc-ac3-srt-15200k.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-mp4-hevc-ac3-srt-15200k.json


+ 0 - 0
tests/Jellyfin.Dlna.Tests/Test Data/MediaSourceInfo-raw.json → tests/Jellyfin.Model.Tests/Test Data/MediaSourceInfo-raw.json