Skip to content

Commit 3aee6c6

Browse files
author
Neil Campbell
committed
Removing consumerName from PactVerifier ctor as it is redundant
1 parent 3ccc2a5 commit 3aee6c6

File tree

4 files changed

+40
-108
lines changed

4 files changed

+40
-108
lines changed

‎PactNet.Tests/PactVerifierTests.cs‎

Lines changed: 32 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -23,60 +23,29 @@ public class PactVerifierTests
2323
private IProviderServiceValidator _mockProviderServiceValidator;
2424
private FakeHttpMessageHandler _fakeHttpMessageHandler;
2525

26-
private IPactVerifier GetSubject(string consumerName)
26+
private IPactVerifier GetSubject()
2727
{
2828
_providerServiceValidatorFactoryCallInfo = null;
2929
_mockFileSystem = Substitute.For<IFileSystem>();
3030
_mockProviderServiceValidator = Substitute.For<IProviderServiceValidator>();
3131
_fakeHttpMessageHandler = new FakeHttpMessageHandler();
3232

33-
return new PactVerifier(consumerName, () => {}, () => {}, _mockFileSystem, httpRequestSender =>
33+
return new PactVerifier(() => {}, () => {}, _mockFileSystem, httpRequestSender =>
3434
{
3535
_providerServiceValidatorFactoryCallInfo = new Tuple<bool, IHttpRequestSender>(true, httpRequestSender);
3636

3737
return _mockProviderServiceValidator;
3838
}, new HttpClient(_fakeHttpMessageHandler));
3939
}
4040

41-
[Fact]
42-
public void Ctor_WhenCalledWithNullConsumerName_ThrowsArgumentException()
43-
{
44-
Assert.Throws<ArgumentException>(() => GetSubject(null));
45-
}
46-
47-
[Fact]
48-
public void Ctor_WhenCalledWithEmptyConsumerName_ThrowsArgumentException()
49-
{
50-
Assert.Throws<ArgumentException>(() => GetSubject(String.Empty));
51-
}
52-
53-
[Fact]
54-
public void Ctor_WhenCalledWithConsumerName_SetsConsumerName()
55-
{
56-
const string consumerName = "My Client";
57-
var pactVerifier = GetSubject(consumerName);
58-
59-
Assert.Equal(consumerName, ((PactVerifier)pactVerifier).ConsumerName);
60-
}
61-
62-
[Fact]
63-
public void Ctor_WhenConsumerNameHasBeenSetAndSupplyingADifferentConsumerName_ThrowsArgumentException()
64-
{
65-
var pactVerifier = GetSubject("My Client 2");
66-
67-
//pactVerifier.HonoursPactWith("My Client");
68-
69-
Assert.Throws<ArgumentException>(() => pactVerifier.HonoursPactWith("My Client"));
70-
}
71-
7241
[Fact]
7342
public void ProviderState_WhenCalledWithSetUpAndTearDown_SetsProviderStateWithSetUpAndTearDownActions()
7443
{
7544
const string providerState = "There is an event with id 1234 in the database";
7645
Action providerStateSetUpAction = () => { };
7746
Action providerStateTearDownAction = () => { };
7847

79-
var pactVerifier = (PactVerifier)GetSubject("My Client");
48+
var pactVerifier = (PactVerifier)GetSubject();
8049

8150
pactVerifier
8251
.ProviderState(providerState, providerStateSetUpAction, providerStateTearDownAction);
@@ -90,7 +59,7 @@ public void ProviderState_WhenCalledWithSetUpAndTearDown_SetsProviderStateWithSe
9059
[Fact]
9160
public void ProviderState_WhenCalledWithNullProviderState_ThrowsArgumentException()
9261
{
93-
var pactVerifier = GetSubject("My Client");
62+
var pactVerifier = GetSubject();
9463

9564
Assert.Throws<ArgumentException>(() =>
9665
pactVerifier
@@ -100,7 +69,7 @@ public void ProviderState_WhenCalledWithNullProviderState_ThrowsArgumentExceptio
10069
[Fact]
10170
public void ProviderState_WhenCalledWithEmptyProviderState_ThrowsArgumentException()
10271
{
103-
var pactVerifier = GetSubject("My Client");
72+
var pactVerifier = GetSubject();
10473

10574
Assert.Throws<ArgumentException>(() =>
10675
pactVerifier
@@ -110,23 +79,23 @@ public void ProviderState_WhenCalledWithEmptyProviderState_ThrowsArgumentExcepti
11079
[Fact]
11180
public void ServiceProvider_WhenCalledWithNullProviderName_ThrowsArgumentException()
11281
{
113-
var pactVerifier = GetSubject("My client");
82+
var pactVerifier = GetSubject();
11483

11584
Assert.Throws<ArgumentException>(() => pactVerifier.ServiceProvider(null, new HttpClient()));
11685
}
11786

11887
[Fact]
11988
public void ServiceProvider_WhenCalledWithEmptyProviderName_ThrowsArgumentException()
12089
{
121-
var pactVerifier = GetSubject("My client");
90+
var pactVerifier = GetSubject();
12291

12392
Assert.Throws<ArgumentException>(() => pactVerifier.ServiceProvider(String.Empty, new HttpClient()));
12493
}
12594

12695
[Fact]
12796
public void ServiceProvider_WhenCalledWithNullHttpClient_ThrowsArgumentException()
12897
{
129-
var pactVerifier = GetSubject("My client");
98+
var pactVerifier = GetSubject();
13099

131100
Assert.Throws<ArgumentException>(() => pactVerifier.ServiceProvider("Event API", httpClient: null));
132101
}
@@ -135,7 +104,7 @@ public void ServiceProvider_WhenCalledWithNullHttpClient_ThrowsArgumentException
135104
public void ServiceProvider_WhenCalledWithProviderName_SetsProviderName()
136105
{
137106
const string providerName = "Event API";
138-
var pactVerifier = GetSubject("My client");
107+
var pactVerifier = GetSubject();
139108

140109
pactVerifier.ServiceProvider(providerName, new HttpClient());
141110

@@ -146,7 +115,7 @@ public void ServiceProvider_WhenCalledWithProviderName_SetsProviderName()
146115
public void ServiceProvider_WhenCalledWithHttpClient_HttpClientRequestSenderIsPassedIntoProviderServiceValidatorFactoryWhenVerifyIsCalled()
147116
{
148117
var httpClient = new HttpClient();
149-
var pactVerifier = GetSubject("My client");
118+
var pactVerifier = GetSubject();
150119

151120
pactVerifier.ServiceProvider("Event API", httpClient);
152121

@@ -162,23 +131,23 @@ public void ServiceProvider_WhenCalledWithHttpClient_HttpClientRequestSenderIsPa
162131
[Fact]
163132
public void ServiceProvider_WhenCalledWithNullProviderNameAndCustomRequestSender_ThrowsArgumentException()
164133
{
165-
var pactVerifier = GetSubject("My client");
134+
var pactVerifier = GetSubject();
166135

167136
Assert.Throws<ArgumentException>(() => pactVerifier.ServiceProvider(null, request => new ProviderServiceResponse()));
168137
}
169138

170139
[Fact]
171140
public void ServiceProvider_WhenCalledWithNullRequestSender_ThrowsArgumentException()
172141
{
173-
var pactVerifier = GetSubject("My client");
142+
var pactVerifier = GetSubject();
174143

175144
Assert.Throws<ArgumentException>(() => pactVerifier.ServiceProvider("Event API", (Func<ProviderServiceRequest, ProviderServiceResponse>) null));
176145
}
177146

178147
[Fact]
179148
public void ServiceProvider_WhenCalledWithCustomRequestSender_CustomRequestSenderIsPassedIntoProviderServiceValidatorFactoryWhenVerifyIsCalled()
180149
{
181-
var pactVerifier = GetSubject("My client");
150+
var pactVerifier = GetSubject();
182151

183152
pactVerifier.ServiceProvider("Event API", request => new ProviderServiceResponse());
184153

@@ -194,15 +163,15 @@ public void ServiceProvider_WhenCalledWithCustomRequestSender_CustomRequestSende
194163
[Fact]
195164
public void HonoursPactWith_WhenCalledWithNullConsumerName_ThrowsArgumentException()
196165
{
197-
var pactVerifier = GetSubject("My client");
166+
var pactVerifier = GetSubject();
198167

199168
Assert.Throws<ArgumentException>(() => pactVerifier.HonoursPactWith(null));
200169
}
201170

202171
[Fact]
203172
public void HonoursPactWith_WhenCalledWithEmptyConsumerName_ThrowsArgumentException()
204173
{
205-
var pactVerifier = GetSubject("My client");
174+
var pactVerifier = GetSubject();
206175

207176
Assert.Throws<ArgumentException>(() => pactVerifier.HonoursPactWith(String.Empty));
208177
}
@@ -211,36 +180,25 @@ public void HonoursPactWith_WhenCalledWithEmptyConsumerName_ThrowsArgumentExcept
211180
public void HonoursPactWith_WhenCalledWithConsumerName_SetsConsumerName()
212181
{
213182
const string consumerName = "My Client";
214-
var pactVerifier = GetSubject(consumerName);
183+
var pactVerifier = GetSubject();
215184

216185
pactVerifier.HonoursPactWith(consumerName);
217186

218187
Assert.Equal(consumerName, ((PactVerifier)pactVerifier).ConsumerName);
219188
}
220189

221-
[Fact]
222-
public void HonoursPactWith_WhenConsumerNameHasBeenSetAndSupplyingADifferentConsumerName_ThrowsArgumentException()
223-
{
224-
var pactVerifier = GetSubject("My Client");
225-
226-
pactVerifier
227-
.ProviderState("There is an event with id 1234 in the database");
228-
229-
Assert.Throws<ArgumentException>(() => pactVerifier.HonoursPactWith("My Client 2"));
230-
}
231-
232190
[Fact]
233191
public void PactUri_WhenCalledWithNullUri_ThrowsArgumentException()
234192
{
235-
var pactVerifier = GetSubject("My Client");
193+
var pactVerifier = GetSubject();
236194

237195
Assert.Throws<ArgumentException>(() => pactVerifier.PactUri(null));
238196
}
239197

240198
[Fact]
241199
public void PactUri_WhenCalledWithEmptyUri_ThrowsArgumentException()
242200
{
243-
var pactVerifier = GetSubject("My Client");
201+
var pactVerifier = GetSubject();
244202

245203
Assert.Throws<ArgumentException>(() => pactVerifier.PactUri(String.Empty));
246204
}
@@ -249,7 +207,7 @@ public void PactUri_WhenCalledWithEmptyUri_ThrowsArgumentException()
249207
public void PactUri_WhenCalledWithUri_SetsPactFileUri()
250208
{
251209
const string pactFileUri = "../../../Consumer.Tests/pacts/my_client-event_api.json";
252-
var pactVerifier = GetSubject("My Client");
210+
var pactVerifier = GetSubject();
253211

254212
pactVerifier.PactUri(pactFileUri);
255213

@@ -259,7 +217,7 @@ public void PactUri_WhenCalledWithUri_SetsPactFileUri()
259217
[Fact]
260218
public void Verify_WhenHttpRequestSenderIsNull_ThrowsInvalidOperationException()
261219
{
262-
var pactVerifier = GetSubject("My Client");
220+
var pactVerifier = GetSubject();
263221
pactVerifier.PactUri("../../../Consumer.Tests/pacts/my_client-event_api.json");
264222

265223
Assert.Throws<InvalidOperationException>(() => pactVerifier.Verify());
@@ -268,7 +226,7 @@ public void Verify_WhenHttpRequestSenderIsNull_ThrowsInvalidOperationException()
268226
[Fact]
269227
public void Verify_WhenPactFileUriIsNull_ThrowsInvalidOperationException()
270228
{
271-
var pactVerifier = GetSubject("My Client");
229+
var pactVerifier = GetSubject();
272230
pactVerifier.ServiceProvider("Event API", new HttpClient());
273231

274232
Assert.Throws<InvalidOperationException>(() => pactVerifier.Verify());
@@ -282,7 +240,7 @@ public void Verify_WithFileSystemPactFileUri_CallsFileReadAllText()
282240
var pactUri = "../../../Consumer.Tests/pacts/my_client-event_api.json";
283241
var pactFileJson = "{ \"provider\": { \"name\": \"Event API\" }, \"consumer\": { \"name\": \"My client\" }, \"interactions\": [{ \"description\": \"My Description\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description 2\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description\", \"provider_state\": \"My Provider State 2\" }], \"metadata\": { \"pactSpecificationVersion\": \"1.0.0\" } }";
284242

285-
var pactVerifier = GetSubject(serviceConsumer);
243+
var pactVerifier = GetSubject();
286244

287245
_mockFileSystem.File.ReadAllText(pactUri).Returns(pactFileJson);
288246

@@ -304,7 +262,7 @@ public void Verify_WithHttpPactFileUri_CallsHttpClientWithJsonGetRequest()
304262
var pactUri = "http://yourpactserver.com/getlatestpactfile";
305263
var pactFileJson = "{ \"provider\": { \"name\": \"Event API\" }, \"consumer\": { \"name\": \"My client\" }, \"interactions\": [{ \"description\": \"My Description\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description 2\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description\", \"provider_state\": \"My Provider State 2\" }], \"metadata\": { \"pactSpecificationVersion\": \"1.0.0\" } }";
306264

307-
var pactVerifier = GetSubject(serviceConsumer);
265+
var pactVerifier = GetSubject();
308266

309267
_fakeHttpMessageHandler.Response = new HttpResponseMessage(HttpStatusCode.OK)
310268
{
@@ -330,7 +288,7 @@ public void Verify_WithHttpsPactFileUri_CallsHttpClientWithJsonGetRequest()
330288
var pactUri = "https://yourpactserver.com/getlatestpactfile";
331289
var pactFileJson = "{ \"provider\": { \"name\": \"Event API\" }, \"consumer\": { \"name\": \"My client\" }, \"interactions\": [{ \"description\": \"My Description\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description 2\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description\", \"provider_state\": \"My Provider State 2\" }], \"metadata\": { \"pactSpecificationVersion\": \"1.0.0\" } }";
332290

333-
var pactVerifier = GetSubject(serviceConsumer);
291+
var pactVerifier = GetSubject();
334292

335293
_fakeHttpMessageHandler.Response = new HttpResponseMessage(HttpStatusCode.OK)
336294
{
@@ -355,7 +313,7 @@ public void Verify_WithFileUriAndWhenFileDoesNotExistOnFileSystem_ThrowsInvalidO
355313
var serviceConsumer = "My client";
356314
var pactUri = "../../../Consumer.Tests/pacts/my_client-event_api.json";
357315

358-
var pactVerifier = GetSubject(serviceConsumer);
316+
var pactVerifier = GetSubject();
359317

360318
_mockFileSystem.File.ReadAllText(pactUri).Returns(x => { throw new FileNotFoundException(); });
361319

@@ -376,7 +334,7 @@ public void Verify_WithHttpUriAndNonSuccessfulStatusCodeIsReturned_ThrowsInvalid
376334
var serviceConsumer = "My client";
377335
var pactUri = "http://yourpactserver.com/getlatestpactfile";
378336

379-
var pactVerifier = GetSubject(serviceConsumer);
337+
var pactVerifier = GetSubject();
380338

381339
_fakeHttpMessageHandler.Response = new HttpResponseMessage(HttpStatusCode.Unauthorized);
382340

@@ -399,7 +357,7 @@ public void Verify_WhenPactFileWithNoInteractionsExistOnFileSystem_CallsPactProv
399357
var pactFileJson = "{ \"provider\": { \"name\": \"" + serviceProvider + "\" }, \"consumer\": { \"name\": \"" + serviceConsumer + "\" }, \"metadata\": { \"pactSpecificationVersion\": \"1.0.0\" } }";
400358
var httpClient = new HttpClient();
401359

402-
var pactVerifier = GetSubject(serviceConsumer);
360+
var pactVerifier = GetSubject();
403361

404362
_mockFileSystem.File.ReadAllText(pactUri).Returns(pactFileJson);
405363

@@ -422,7 +380,7 @@ public void Verify_WithNoProviderDescriptionOrProviderStateSupplied_CallsProvide
422380
var pactFileJson = "{ \"provider\": { \"name\": \"Event API\" }, \"consumer\": { \"name\": \"My client\" }, \"interactions\": [{ \"description\": \"My Description\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description 2\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description\", \"provider_state\": \"My Provider State 2\" }], \"metadata\": { \"pactSpecificationVersion\": \"1.0.0\" } }";
423381
var httpClient = new HttpClient();
424382

425-
var pactVerifier = GetSubject("My client");
383+
var pactVerifier = GetSubject();
426384

427385
_mockFileSystem.File.ReadAllText(pactUri).Returns(pactFileJson);
428386

@@ -449,7 +407,7 @@ public void Verify_WithDescription_CallsProviderServiceValidatorWith2FilteredInt
449407
var pactFileJson = "{ \"provider\": { \"name\": \"Event API\" }, \"consumer\": { \"name\": \"My client\" }, \"interactions\": [{ \"description\": \"My Description\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description 2\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description\", \"provider_state\": \"My Provider State 2\" }], \"metadata\": { \"pactSpecificationVersion\": \"1.0.0\" } }";
450408
var httpClient = new HttpClient();
451409

452-
var pactVerifier = GetSubject("My client");
410+
var pactVerifier = GetSubject();
453411

454412
_mockFileSystem.File.ReadAllText(pactUri).Returns(pactFileJson);
455413

@@ -476,7 +434,7 @@ public void Verify_WithProviderState_CallsProviderServiceValidatorWith2FilteredI
476434
var pactFileJson = "{ \"provider\": { \"name\": \"Event API\" }, \"consumer\": { \"name\": \"My client\" }, \"interactions\": [{ \"description\": \"My Description\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description 2\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description\", \"provider_state\": \"My Provider State 2\" }], \"metadata\": { \"pactSpecificationVersion\": \"1.0.0\" } }";
477435
var httpClient = new HttpClient();
478436

479-
var pactVerifier = GetSubject("My client");
437+
var pactVerifier = GetSubject();
480438

481439
_mockFileSystem.File.ReadAllText(pactUri).Returns(pactFileJson);
482440

@@ -504,7 +462,7 @@ public void Verify_WithDescriptionAndProviderState_CallsProviderServiceValidator
504462
var pactFileJson = "{ \"provider\": { \"name\": \"Event API\" }, \"consumer\": { \"name\": \"My client\" }, \"interactions\": [{ \"description\": \"My Description\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description 2\", \"provider_state\": \"My Provider State\" }, { \"description\": \"My Description\", \"provider_state\": \"My Provider State 2\" }], \"metadata\": { \"pactSpecificationVersion\": \"1.0.0\" } }";
505463
var httpClient = new HttpClient();
506464

507-
var pactVerifier = GetSubject("My client");
465+
var pactVerifier = GetSubject();
508466

509467
_mockFileSystem.File.ReadAllText(pactUri).Returns(pactFileJson);
510468

@@ -528,7 +486,7 @@ public void Verify_WithProviderStateSet_CallsProviderServiceValidatorWithProvide
528486
{
529487
var httpClient = new HttpClient();
530488

531-
var pactVerifier = GetSubject("My client");
489+
var pactVerifier = GetSubject();
532490

533491
_mockFileSystem.File.ReadAllText(Arg.Any<string>()).Returns("{}");
534492

0 commit comments

Comments
 (0)