dependabot-nuget 0.291.0 → 0.293.0

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/SerializationTests.cs

@@ -1,6 +1,5 @@
 using NuGet.Versioning;
 
-using NuGetUpdater.Core.Analyze;
 using NuGetUpdater.Core.Run;
 using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Test.Utilities;
@@ -228,37 +227,33 @@ public class SerializationTests
         Assert.False(experimentsManager.UseDirectDiscovery);
     }
 
-    [Fact]
-    public async Task DeserializeExperimentsManager_UnsupportedJobFileShape_InfoIsReportedAndEmptyExperimentSetIsReturned()
+    [Theory]
+    [MemberData(nameof(DeserializeErrorTypesData))]
+    public void SerializeError(JobErrorBase error, string expectedSerialization)
     {
-        // arrange
-        using var tempDir = new TemporaryDirectory();
-        var jobFilePath = Path.Combine(tempDir.DirectoryPath, "job.json");
-        var jobContent = """
-            {
-              "this-is-not-a-job-and-parsing-will-fail-but-an-empty-experiment-set-should-sill-be-returned": {
-              }
-            }
-            """;
-        await File.WriteAllTextAsync(jobFilePath, jobContent);
-        var capturingTestLogger = new CapturingTestLogger();
-
-        // act - this is the entrypoint the update command uses to parse the job file
-        var experimentsManager = await ExperimentsManager.FromJobFileAsync(jobFilePath, capturingTestLogger);
+        if (error is UnknownError unknown)
+        {
+            // special case the exception's call stack to make it testable
+            unknown.Details["error-backtrace"] = "TEST-BACKTRACE";
+        }
 
-        // assert
-        Assert.False(experimentsManager.UseLegacyDependencySolver);
-        Assert.False(experimentsManager.UseDirectDiscovery);
-        Assert.Single(capturingTestLogger.Messages, m => m.Contains("Error deserializing job file"));
+        var actual = HttpApiHandler.Serialize(error);
+        Assert.Equal(expectedSerialization, actual);
     }
 
     [Fact]
-    public void SerializeError()
+    public void SerializeError_AllErrorTypesHaveSerializationTests()
     {
-        var error = new JobRepoNotFound("some message");
-        var actual = HttpApiHandler.Serialize(error);
-        var expected = """{"data":{"error-type":"job_repo_not_found","error-details":{"message":"some message"}}}""";
-        Assert.Equal(expected, actual);
+        var untestedTypes = typeof(JobErrorBase).Assembly.GetTypes()
+            .Where(t => t.IsSubclassOf(typeof(JobErrorBase)))
+            .ToHashSet();
+        foreach (object?[] data in DeserializeErrorTypesData())
+        {
+            var testedErrorType = data[0]!.GetType();
+            untestedTypes.Remove(testedErrorType);
+        }
+
+        Assert.Empty(untestedTypes.Select(t => t.Name));
     }
 
     [Fact]
@@ -503,7 +498,9 @@ public class SerializationTests
                         "repo": "some/repo"
                     },
                     "commit-message-options": {
-                        "prefix": "[SECURITY] "
+                        "prefix": "[SECURITY] ",
+                        "prefix-development": null,
+                        "include-scope": true
                     }
                 }
             }
@@ -511,7 +508,66 @@ public class SerializationTests
         var jobWrapper = RunWorker.Deserialize(jsonWrapperJson)!;
         Assert.Equal("[SECURITY] ", jobWrapper.Job.CommitMessageOptions!.Prefix);
         Assert.Null(jobWrapper.Job.CommitMessageOptions!.PrefixDevelopment);
