From 6ab326102d403e090dd90e13156dca3f95c26e29 Mon Sep 17 00:00:00 2001 From: Costin Zaharia Date: Tue, 5 Sep 2023 13:23:48 +0200 Subject: [PATCH] Fix test after rebase --- .../protobuf/RoslynMetricsImporterTest.java | 8 +++-- .../RazorProtobufImporter/file-metadata.pb | 8 ++--- .../resources/RazorProtobufImporter/log.pb | 2 +- .../RazorProtobufImporter/metrics.pb | 4 +-- .../RazorProtobufImporter/token-type.pb | 32 ++++++------------- 5 files changed, 21 insertions(+), 33 deletions(-) diff --git a/sonar-dotnet-shared-library/src/test/java/org/sonarsource/dotnet/shared/plugins/protobuf/RoslynMetricsImporterTest.java b/sonar-dotnet-shared-library/src/test/java/org/sonarsource/dotnet/shared/plugins/protobuf/RoslynMetricsImporterTest.java index 645411d04a3..f9c033fcb76 100644 --- a/sonar-dotnet-shared-library/src/test/java/org/sonarsource/dotnet/shared/plugins/protobuf/RoslynMetricsImporterTest.java +++ b/sonar-dotnet-shared-library/src/test/java/org/sonarsource/dotnet/shared/plugins/protobuf/RoslynMetricsImporterTest.java @@ -87,15 +87,17 @@ public void roslyn_metrics_are_imported() throws FileNotFoundException { verify(fileLinesContext).setIntValue(CoreMetrics.EXECUTABLE_LINES_DATA_KEY, 3, 1); verify(fileLinesContext).setIntValue(CoreMetrics.EXECUTABLE_LINES_DATA_KEY, 5, 1); - verify(fileLinesContext).setIntValue(CoreMetrics.EXECUTABLE_LINES_DATA_KEY, 9, 1); - verify(fileLinesContext).setIntValue(CoreMetrics.EXECUTABLE_LINES_DATA_KEY, 19, 1); - verify(fileLinesContext).setIntValue(CoreMetrics.EXECUTABLE_LINES_DATA_KEY, 20, 1); + verify(fileLinesContext).setIntValue(CoreMetrics.EXECUTABLE_LINES_DATA_KEY, 8, 1); + verify(fileLinesContext).setIntValue(CoreMetrics.EXECUTABLE_LINES_DATA_KEY, 13, 1); + verify(fileLinesContext).setIntValue(CoreMetrics.EXECUTABLE_LINES_DATA_KEY, 23, 1); + verify(fileLinesContext).setIntValue(CoreMetrics.EXECUTABLE_LINES_DATA_KEY, 24, 1); verify(fileLinesContext).setIntValue(CoreMetrics.NCLOC_DATA_KEY, 3, 1); verify(fileLinesContext).setIntValue(CoreMetrics.NCLOC_DATA_KEY, 5, 1); verify(fileLinesContext).setIntValue(CoreMetrics.NCLOC_DATA_KEY, 8, 1); verify(fileLinesContext).setIntValue(CoreMetrics.NCLOC_DATA_KEY, 9, 1); verify(fileLinesContext).setIntValue(CoreMetrics.NCLOC_DATA_KEY, 11, 1); + verify(fileLinesContext).setIntValue(CoreMetrics.NCLOC_DATA_KEY, 13, 1); verify(fileLinesContext).setIntValue(CoreMetrics.NCLOC_DATA_KEY, 16, 1); verify(fileLinesContext).setIntValue(CoreMetrics.NCLOC_DATA_KEY, 18, 1); verify(fileLinesContext).setIntValue(CoreMetrics.NCLOC_DATA_KEY, 19, 1); diff --git a/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/file-metadata.pb b/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/file-metadata.pb index d9e007d5cc0..a8817b310f5 100644 --- a/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/file-metadata.pb +++ b/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/file-metadata.pb @@ -1,6 +1,6 @@ -j -_C:\Sonar\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\RazorMetrics.GlobalUsings.g.csutf-8z -oC:\Sonar\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\.NETCoreApp,Version=v7.0.AssemblyAttributes.csutf-8h -]C:\Sonar\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\RazorMetrics.AssemblyInfo.csutf-8‚ +m +bC:\src\work\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\RazorMetrics.GlobalUsings.g.csutf-8} +rC:\src\work\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\.NETCoreApp,Version=v7.0.AssemblyAttributes.csutf-8k +`C:\src\work\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\RazorMetrics.AssemblyInfo.csutf-8‚ wMicrosoft.NET.Sdk.Razor.SourceGenerators\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Cases_razor.g.csutf-8… zMicrosoft.NET.Sdk.Razor.SourceGenerators\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\_Imports_razor.g.csutf-8 \ No newline at end of file diff --git a/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/log.pb b/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/log.pb index 1123f42c2a3..a34079e025e 100644 --- a/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/log.pb +++ b/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/log.pb @@ -1 +1 @@ -Roslyn version: 4.7.0.0Language version: CSharp11!Concurrent execution: enabled‡‚File 'C:\Sonar\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\RazorMetrics.GlobalUsings.g.cs' was recognized as generated—’File 'C:\Sonar\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\.NETCoreApp,Version=v7.0.AssemblyAttributes.cs' was recognized as generated…€File 'C:\Sonar\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\RazorMetrics.AssemblyInfo.cs' was recognized as generatedŸšFile 'Microsoft.NET.Sdk.Razor.SourceGenerators\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Cases_razor.g.cs' was recognized as generated¢File 'Microsoft.NET.Sdk.Razor.SourceGenerators\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\_Imports_razor.g.cs' was recognized as generated \ No newline at end of file +Roslyn version: 4.6.0.0Language version: CSharp11!Concurrent execution: enabledŠ…File 'C:\src\work\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\RazorMetrics.GlobalUsings.g.cs' was recognized as generatedš•File 'C:\src\work\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\.NETCoreApp,Version=v7.0.AssemblyAttributes.cs' was recognized as generatedˆƒFile 'C:\src\work\sonar-dotnet\its\projects\RazorMetrics\obj\Debug\net7.0\RazorMetrics.AssemblyInfo.cs' was recognized as generatedŸšFile 'Microsoft.NET.Sdk.Razor.SourceGenerators\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Cases_razor.g.cs' was recognized as generated¢File 'Microsoft.NET.Sdk.Razor.SourceGenerators\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\_Imports_razor.g.cs' was recognized as generated \ No newline at end of file diff --git a/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/metrics.pb b/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/metrics.pb index b443b71621d..2665d264882 100644 --- a/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/metrics.pb +++ b/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/metrics.pb @@ -1,2 +1,2 @@ -+ - Cases.razor 8r  ‚  \ No newline at end of file +0 + Cases.razor 8r x‚  \ No newline at end of file diff --git a/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/token-type.pb b/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/token-type.pb index 6b68ccdf4e8..c91effbb2a7 100644 --- a/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/token-type.pb +++ b/sonar-dotnet-shared-library/src/test/resources/RazorProtobufImporter/token-type.pb @@ -1,32 +1,18 @@ -é +± wMicrosoft.NET.Sdk.Razor.SourceGenerators\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Cases_razor.g.cs   -     -     -         -   +            -   - - -         -  +          - ; < D  -       ! ' I V       0 6 b s " # % ( ! " $ 5   ##' ( ##* 0 &&  ++' ( ++* 0 ,," # ,,% - --# $ --& / --1 7 --Y f --v | ---¢ ° ---² ¶ 66! " 66$ / 88' ( 88* 0 ;;  EE  EE  EE  GG  HH - HH  HH! $ HH& ) HH/ 0 JJ  JJ  MM Ę +       ! ' I V       0 6 b s " # % ( ! " $ 5   ##' ( ##* 0 &&  --  --  --" # 33" # 33% - 44# $ 44& / 441 7 44Y f 44v | +44¢ ° +44² ¶ ==! " ==$ / ??' ( ??* 0 BB  LL  LL  LL  NN  OO + OO  OO! $ OO& ) OO/ 0 QQ  QQ  TT € zMicrosoft.NET.Sdk.Razor.SourceGenerators\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\_Imports_razor.g.cs   -     -     -         -   - -   +            - -         -  +               ! $ * L Y       0 6 b s \ No newline at end of file