Skip to content
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

Update Core tests with new DPG approach to ResponseClassifier #27279

Merged
merged 1 commit into from
Mar 2, 2022
Merged

Update Core tests with new DPG approach to ResponseClassifier #27279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 13 additions & 22 deletions sdk/core/Azure.Core/tests/HttpMessageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void AppliesResponseClassifierErrors()
context.AddClassifier(204, isError: true);

HttpMessage message = new HttpMessage(new MockRequest(), default);
message.ApplyRequestContext(context, DpgClassifier.Instance);
message.ApplyRequestContext(context, ResponseClassifier200204304);

message.Response = new MockResponse(204);
Assert.IsTrue(message.ResponseClassifier.IsErrorResponse(message));
Expand All @@ -65,7 +65,7 @@ public void AppliesResponseClassifierNonErrors()
context.AddClassifier(404, isError: false);

HttpMessage message = new HttpMessage(new MockRequest(), default);
message.ApplyRequestContext(context, DpgClassifier.Instance);
message.ApplyRequestContext(context, ResponseClassifier200204304);

message.Response = new MockResponse(204);
Assert.IsFalse(message.ResponseClassifier.IsErrorResponse(message));
Expand All @@ -89,7 +89,7 @@ public void AppliesResponseClassifierBothErrorsAndNonErrors()
context.AddClassifier(404, isError: false);

HttpMessage message = new HttpMessage(new MockRequest(), default);
message.ApplyRequestContext(context, DpgClassifier.Instance);
message.ApplyRequestContext(context, ResponseClassifier200204304);

message.Response = new MockResponse(204);
Assert.IsFalse(message.ResponseClassifier.IsErrorResponse(message));
Expand All @@ -110,7 +110,7 @@ public void AppliesResponseClassifierBothErrorsAndNonErrors()
[Test]
public void SettingResponseClassifierReplacesBaseClassifier()
{
HttpMessage message = new HttpMessage(new MockRequest(), DpgClassifier.Instance);
HttpMessage message = new HttpMessage(new MockRequest(), ResponseClassifier200204304);

message.Response = new MockResponse(404);
Assert.IsTrue(message.ResponseClassifier.IsErrorResponse(message));
Expand All @@ -135,15 +135,15 @@ public void SettingResponseClassifierReplacesBaseClassifier()
[Test]
public void SettingResponseClassifierReplacesBaseClassifier_PerCallCustomization()
{
HttpMessage message = new HttpMessage(new MockRequest(), DpgClassifier.Instance);
HttpMessage message = new HttpMessage(new MockRequest(), ResponseClassifier200204304);

message.Response = new MockResponse(404);
Assert.IsTrue(message.ResponseClassifier.IsErrorResponse(message));

RequestContext context = new RequestContext();
context.AddClassifier(new StatusCodeHandler(304, true));

message.ResponseClassifier = context.Apply(DpgClassifier.Instance);
message.ResponseClassifier = context.Apply(ResponseClassifier200204304);

// This replaces the base classifier with one that only thinks 404 is a non-error
// and doesn't have opinions on anything else.
Expand Down Expand Up @@ -184,7 +184,7 @@ public void SettingResponseClassifierReplacesBaseClassifier_PerClientCustomizati
message.Response = new MockResponse(404);
Assert.IsTrue(message.ResponseClassifier.IsErrorResponse(message));

message.ResponseClassifier = DpgClassifier.Instance;
message.ResponseClassifier = ResponseClassifier200204304;

message.Response = new MockResponse(304);
Assert.IsFalse(message.ResponseClassifier.IsErrorResponse(message));
Expand All @@ -203,7 +203,7 @@ public void AppliesHandler()
context.AddClassifier(new StatusCodeHandler(204, isError: true));

HttpMessage message = new HttpMessage(new MockRequest(), default);
message.ApplyRequestContext(context, DpgClassifier.Instance);
message.ApplyRequestContext(context, ResponseClassifier200204304);

message.Response = new MockResponse(204);
Assert.IsTrue(message.ResponseClassifier.IsErrorResponse(message));
Expand All @@ -226,7 +226,7 @@ public void AppliesHandlerBeforeResponseClassifier()
context.AddClassifier(204, isError: false);

HttpMessage message = new HttpMessage(new MockRequest(), default);
message.ApplyRequestContext(context, DpgClassifier.Instance);
message.ApplyRequestContext(context, ResponseClassifier200204304);

message.Response = new MockResponse(204);
Assert.IsTrue(message.ResponseClassifier.IsErrorResponse(message));
Expand Down Expand Up @@ -315,7 +315,7 @@ public void AppliesHandlerWithLastSetWinsSemantics()
context.AddClassifier(new StatusCodeHandler(204, false));

HttpMessage message = new HttpMessage(new MockRequest(), default);
message.ApplyRequestContext(context, DpgClassifier.Instance);
message.ApplyRequestContext(context, ResponseClassifier200204304);

message.Response = new MockResponse(204);
Assert.IsFalse(message.ResponseClassifier.IsErrorResponse(message));
Expand Down Expand Up @@ -355,18 +355,9 @@ public override bool TryClassify(HttpMessage message, out bool isError)
}
}

/// <summary>
/// Example DPG classifier for testing purposes.
/// </summary>
private sealed class DpgClassifier : CoreResponseClassifier
{
private static CoreResponseClassifier _instance;
public static CoreResponseClassifier Instance => _instance ??= new DpgClassifier();

public DpgClassifier() : base(stackalloc int[] { 200, 204, 304 })
{
}
}
// Example DPG classifier for testing purposes.
private static ResponseClassifier _responseClassifier200204304;
private static ResponseClassifier ResponseClassifier200204304 => _responseClassifier200204304 ??= new CoreResponseClassifier(stackalloc int[] { 200, 204, 304 });

private sealed class HeadResponseClassifier : ResponseClassifier
{
Expand Down
17 changes: 4 additions & 13 deletions sdk/core/Azure.Core/tests/HttpPipelineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public async Task RequestContextClassifierSetsResponseIsError()
var context = new RequestContext();
context.AddClassifier(404, isError: false);

HttpMessage message = pipeline.CreateMessage(context, DpgClassifier.Instance);
HttpMessage message = pipeline.CreateMessage(context, ResponseClassifier200204304);
Request request = message.Request;
request.Method = RequestMethod.Get;
request.Uri.Reset(new Uri("https://contoso.a.io"));
Expand Down Expand Up @@ -344,18 +344,9 @@ public override bool IsErrorResponse(HttpMessage message)
}
}

/// <summary>
/// Example DPG classifier for testing purposes.
/// </summary>
private sealed class DpgClassifier : CoreResponseClassifier
{
private static CoreResponseClassifier _instance;
public static CoreResponseClassifier Instance => _instance ??= new DpgClassifier();

public DpgClassifier() : base(stackalloc int[] { 200, 204, 304 })
{
}
}
// How classifiers will be generated in DPG.
private static ResponseClassifier _responseClassifier200204304;
private static ResponseClassifier ResponseClassifier200204304 => _responseClassifier200204304 ??= new CoreResponseClassifier(stackalloc int[] { 200, 204, 304 });
#endregion

}
Expand Down