-        Assert.Null(jobWrapper.Job.CommitMessageOptions!.IncludeScope);
+        Assert.True(jobWrapper.Job.CommitMessageOptions!.IncludeScope);
+    }
+
+    public static IEnumerable<object?[]> DeserializeErrorTypesData()
+    {
+        yield return
+        [
+            new BadRequirement("some message"),
+            """
+            {"data":{"error-type":"illformed_requirement","error-details":{"message":"some message"}}}
+            """
+        ];
+
+        yield return
+        [
+            new DependencyFileNotFound("/some/file", "some message"),
+            """
+            {"data":{"error-type":"dependency_file_not_found","error-details":{"message":"some message","file-path":"/some/file"}}}
+            """
+        ];
+
+        yield return
+        [
+            new DependencyFileNotParseable("/some/file", "some message"),
+            """
+            {"data":{"error-type":"dependency_file_not_parseable","error-details":{"message":"some message","file-path":"/some/file"}}}
+            """
+        ];
+
+        yield return
+        [
+            new JobRepoNotFound("some message"),
+            """
+            {"data":{"error-type":"job_repo_not_found","error-details":{"message":"some message"}}}
+            """
+        ];
+
+        yield return
+        [
+            new PrivateSourceAuthenticationFailure(["url1", "url2"]),
+            """
+            {"data":{"error-type":"private_source_authentication_failure","error-details":{"source":"(url1|url2)"}}}
+            """
+        ];
+
+        yield return
+        [
+            new UnknownError(new Exception("some message"), "JOB-ID"),
+            """
+            {"data":{"error-type":"unknown_error","error-details":{"error-class":"Exception","error-message":"some message","error-backtrace":"TEST-BACKTRACE","package-manager":"nuget","job-id":"JOB-ID"}}}
+            """
+        ];
+
+        yield return
+        [
+            new UpdateNotPossible(["dep1", "dep2"]),
+            """
+            {"data":{"error-type":"update_not_possible","error-details":{"dependencies":["dep1","dep2"]}}}
+            """
+        ];
     }
 
     public static IEnumerable<object?[]> DeserializeAllowedUpdatesData()
@@ -596,16 +652,4 @@ public class SerializationTests
             }
         ];
     }
-
-    private class CapturingTestLogger : ILogger
-    {
-        private readonly List<string> _messages = new();
-
-        public IReadOnlyList<string> Messages => _messages;
-
-        public void LogRaw(string message)
-        {
-            _messages.Add(message);
-        }
-    }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestBase.cs

