diff --git a/SySML2.NET.REST.Tests/PsmApiClientTestFixture.cs b/SySML2.NET.REST.Tests/PsmApiClientTestFixture.cs index 2c8ff879a..5cebb74fc 100644 --- a/SySML2.NET.REST.Tests/PsmApiClientTestFixture.cs +++ b/SySML2.NET.REST.Tests/PsmApiClientTestFixture.cs @@ -374,15 +374,27 @@ await Assert.ThatAsync(() => this.client.PutProjectByIdAsync(ProjectId, projectR public async Task VerifyMergeAsync() { var mergeUri = $"{BaseAddress}projects/{ProjectId}/branches/{BranchId}/merge"; + string mergeBody = null; this.mockHttp.Expect(HttpMethod.Post, mergeUri) .WithExactQueryString($"sourceCommitId={CommitId},{OtherCommitId}&description=the%20merge%20description") - .With(request => request.Content.ReadAsStringAsync().GetAwaiter().GetResult().Contains(RootNamespaceId.ToString())) + .With(request => + { + mergeBody = request.Content.ReadAsStringAsync().GetAwaiter().GetResult(); + return true; + }) .Respond(HttpStatusCode.Created, JsonMediaType, ReadPayload("commit.json")); var mergeCommit = await this.client.MergeAsync(ProjectId, [CommitId, OtherCommitId], BranchId, [new Namespace { Id = RootNamespaceId }], "the merge description"); - Assert.That(mergeCommit.Id, Is.EqualTo(CommitId)); + using (Assert.EnterMultipleScope()) + { + Assert.That(mergeCommit.Id, Is.EqualTo(CommitId)); + Assert.That(mergeBody, Does.Contain(RootNamespaceId.ToString())); + Assert.That(mergeBody, Does.Contain("\"qualifiedName\"")); + Assert.That(mergeBody, Does.Contain("\"owner\"")); + Assert.That(mergeBody, Does.Contain("\"membership\"")); + } await Assert.ThatAsync(() => this.client.MergeAsync(ProjectId, null, BranchId), Throws.TypeOf()); diff --git a/SySML2.NET.REST/PsmApiClient.cs b/SySML2.NET.REST/PsmApiClient.cs index 199224f9e..eef325092 100644 --- a/SySML2.NET.REST/PsmApiClient.cs +++ b/SySML2.NET.REST/PsmApiClient.cs @@ -307,7 +307,7 @@ private async Task CreateContentAsync(IRequest requestBody, Cancell } /// - /// Creates the JSON body of a request from a sequence of data items + /// Creates the JSON body of a request from a sequence of data items, each written as a full Data including its derived properties /// /// /// The items to send, or null to send no body @@ -327,7 +327,7 @@ private async Task CreateContentAsync(IEnumerable requestBod var stream = new MemoryStream(); - await this.serializer.SerializeAsync(requestBody, SerializationModeKind.JSON, false, stream, WriterOptions, cancellationToken); + await this.serializer.SerializeAsync(requestBody, SerializationModeKind.JSON, true, stream, WriterOptions, cancellationToken); return CreateContent(stream); }