Skip to content

Fixed Jobs SDK bugs #1456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WhitWaldo merged 8 commits into from
Feb 11, 2025
Merged

Fixed Jobs SDK bugs #1456

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1abb647
Fixed bug when setting point in time - this has to be set against Due…
WhitWaldo Feb 10, 2025
7a87753
Updated endpoint route builder to reflect expected job handler response
WhitWaldo Feb 10, 2025
ec231e4
Removed unused type
WhitWaldo Feb 10, 2025
1c67417
Updated example to use latest jobs bits
WhitWaldo Feb 10, 2025
bdcc98d
Updated XML docs
WhitWaldo Feb 10, 2025
2bf2bad
Updated documentation to reflect the change
WhitWaldo Feb 10, 2025
171d48b
Fixed unit tests
WhitWaldo Feb 10, 2025
a37a5a7
Slight performance improvement using StreamContent than MemoryStream
WhitWaldo Feb 11, 2025
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
Prev Previous commit
Next Next commit
Fixed unit tests 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
  • Loading branch information
@WhitWaldo
WhitWaldo committed Feb 10, 2025
commit 171d48b084f04631cddc6fefc20162a26772fe28
64 changes: 10 additions & 54 deletions test/Dapr.Jobs.Test/Extensions/EndpointRouteBuilderExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,7 @@ public async Task MapDaprScheduledJobHandler_ValidRequest_ExecutesAction()
var client = server.CreateClient();

var serializedPayload = JsonSerializer.Serialize(new SamplePayload("Dapr", 789));
var serializedPayloadBytes = Encoding.UTF8.GetBytes(serializedPayload);
var jobDetails = new DaprJobDetails(new DaprJobSchedule("0 0 * * *"))
{
RepeatCount = 5,
DueTime = DateTimeOffset.UtcNow,
Ttl = DateTimeOffset.UtcNow.AddHours(1),
Payload = serializedPayloadBytes
};
var content = new StringContent(JsonSerializer.Serialize(jobDetails), Encoding.UTF8, "application/json");
var content = new StringContent(serializedPayload, Encoding.UTF8, "application/json");

const string jobName = "testJob";
var response = await client.PostAsync($"/job/{jobName}", content);
Expand All @@ -68,15 +60,7 @@ public async Task MapDaprScheduleJobHandler_HandleMissingCancellationToken()
var client = server.CreateClient();

var serializedPayload = JsonSerializer.Serialize(new SamplePayload("Dapr", 789));
var serializedPayloadBytes = Encoding.UTF8.GetBytes(serializedPayload);
var jobDetails = new DaprJobDetails(new DaprJobSchedule("0 0 * * *"))
{
RepeatCount = 5,
DueTime = DateTimeOffset.UtcNow,
Ttl = DateTimeOffset.UtcNow.AddHours(1),
Payload = serializedPayloadBytes
};
var content = new StringContent(JsonSerializer.Serialize(jobDetails), Encoding.UTF8, "application/json");
var content = new StringContent(serializedPayload, Encoding.UTF8, "application/json");

const string jobName = "testJob";
var response = await client.PostAsync($"/job/{jobName}", content);
Expand All @@ -89,31 +73,11 @@ public async Task MapDaprScheduleJobHandler_HandleMissingCancellationToken()
Assert.Equal(serializedPayload, validator.SerializedPayload);
}


[Fact]
public async Task MapDaprScheduledJobHandler_InvalidPayload()
{
// Arrange
var server = CreateTestServer();
var client = server.CreateClient();

var content = new StringContent("", Encoding.UTF8, "application/json");

// Act
const string jobName = "testJob";
var response = await client.PostAsync($"/job/{jobName}", content);

var validator = server.Services.GetRequiredService<Validator>();
Assert.Equal(jobName, validator.JobName);
Assert.Null(validator.SerializedPayload);
}

private sealed record SamplePayload(string Name, int Count);

public sealed class Validator
{
public string? JobName { get; set; }

public string? SerializedPayload { get; set; }
}

Expand All @@ -130,15 +94,10 @@ private static TestServer CreateTestServer()
app.UseRouting();
app.UseEndpoints(endpoints =>
{
endpoints.MapDaprScheduledJobHandler(async (string? jobName, DaprJobDetails? jobDetails, Validator validator, CancellationToken cancellationToken) =>
endpoints.MapDaprScheduledJobHandler(async (string jobName, ReadOnlyMemory<byte> jobPayload, Validator validator, CancellationToken cancellationToken) =>
{
if (jobName is not null)
validator.JobName = jobName;
if (jobDetails?.Payload is not null)
{
var payloadString = Encoding.UTF8.GetString(jobDetails.Payload);
validator.SerializedPayload = payloadString;
}
validator.JobName = jobName;
validator.SerializedPayload = Encoding.UTF8.GetString(jobPayload.Span);
await Task.CompletedTask;
});
});
Expand All @@ -160,15 +119,12 @@ private static TestServer CreateTestServer2()
app.UseRouting();
app.UseEndpoints(endpoints =>
{
endpoints.MapDaprScheduledJobHandler(async (string? jobName, Validator validator, DaprJobDetails? jobDetails) =>
endpoints.MapDaprScheduledJobHandler(async (string jobName, Validator validator, ReadOnlyMemory<byte> payload) =>
{
if (jobName is not null)
validator.JobName = jobName;
if (jobDetails?.Payload is not null)
{
var payloadString = Encoding.UTF8.GetString(jobDetails.Payload);
validator.SerializedPayload = payloadString;
}
validator.JobName = jobName;

var payloadString = Encoding.UTF8.GetString(payload.Span);
validator.SerializedPayload = payloadString;
await Task.CompletedTask;
});
});
Expand Down