@@ -1,3 +1,10 @@
+using System.Text.Json;
+
+using NuGetUpdater.Core.Run.ApiModel;
+using NuGetUpdater.Core.Run;
+
+using Xunit;
+
 namespace NuGetUpdater.Core.Test
 {
     public abstract class TestBase
@@ -6,5 +13,22 @@ namespace NuGetUpdater.Core.Test
         {
             MSBuildHelper.RegisterMSBuild(Environment.CurrentDirectory, Environment.CurrentDirectory);
         }
+
+        protected static void ValidateError(JobErrorBase expected, JobErrorBase? actual)
+        {
+            var expectedErrorString = JsonSerializer.Serialize(expected, RunWorker.SerializerOptions);
+            var actualErrorString = actual is null
+                ? null
+                : JsonSerializer.Serialize(actual, RunWorker.SerializerOptions);
+            Assert.Equal(expectedErrorString, actualErrorString);
+        }
+
+        protected static void ValidateErrorRegex(string expectedErrorRegex, JobErrorBase? actual)
+        {
+            var actualErrorString = actual is null
+                ? null
+                : JsonSerializer.Serialize(actual, RunWorker.SerializerOptions);
+            Assert.Matches(expectedErrorRegex, actualErrorString);
+        }
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/ExpectedUpdateOperationResult.cs

@@ -4,5 +4,5 @@ namespace NuGetUpdater.Core.Test.Updater;
 
 public record ExpectedUpdateOperationResult : UpdateOperationResult
 {
-    public string? ErrorDetailsRegex { get; init; } = null;
+    public string? ErrorRegex { get; init; } = null;
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTestBase.cs

@@ -47,7 +47,7 @@ public abstract class UpdateWorkerTestBase : TestBase
     {
         return useSolution
             ? TestUpdateForSolution(dependencyName, oldVersion, newVersion, projectFiles: [(projectFilePath, projectContents)], projectFilesExpected: [(projectFilePath, expectedProjectContents)], isTransitive, additionalFiles, additionalFilesExpected, packages, experimentsManager)
-            : TestUpdateForProject(dependencyName, oldVersion, newVersion, projectFile: (projectFilePath, projectContents), expectedProjectContents, isTransitive, additionalFiles, additionalFilesExpected, packages, experimentsManager);
+            : TestUpdateForProject(dependencyName, oldVersion, newVersion, projectFile: (projectFilePath, projectContents), expectedProjectContents, isTransitive, additionalFiles, additionalFilesExpected, additionalChecks: null, packages: packages, experimentsManager: experimentsManager);
     }
 
     protected static Task TestUpdate(
@@ -65,7 +65,7 @@ public abstract class UpdateWorkerTestBase : TestBase
     {
         return useSolution
             ? TestUpdateForSolution(dependencyName, oldVersion, newVersion, projectFiles: [projectFile], projectFilesExpected: [(projectFile.Path, expectedProjectContents)], isTransitive, additionalFiles, additionalFilesExpected, packages, experimentsManager)
-            : TestUpdateForProject(dependencyName, oldVersion, newVersion, projectFile, expectedProjectContents, isTransitive, additionalFiles, additionalFilesExpected, packages, experimentsManager);
+            : TestUpdateForProject(dependencyName, oldVersion, newVersion, projectFile, expectedProjectContents, isTransitive, additionalFiles, additionalFilesExpected, additionalChecks: null, packages: packages, experimentsManager: experimentsManager);
     }
 
     protected static Task TestNoChangeforProject(
@@ -101,6 +101,7 @@ public abstract class UpdateWorkerTestBase : TestBase
         bool isTransitive = false,
         TestFile[]? additionalFiles = null,
         TestFile[]? additionalFilesExpected = null,
+        Action<string>? additionalChecks = null,
         MockNuGetPackage[]? packages = null,
         ExperimentsManager? experimentsManager = null,
         string projectFilePath = "test-project.csproj",
@@ -114,6 +115,7 @@ public abstract class UpdateWorkerTestBase : TestBase
             isTransitive,
             additionalFiles,
             additionalFilesExpected,
+            additionalChecks,
             packages,
             experimentsManager,
             expectedResult);
@@ -127,6 +129,7 @@ public abstract class UpdateWorkerTestBase : TestBase
         bool isTransitive = false,
         TestFile[]? additionalFiles = null,
         TestFile[]? additionalFilesExpected = null,
+        Action<string>? additionalChecks = null,
         MockNuGetPackage[]? packages = null,
         ExperimentsManager? experimentsManager = null,
         ExpectedUpdateOperationResult? expectedResult = null)
@@ -149,12 +152,20 @@ public abstract class UpdateWorkerTestBase : TestBase
 
             // run update
             experimentsManager ??= new ExperimentsManager();
-            var worker = new UpdaterWorker(experimentsManager, new TestLogger());
+            var worker = new UpdaterWorker("TEST-JOB-ID", experimentsManager, new TestLogger());
             var projectPath = placeFilesInSrc ? $"src/{projectFilePath}" : projectFilePath;
             var actualResult = await worker.RunWithErrorHandlingAsync(temporaryDirectory, projectPath, dependencyName, oldVersion, newVersion, isTransitive);
-            if (expectedResult is { })
+            ValidateUpdateOperationResult(expectedResult, actualResult!);
+
+            if (additionalChecks is not null)
             {
-                ValidateUpdateOperationResult(expectedResult, actualResult!);
+                var sourcesDirectory = temporaryDirectory;
+                if (placeFilesInSrc)
+                {
+                    sourcesDirectory = Path.Combine(temporaryDirectory, "src");
+                }
+
+                additionalChecks(sourcesDirectory);
             }
         });
 
@@ -167,16 +178,19 @@ public abstract class UpdateWorkerTestBase : TestBase
         AssertContainsFiles(expectedResultFiles, actualResult);
     }
 
