mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-10-31 10:37:22 -04:00 
			
		
		
		
	Merge pull request #3329 from telans/code-analyzer-tests
Enable code analyzers for tests
This commit is contained in:
		
						commit
						155ee5ee9d
					
				| @ -24,9 +24,21 @@ | |||||||
|     <PackageReference Include="Moq" Version="4.14.1" /> |     <PackageReference Include="Moq" Version="4.14.1" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <!-- Code Analyzers --> | ||||||
|  |   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" /> | ||||||
|  |   </ItemGroup> | ||||||
|  | 
 | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <ProjectReference Include="../../MediaBrowser.Api/MediaBrowser.Api.csproj" /> |     <ProjectReference Include="../../MediaBrowser.Api/MediaBrowser.Api.csproj" /> | ||||||
|     <ProjectReference Include="../../Jellyfin.Api/Jellyfin.Api.csproj" /> |     <ProjectReference Include="../../Jellyfin.Api/Jellyfin.Api.csproj" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <CodeAnalysisRuleSet>../jellyfin-tests.ruleset</CodeAnalysisRuleSet> | ||||||
|  |   </PropertyGroup> | ||||||
|  | 
 | ||||||
| </Project> | </Project> | ||||||
|  | |||||||
| @ -19,8 +19,20 @@ | |||||||
|     <PackageReference Include="coverlet.collector" Version="1.2.1" /> |     <PackageReference Include="coverlet.collector" Version="1.2.1" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <!-- Code Analyzers --> | ||||||
|  |   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" /> | ||||||
|  |   </ItemGroup> | ||||||
|  | 
 | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <ProjectReference Include="../../MediaBrowser.Common/MediaBrowser.Common.csproj" /> |     <ProjectReference Include="../../MediaBrowser.Common/MediaBrowser.Common.csproj" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <CodeAnalysisRuleSet>../jellyfin-tests.ruleset</CodeAnalysisRuleSet> | ||||||
|  |   </PropertyGroup> | ||||||
|  | 
 | ||||||
