Skip to content

Commit 9b61864

Browse files
patchandthatpatchandthat
committed
Rework to request wrapper
1 parent f4ada4e commit 9b61864

10 files changed

+601
-543
lines changed

Rsk.AuthZen.Client.Test/AuthZenBoxcarRequestTests.cs renamed to Rsk.AuthZen.Client.Test/AuthZenBoxcarEvaluationRequestTests.cs

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Rsk.AuthZen.Client.Test;
66

7-
public class AuthZenBoxcarRequestTests
7+
public class AuthZenBoxcarEvaluationRequestTests
88
{
99
[Fact]
1010
public void ToDto_WhenDefaultSubjectIsSet_ShouldPopulateSubject()
@@ -20,12 +20,12 @@ public void ToDto_WhenDefaultSubjectIsSet_ShouldPopulateSubject()
2020
};
2121

2222

23-
var request = new AuthZenBoxcarRequest
23+
var request = new AuthZenBoxcarEvaluationRequest
2424
{
25-
25+
DefaultValues = defaults
2626
};
2727

28-
var dto = request.ToDto(defaults);
28+
var dto = request.ToDto();
2929

3030
dto.Subject.Should().NotBeNull();
3131
dto.Subject.Id.Should().Be("subject-id");
@@ -47,12 +47,12 @@ public void ToDto_WhenDefaultResourceIsSet_ShouldPopulateResource()
4747
}
4848
};
4949

50-
var request = new AuthZenBoxcarRequest
50+
var request = new AuthZenBoxcarEvaluationRequest
5151
{
52-
52+
DefaultValues = defaults
5353
};
5454

55-
var dto = request.ToDto(defaults);
55+
var dto = request.ToDto();
5656

5757
dto.Resource.Should().NotBeNull();
5858
dto.Resource.Id.Should().Be("resource-id");
@@ -73,12 +73,12 @@ public void ToDto_WhenDefaultActionIsSet_ShouldPopulateAction()
7373
}
7474
};
7575

76-
var request = new AuthZenBoxcarRequest
76+
var request = new AuthZenBoxcarEvaluationRequest
7777
{
78-
78+
DefaultValues = defaults
7979
};
8080

81-
var dto = request.ToDto(defaults);
81+
var dto = request.ToDto();
8282

8383
dto.Action.Should().NotBeNull();
8484
dto.Action.Name.Should().Be("action-name");
@@ -97,12 +97,12 @@ public void ToDto_WhenDefaultContextIsSet_ShouldPopulateContext()
9797
}
9898
};
9999

100-
var request = new AuthZenBoxcarRequest
100+
var request = new AuthZenBoxcarEvaluationRequest
101101
{
102-
102+
DefaultValues = defaults
103103
};
104104

105-
var dto = request.ToDto(defaults);
105+
var dto = request.ToDto();
106106