-    protected static void ValidateUpdateOperationResult(ExpectedUpdateOperationResult expectedResult, UpdateOperationResult actualResult)
+    protected static void ValidateUpdateOperationResult(ExpectedUpdateOperationResult? expectedResult, UpdateOperationResult actualResult)
     {
-        Assert.Equal(expectedResult.ErrorType, actualResult.ErrorType);
-        if (expectedResult.ErrorDetailsRegex is not null && actualResult.ErrorDetails is string errorDetails)
+        if (expectedResult?.Error is not null)
+        {
+            ValidateError(expectedResult.Error, actualResult.Error);
+        }
+        else if (expectedResult?.ErrorRegex is not null)
         {
-            Assert.Matches(expectedResult.ErrorDetailsRegex, errorDetails);
+            ValidateErrorRegex(expectedResult.ErrorRegex, actualResult.Error);
         }
         else
         {
-            Assert.Equivalent(expectedResult.ErrorDetails, actualResult.ErrorDetails);
+            Assert.Null(actualResult.Error);
         }
     }
 
@@ -256,7 +270,7 @@ public abstract class UpdateWorkerTestBase : TestBase
 
             experimentsManager ??= new ExperimentsManager();
             var slnPath = Path.Combine(temporaryDirectory, slnName);
-            var worker = new UpdaterWorker(experimentsManager, new TestLogger());
+            var worker = new UpdaterWorker("TEST-JOB-ID", experimentsManager, new TestLogger());
             await worker.RunAsync(temporaryDirectory, slnPath, dependencyName, oldVersion, newVersion, isTransitive);
         });
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.DirsProj.cs

@@ -366,7 +366,7 @@ public partial class UpdateWorkerTests
 
                 experimentsManager ??= new ExperimentsManager();
                 var projectPath = Path.Combine(temporaryDirectory, projectFileName);
-                var worker = new UpdaterWorker(experimentsManager, new TestLogger());
+                var worker = new UpdaterWorker("TEST-JOB-ID", experimentsManager, new TestLogger());
                 await worker.RunAsync(temporaryDirectory, projectPath, dependencyName, oldVersion, newVersion, isTransitive);
             });
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.GlobalJson.cs

@@ -69,10 +69,10 @@ public partial class UpdateWorkerTests
                       <PropertyGroup>
                         <TargetFramework>netstandard2.0</TargetFramework>
                       </PropertyGroup>
-                
+
                       <ItemGroup>
                         <PackageReference Include="Some.Package" Version="13.0.3" />