| </Project> | </Project> | ||||||
|  | |||||||
| @ -7,7 +7,8 @@ namespace Jellyfin.Common.Tests | |||||||
|     public class PasswordHashTests |     public class PasswordHashTests | ||||||
|     { |     { | ||||||
|         [Theory] |         [Theory] | ||||||
|         [InlineData("$PBKDF2$iterations=1000$62FBA410AFCA5B4475F35137AB2E8596B127E4D927BA23F6CC05C067E897042D", |         [InlineData( | ||||||
|  |             "$PBKDF2$iterations=1000$62FBA410AFCA5B4475F35137AB2E8596B127E4D927BA23F6CC05C067E897042D", | ||||||
|             "PBKDF2", |             "PBKDF2", | ||||||
|             "", |             "", | ||||||
|             "62FBA410AFCA5B4475F35137AB2E8596B127E4D927BA23F6CC05C067E897042D")] |             "62FBA410AFCA5B4475F35137AB2E8596B127E4D927BA23F6CC05C067E897042D")] | ||||||
|  | |||||||
| @ -19,8 +19,20 @@ | |||||||
|     <PackageReference Include="coverlet.collector" Version="1.2.1" /> |     <PackageReference Include="coverlet.collector" Version="1.2.1" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <!-- Code Analyzers --> | ||||||
|  |   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" /> | ||||||
|  |   </ItemGroup> | ||||||
|  | 
 | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <ProjectReference Include="../../MediaBrowser.Controller/MediaBrowser.Controller.csproj" /> |     <ProjectReference Include="../../MediaBrowser.Controller/MediaBrowser.Controller.csproj" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <CodeAnalysisRuleSet>../jellyfin-tests.ruleset</CodeAnalysisRuleSet> | ||||||
|  |   </PropertyGroup> | ||||||
|  | 
 | ||||||
| </Project> | </Project> | ||||||
|  | |||||||
| @ -9,20 +9,6 @@ namespace Jellyfin.MediaEncoding.Tests | |||||||
| { | { | ||||||
|     public class EncoderValidatorTests |     public class EncoderValidatorTests | ||||||
|     { |     { | ||||||
|         private class GetFFmpegVersionTestData : IEnumerable<object?[]> |  | ||||||
|         { |  | ||||||
|             public IEnumerator<object?[]> GetEnumerator() |  | ||||||
|             { |  | ||||||
|                 yield return new object?[] { EncoderValidatorTestsData.FFmpegV421Output, new Version(4, 2, 1) }; |  | ||||||
|                 yield return new object?[] { EncoderValidatorTestsData.FFmpegV42Output, new Version(4, 2) }; |  | ||||||
|                 yield return new object?[] { EncoderValidatorTestsData.FFmpegV414Output, new Version(4, 1, 4) }; |  | ||||||
|                 yield return new object?[] { EncoderValidatorTestsData.FFmpegV404Output, new Version(4, 0, 4) }; |  | ||||||
|                 yield return new object?[] { EncoderValidatorTestsData.FFmpegGitUnknownOutput, null }; |  | ||||||
|             } |  | ||||||
| 
 |  | ||||||
|             IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         [Theory] |         [Theory] | ||||||
|         [ClassData(typeof(GetFFmpegVersionTestData))] |         [ClassData(typeof(GetFFmpegVersionTestData))] | ||||||
|         public void GetFFmpegVersionTest(string versionOutput, Version? version) |         public void GetFFmpegVersionTest(string versionOutput, Version? version) | ||||||
| @ -41,5 +27,19 @@ namespace Jellyfin.MediaEncoding.Tests | |||||||
|             var val = new EncoderValidator(new NullLogger<EncoderValidatorTests>()); |             var val = new EncoderValidator(new NullLogger<EncoderValidatorTests>()); | ||||||
|             Assert.Equal(valid, val.ValidateVersionInternal(versionOutput)); |             Assert.Equal(valid, val.ValidateVersionInternal(versionOutput)); | ||||||
|         } |         } | ||||||
|  | 
 | ||||||
|  |         private class GetFFmpegVersionTestData : IEnumerable<object?[]> | ||||||
|  |         { | ||||||
|  |             public IEnumerator<object?[]> GetEnumerator() | ||||||
|  |             { | ||||||
|  |                 yield return new object?[] { EncoderValidatorTestsData.FFmpegV421Output, new Version(4, 2, 1) }; | ||||||
|  |                 yield return new object?[] { EncoderValidatorTestsData.FFmpegV42Output, new Version(4, 2) }; | ||||||
|  |                 yield return new object?[] { EncoderValidatorTestsData.FFmpegV414Output, new Version(4, 1, 4) }; | ||||||
|  |                 yield return new object?[] { EncoderValidatorTestsData.FFmpegV404Output, new Version(4, 0, 4) }; | ||||||
|  |                 yield return new object?[] { EncoderValidatorTestsData.FFmpegGitUnknownOutput, null }; | ||||||
|  |             } | ||||||
|  | 
 | ||||||
|  |             IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -25,8 +25,20 @@ | |||||||
|     <PackageReference Include="coverlet.collector" Version="1.2.1" /> |     <PackageReference Include="coverlet.collector" Version="1.2.1" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <!-- Code Analyzers --> | ||||||
|  |   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" /> | ||||||
|  |   </ItemGroup> | ||||||
|  | 
 | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <ProjectReference Include="../../MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj" /> |     <ProjectReference Include="../../MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <CodeAnalysisRuleSet>../jellyfin-tests.ruleset</CodeAnalysisRuleSet> | ||||||
|  |   </PropertyGroup> | ||||||
|  | 
 | ||||||
| </Project> | </Project> | ||||||
|  | |||||||
| @ -14,8 +14,20 @@ | |||||||
|     <PackageReference Include="coverlet.collector" Version="1.2.1" /> |     <PackageReference Include="coverlet.collector" Version="1.2.1" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <!-- Code Analyzers --> | ||||||
|  |   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" /> | ||||||
|  |   </ItemGroup> | ||||||
|  | 
 | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <ProjectReference Include="../../MediaBrowser.Model/MediaBrowser.Model.csproj" /> |     <ProjectReference Include="../../MediaBrowser.Model/MediaBrowser.Model.csproj" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <CodeAnalysisRuleSet>../jellyfin-tests.ruleset</CodeAnalysisRuleSet> | ||||||
|  |   </PropertyGroup> | ||||||
|  | 
 | ||||||
| </Project> | </Project> | ||||||
|  | |||||||
| @ -9,6 +9,7 @@ | |||||||
|     <TargetFramework>netcoreapp3.1</TargetFramework> |     <TargetFramework>netcoreapp3.1</TargetFramework> | ||||||
|     <IsPackable>false</IsPackable> |     <IsPackable>false</IsPackable> | ||||||
|     <Nullable>enable</Nullable> |     <Nullable>enable</Nullable> | ||||||
|  |     <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| 
 | 
 | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
| @ -21,11 +22,13 @@ | |||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <ProjectReference Include="..\..\Emby.Naming\Emby.Naming.csproj" /> |     <ProjectReference Include="..\..\Emby.Naming\Emby.Naming.csproj" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|    | 
 | ||||||
|   <!-- Code Analyzers--> |   <!-- Code Analyzers--> | ||||||
|   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> |   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> |     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" /> | ||||||
|     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> |     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> |   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  | |||||||
| @ -5,25 +5,37 @@ | |||||||
|     <ProjectGuid>{2E3A1B4B-4225-4AAA-8B29-0181A84E7AEE}</ProjectGuid> |     <ProjectGuid>{2E3A1B4B-4225-4AAA-8B29-0181A84E7AEE}</ProjectGuid> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| 
 | 
 | ||||||
|     <PropertyGroup> |   <PropertyGroup> | ||||||
|       <TargetFramework>netcoreapp3.1</TargetFramework> |     <TargetFramework>netcoreapp3.1</TargetFramework> | ||||||
|       <IsPackable>false</IsPackable> |     <IsPackable>false</IsPackable> | ||||||
|       <TreatWarningsAsErrors>true</TreatWarningsAsErrors> |     <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | ||||||
|       <Nullable>enable</Nullable> |     <Nullable>enable</Nullable> | ||||||
|       <RootNamespace>Jellyfin.Server.Implementations.Tests</RootNamespace> |     <RootNamespace>Jellyfin.Server.Implementations.Tests</RootNamespace> | ||||||
|     </PropertyGroup> |   </PropertyGroup> | ||||||
| 
 | 
 | ||||||
|     <ItemGroup> |   <ItemGroup> | ||||||
|       <PackageReference Include="AutoFixture" Version="4.11.0" /> |     <PackageReference Include="AutoFixture" Version="4.11.0" /> | ||||||
|       <PackageReference Include="AutoFixture.AutoMoq" Version="4.11.0" /> |     <PackageReference Include="AutoFixture.AutoMoq" Version="4.11.0" /> | ||||||
|       <PackageReference Include="Moq" Version="4.14.1" /> |     <PackageReference Include="Moq" Version="4.14.1" /> | ||||||
|       <PackageReference Include="xunit" Version="2.4.1" /> |     <PackageReference Include="xunit" Version="2.4.1" /> | ||||||
|       <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" /> |     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" /> | ||||||
|       <PackageReference Include="coverlet.collector" Version="1.2.1" /> |     <PackageReference Include="coverlet.collector" Version="1.2.1" /> | ||||||
|     </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|     <ItemGroup> |   <!-- Code Analyzers --> | ||||||
|       <ProjectReference Include="..\..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" /> |   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|     </ItemGroup> |     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" /> | ||||||
|  |   </ItemGroup> | ||||||
|  | 
 | ||||||
|  |   <ItemGroup> | ||||||
|  |     <ProjectReference Include="..\..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" /> | ||||||
|  |   </ItemGroup> | ||||||
|  | 
 | ||||||
|  |   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  |     <CodeAnalysisRuleSet>../jellyfin-tests.ruleset</CodeAnalysisRuleSet> | ||||||
|  |   </PropertyGroup> | ||||||
| 
 | 
 | ||||||
| </Project> | </Project> | ||||||
|  | |||||||
| @ -20,10 +20,12 @@ | |||||||
|     <ProjectReference Include="..\..\MediaBrowser.Api\MediaBrowser.Api.csproj" /> |     <ProjectReference Include="..\..\MediaBrowser.Api\MediaBrowser.Api.csproj" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|   <!-- Code Analyzers--> |   <!-- Code Analyzers --> | ||||||
|   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> |   <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> |     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" /> | ||||||
|     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> |     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> | ||||||
|  |     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> |   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user