Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 49 additions & 1 deletion Activout.RestClient.Test/MultipartFormDataContentTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,49 @@ await client.SendFormInForm(new FormModel
Assert.Equal("bar.txt", attachment2.Headers.ContentDisposition?.FileName);
}

[Fact]
public async Task TestSendFormInFormWithTypedPart()
{
// Arrange
var client = CreateClient();
var collector = new HttpRequestMessageCollector();

_mockHttp
.Expect(HttpMethod.Post, BaseUri + "multiparttyped")
.With(message =>
{
collector.Message = message;
return message.Content?.Headers.ContentType?.MediaType == "multipart/form-data";
})
.Respond(HttpStatusCode.OK);

// Act
await client.SendTypedParts(new[]
{
new Part<string>(Content: "foo", FileName: "foo.txt"),
new Part<string>(Content: "bar", FileName: "bar.txt")
});

// Assert
_mockHttp.VerifyNoOutstandingExpectation();

var multipartFormDataContent = collector.Message?.Content as MultipartFormDataContent;
Assert.NotNull(multipartFormDataContent);

var content = multipartFormDataContent.ToArray();
Assert.Equal(2, content.Length);

var attachment1 = content[0];
Assert.Equal("foo", await attachment1.ReadAsStringAsync());
Assert.Equal("attachment", attachment1.Headers.ContentDisposition?.Name);
Assert.Equal("foo.txt", attachment1.Headers.ContentDisposition?.FileName);

var attachment2 = content[1];
Assert.Equal("bar", await attachment2.ReadAsStringAsync());
Assert.Equal("attachment", attachment2.Headers.ContentDisposition?.Name);
Assert.Equal("bar.txt", attachment2.Headers.ContentDisposition?.FileName);
}

[Fact]
public async Task TestSendMultipartFormDataContent()
{
Expand Down Expand Up @@ -186,6 +229,12 @@ Task SendFormInForm(
[PartParam("attachment", contentType: "application/octet-stream")]
Part[] parts);

[Path("typed")]
[Post]
Task SendTypedParts(
[PartParam("attachment", contentType: "application/octet-stream")]
Part<string>[] parts);


[Post]
Task SendParts(
Expand Down Expand Up @@ -214,4 +263,3 @@ private IMultipartFormDataContentClient CreateClient()
}
}
}

17 changes: 16 additions & 1 deletion Activout.RestClient/Part.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
namespace Activout.RestClient;

public record Part(object Content, string? Name = null, string? FileName = null);
public record Part(
object? Content,
string? Name = null,
string? FileName = null);

public record Part<T>(
T Content,
string? Name = null,
string? FileName = null) : Part(Content, Name, FileName)
{
public new T Content
{
get => (T)base.Content!;
init => base.Content = value;
}
}