-                      </ItemGroup>>
+                      </ItemGroup>
                     </Project>
                     """,
                 additionalFiles:

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.LockFile.cs

@@ -0,0 +1,251 @@
+using Xunit;
+
+namespace NuGetUpdater.Core.Test.Update;
+
+public partial class UpdateWorkerTests
+{
+    public class LockFile : UpdateWorkerTestBase
+    {
+        [Fact]
+        public async Task UpdateSingleDependency()
+        {
+            await TestUpdateForProject("Some.Package", "1.0.0", "2.0.0",
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "2.0.0", "net8.0"),
+                ],
+                // initial
+                projectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFiles:
+                [
+                    ("packages.lock.json", "{}")
+                ],
+                // expected
+                expectedProjectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="2.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalChecks: path =>
+                {
+                    var lockContents = File.ReadAllText(Path.Combine(path, "packages.lock.json"));
+                    Assert.Contains("\"resolved\": \"2.0.0\"", lockContents);
+                }
+            );
+        }
+
+        [Fact]
+        public async Task UpdateSingleDependency_CentralPackageManagement()
+        {
+            await TestUpdateForProject("Some.Package", "1.0.0", "2.0.0",
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "2.0.0", "net8.0"),
+                ],
+                // initial
+                projectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFiles:
+                [
+                    ("packages.lock.json", "{}"),
+                    ("Directory.Packages.props", """
+                        <Project>
+                          <PropertyGroup>
+                            <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+                          </PropertyGroup>
+                    
+                          <ItemGroup>
+                            <PackageVersion Include="Some.Package" Version="1.0.0" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ],
+                // expected
+                expectedProjectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFilesExpected:
+                [
+                    ("Directory.Packages.props", """
+                        <Project>
+                          <PropertyGroup>
+                            <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageVersion Include="Some.Package" Version="2.0.0" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ],
+                additionalChecks: path =>
+                {
+                    var lockContents = File.ReadAllText(Path.Combine(path, "packages.lock.json"));
+                    Assert.Contains("\"resolved\": \"2.0.0\"", lockContents);
+                }
+            );
+        }
+
+        [Fact]
+        public async Task UpdateSingleDependency_WindowsSpecific()
+        {
+            await TestUpdateForProject("Some.Package", "1.0.0", "2.0.0",
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "2.0.0", "net8.0"),
+                ],
+                // initial
+                projectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0-windows</TargetFramework>
+                        <UseWindowsForms>true</UseWindowsForms>
+                        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFiles:
+                [
+                    ("packages.lock.json", "{}")
+                ],
+                // expected
+                expectedProjectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0-windows</TargetFramework>
+                        <UseWindowsForms>true</UseWindowsForms>
+                        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="2.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalChecks: path =>
+                {
+                    var lockContents = File.ReadAllText(Path.Combine(path, "packages.lock.json"));
+                    Assert.Contains("\"resolved\": \"2.0.0\"", lockContents);
+                }
+            );
+        }
+
+        [Fact]
+        public async Task UpdateSingleDependency_CentralPackageManagement_WindowsSpecific()
+        {
+            await TestUpdateForProject("Some.Package", "1.0.0", "2.0.0",
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "2.0.0", "net8.0"),
+                ],
+                // initial
+                projectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0-windows</TargetFramework>
+                        <UseWindowsForms>true</UseWindowsForms>
+                        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFiles:
+                [
+                    ("packages.lock.json", "{}"),
+                    ("Directory.Packages.props", """
+                        <Project>
+                          <PropertyGroup>
+                            <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+                          </PropertyGroup>
+                    
+                          <ItemGroup>
+                            <PackageVersion Include="Some.Package" Version="1.0.0" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ],
+                // expected
+                expectedProjectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0-windows</TargetFramework>
+                        <UseWindowsForms>true</UseWindowsForms>
+                        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFilesExpected:
+                [
+                    ("Directory.Packages.props", """
+                        <Project>
+                          <PropertyGroup>
+                            <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageVersion Include="Some.Package" Version="2.0.0" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ],
+                additionalChecks: path =>
+                {
+                    var lockContents = File.ReadAllText(Path.Combine(path, "packages.lock.json"));
+                    Assert.Contains("\"resolved\": \"2.0.0\"", lockContents);
+                }
+            );
+        }
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.Mixed.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
 
+using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Updater;
 
 using Xunit;
@@ -16,8 +17,7 @@ public partial class UpdateWorkerTests
             using var temporaryDirectory = await TemporaryDirectory.CreateWithContentsAsync([]);
             var result = new UpdateOperationResult()
             {
-                ErrorType = ErrorType.AuthenticationFailure,
-                ErrorDetails = "<some package feed>",
+                Error = new PrivateSourceAuthenticationFailure(["<some package feed>"]),
             };
             var resultFilePath = Path.Combine(temporaryDirectory.DirectoryPath, "update-result.json");
             await UpdaterWorker.WriteResultFile(result, resultFilePath, new TestLogger());
@@ -26,16 +26,22 @@ public partial class UpdateWorkerTests
             // raw result file should look like this:
             // {
             //   ...
-            //   "ErrorType": "AuthenticationFailure",
-            //   "ErrorDetails": "<some package feed>",
+            //   "Error": {
+            //     "error-type": "private_source_authentication_failure",
+            //     "error-details": {
+            //       "source": "<some package feed>"
+            //     }
+            //   }
             //   ...
             // }
             var jsonDocument = JsonDocument.Parse(resultContent);
-            var errorType = jsonDocument.RootElement.GetProperty("ErrorType");
-            var errorDetails = jsonDocument.RootElement.GetProperty("ErrorDetails");
+            var error = jsonDocument.RootElement.GetProperty("Error");
+            var errorType = error.GetProperty("error-type");
+            var errorDetails = error.GetProperty("error-details");
+            var source = errorDetails.GetProperty("source");
 
-            Assert.Equal("AuthenticationFailure", errorType.GetString());
-            Assert.Equal("<some package feed>", errorDetails.GetString());
+            Assert.Equal("private_source_authentication_failure", errorType.GetString());
+            Assert.Equal("(<some package feed>)", source.GetString());
         }
 
         [Fact]