107107
dto.Context.Should().NotBeNull();
108108
dto.Context.Keys.Should().Contain("contextKey");
@@ -112,7 +112,7 @@ public void ToDto_WhenDefaultContextIsSet_ShouldPopulateContext()
112112
[Fact]
113113
public void ToDto_WhenEvaluationsIsMissing_ShouldNotPopulateEvaluations()
114114
{
115-
var request = new AuthZenBoxcarRequest
115+
var request = new AuthZenBoxcarEvaluationRequest
116116
{
117117
Evaluations = null
118118
};
@@ -125,7 +125,7 @@ public void ToDto_WhenEvaluationsIsMissing_ShouldNotPopulateEvaluations()
125125
[Fact]
126126
public void ToDto_WhenEvaluationsIsEmpty_ShouldNotPopulateEvaluations()
127127
{
128-
var request = new AuthZenBoxcarRequest
128+
var request = new AuthZenBoxcarEvaluationRequest
129129
{
130130
Evaluations = new List<AuthZenBoxcarEvaluation>()
131131
};
@@ -138,7 +138,7 @@ public void ToDto_WhenEvaluationsIsEmpty_ShouldNotPopulateEvaluations()
138138
[Fact]
139139
public void ToDto_WhenEvaluationsIsSet_ShouldPopulateEachEvaluation()
140140
{
141-
var request = new AuthZenBoxcarRequest
141+
var request = new AuthZenBoxcarEvaluationRequest
142142
{
143143
Evaluations = new List<AuthZenBoxcarEvaluation>
144144
{
@@ -192,7 +192,7 @@ public void ToDto_WhenEvaluationsIsSet_ShouldPopulateEachEvaluation()
192192
[Fact]
193193
public void ToDto_WhenEvaluationSubjectIsSet_ShouldPopulateSubject()
194194
{
195-
var request = new AuthZenBoxcarRequest
195+
var request = new AuthZenBoxcarEvaluationRequest
196196
{
197197
Evaluations = new List<AuthZenBoxcarEvaluation>()
198198
{
@@ -220,7 +220,7 @@ public void ToDto_WhenEvaluationSubjectIsSet_ShouldPopulateSubject()
220220
[Fact]
221221
public void ToDto_WhenEvaluationResourceIsSet_ShouldPopulateResource()
222222
{
223-
var request = new AuthZenBoxcarRequest
223+
var request = new AuthZenBoxcarEvaluationRequest
224224
{
225225
Evaluations = new List<AuthZenBoxcarEvaluation>()
226226
{
@@ -249,7 +249,7 @@ public void ToDto_WhenEvaluationResourceIsSet_ShouldPopulateResource()
249249
[Fact]
250250
public void ToDto_WhenEvaluationActionIsSet_ShouldPopulateAction()
251251
{
252-
var request = new AuthZenBoxcarRequest
252+
var request = new AuthZenBoxcarEvaluationRequest
253253
{
254254
Evaluations = new List<AuthZenBoxcarEvaluation>()
255255
{
@@ -275,7 +275,7 @@ public void ToDto_WhenEvaluationActionIsSet_ShouldPopulateAction()
275275
[Fact]
276276
public void ToDto_WhenEvaluationContextIsSet_ShouldPopulateContext()
277277
{
278-
var request = new AuthZenBoxcarRequest
278+
var request = new AuthZenBoxcarEvaluationRequest
279279
{
280280
Evaluations = new List<AuthZenBoxcarEvaluation>()
281281
{
@@ -302,7 +302,12 @@ public void ToDto_WhenEvaluationContextIsSet_ShouldPopulateContext()
302302
[InlineData(BoxcarSemantics.ExecuteAll)]
303303
public void ToDto_OptionsAreProvided_ShouldIncludeOptionsInRequestDto(BoxcarSemantics semantics)
304304
{
305-
var request = new AuthZenBoxcarRequest
305+
var options = new AuthZenBoxcarOptions()
306+
{
307+
Semantics = semantics
308+
};
309+
310+
var request = new AuthZenBoxcarEvaluationRequest
306311
{
307312
Evaluations = new List<AuthZenBoxcarEvaluation>
308313
{
@@ -326,15 +331,11 @@ public void ToDto_OptionsAreProvided_ShouldIncludeOptionsInRequestDto(BoxcarSema
326331
Resource = new AuthZenResource { Id = "eval-resource-id3", Type = "eval-resource-type3" },
327332
Action = new AuthZenAction { Name = "eval-action-name3", }
328333
},
329-
}
330-
};
331-
332-
var options = new AuthZenBoxcarOptions()
333-
{
334-
Semantics = semantics
334+
},
335+
Options = options
335336
};
336337

337-
var dto = request.ToDto(null, options);
338+
var dto = request.ToDto();
338339

339340
dto.Options.Should().NotBeNull();
340341
dto.Options.Should().BeEquivalentTo(options.ToDto());

0 commit comments

Comments
 (0)