Skip to content

Commit 8d1a5a0

Browse files
hukhohukho
authored
Move unit tests to correct project (#253)
* Move unit tests to correct project * Revert some changes * Further reversion * And more
1 parent ea60998 commit 8d1a5a0

File tree

9 files changed

+63
-120
lines changed

9 files changed

+63
-120
lines changed

‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Common.UnitTests/Handler/FakeHttpMessageHandler.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
using Azure;
2-
using System.Net;
1+
using System.Net;
32
using System.Text;
43

54
namespace UKHO.PeriodicOutputService.Common.UnitTests.Handler
65
{
7-
public class FakeHttpMessageHandler : HttpMessageHandler
6+
public class FakeHttpMessageHandler(HttpResponseMessage response) : HttpMessageHandler
87
{
9-
private readonly HttpResponseMessage response;
8+
private readonly HttpResponseMessage _response = response;
109

1110
public static HttpMessageHandler GetHttpMessageHandler(string content, HttpStatusCode httpStatusCode)
1211
{
@@ -21,16 +20,11 @@ public static HttpMessageHandler GetHttpMessageHandler(string content, HttpStatu
2120
return messageHandler;
2221
}
2322

24-
public FakeHttpMessageHandler(HttpResponseMessage response)
25-
{
26-
this.response = response;
27-
}
28-
2923
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
3024
{
3125
var tcs = new TaskCompletionSource<HttpResponseMessage>();
3226

33-
tcs.SetResult(response);
27+
tcs.SetResult(_response);
3428

3529
return tcs.Task;
3630
}

‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Common.UnitTests/Helpers/CommonHelperTests.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,5 +153,19 @@ public void IsAio_BatchType(Batch batchType, bool expectedResult)
153153
{
154154
Assert.That(batchType.IsAio(), Is.EqualTo(expectedResult));
155155
}
156+
157+
[Test]
158+
public void CheckMethodReturns_CorrectBase64EncodedCredentials()
159+
{
160+
var user1Credentials = CommonHelper.GetBase64EncodedCredentials("User1", "Password1");
161+
Assert.That(user1Credentials, Is.EqualTo("VXNlcjE6UGFzc3dvcmQx"));
162+
}
163+
164+
[Test]
165+
public void CheckMethodReturns_CorrectExtractAccessToken()
166+
{
167+
var extractedAccessToken = CommonHelper.ExtractAccessToken("{\"token\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6I1234212CJ9.VLSE9fRk1234.fd73LguLf_6VBefVQqu0nj8j3dovfUNVeqZDYGZ1234\",\"expiration\":\"2022-06-15T16:02:52Z\"}");
168+
Assert.That(extractedAccessToken, Is.EqualTo("eyJhbGciOiJIUzI1NiIsInR5cCI6I1234212CJ9.VLSE9fRk1234.fd73LguLf_6VBefVQqu0nj8j3dovfUNVeqZDYGZ1234"));
169+
}
156170
}
157171
}

‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Fulfilment.UnitTests/Helpers/EssApiClientTests.cs‎ renamed to ‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Common.UnitTests/Helpers/EssApiClientTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
using Newtonsoft.Json;
44
using UKHO.PeriodicOutputService.Common.Helpers;
55
using UKHO.PeriodicOutputService.Common.Models.Ess.Response;
6-
using UKHO.PeriodicOutputService.Fulfilment.UnitTests.Handler;
6+
using UKHO.PeriodicOutputService.Common.UnitTests.Handler;
77

8-
namespace UKHO.PeriodicOutputService.Fulfilment.UnitTests.Helpers
8+
namespace UKHO.PeriodicOutputService.Common.UnitTests.Helpers
99
{
1010
[TestFixture]
1111
public class EssApiClientTests
1212
{
13-
private IEssApiClient? _essApiClient;
13+
private EssApiClient? _essApiClient;
1414
private IHttpClientFactory _fakeHttpClientFactory;
1515

1616
[SetUp]

‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Fulfilment.UnitTests/Helpers/FileSystemHelperTests.cs‎ renamed to ‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Common.UnitTests/Helpers/FileSystemHelperTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using UKHO.PeriodicOutputService.Common.Models.Pks;
77
using UKHO.PeriodicOutputService.Common.Utilities;
88

9-
namespace UKHO.PeriodicOutputService.Fulfilment.UnitTests.Helpers
9+
namespace UKHO.PeriodicOutputService.Common.UnitTests.Helpers
1010
{
1111
public class FileSystemHelperTests
1212
{
@@ -89,12 +89,12 @@ public void Does_GetFileMD5_Returns_FileDetails_With_Hash()
8989
{
9090
IEnumerable<string> fileNames = new List<string> { fileName };
9191

92-
IFileInfo fileInfo = _fakefileSystem.FileInfo.New(fileName);
92+
var fileInfo = _fakefileSystem.FileInfo.New(fileName);
9393
A.CallTo(() => fileInfo.Name).Returns(fileName);
9494
A.CallTo(() => fileInfo.OpenRead()).Returns(new MockFileSystemStream(new MemoryStream(new byte[10]), "Test", default));
9595
A.CallTo(() => _fakefileSystem.FileInfo.New(A<string>.Ignored)).Returns(fileInfo);
9696

97-
List<FileDetail>? result = _fileSystemHelper.GetFileMD5(fileNames);
97+
var result = _fileSystemHelper.GetFileMD5(fileNames);
9898

9999
Assert.Multiple(() =>
100100
{
@@ -132,7 +132,7 @@ public void Does_CreateIsoAndSha1_Executes_Successfully()
132132
[Test]
133133
public void Does_CreateXmlFile_Executes_Successfully()
134134
{
135-
byte[] byteContent = new byte[100];
135+
var byteContent = new byte[100];
136136

137137
_fileSystemHelper.CreateXmlFile(byteContent, filePath);
138138

@@ -188,7 +188,7 @@ public void Does_GetFileInBytes_Returns_Bytes_Passing_Stream()
188188

189189
A.CallTo(() => _fakeFileInfo.Open(A<FileMode>.Ignored, A<FileAccess>.Ignored, A<FileShare>.Ignored)).Returns(new MockFileSystemStream(stream, "Test", default));
190190

191-
byte[] result = _fileSystemHelper.GetFileInBytes(GetUploadFileBlockRequestModel());
191+
var result = _fileSystemHelper.GetFileInBytes(GetUploadFileBlockRequestModel());
192192

193193
Assert.That(result, Has.Length.EqualTo(100000));
194194
}
@@ -199,7 +199,7 @@ public void Does_GetFileInfo_Executes_Successfully()
199199
A.CallTo(() => _fakefileSystem.FileInfo.New(filePath)).Returns(_fakeFileInfo);
200200
A.CallTo(() => _fakeFileInfo.Name).Returns(fileName);
201201

202-
IFileInfo result = _fileSystemHelper.GetFileInfo(filePath);
202+
var result = _fileSystemHelper.GetFileInfo(filePath);
203203

204204
Assert.Multiple(() =>
205205
{

‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Fulfilment.UnitTests/Helpers/FleetManagerClientTests.cs‎ renamed to ‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Common.UnitTests/Helpers/FleetManagerApiClientTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using FakeItEasy;
33
using Newtonsoft.Json;
44
using UKHO.PeriodicOutputService.Common.Helpers;
5-
using UKHO.PeriodicOutputService.Fulfilment.UnitTests.Handler;
5+
using UKHO.PeriodicOutputService.Common.UnitTests.Handler;
66

7-
namespace UKHO.PeriodicOutputService.Fulfilment.UnitTests.Helpers
7+
namespace UKHO.PeriodicOutputService.Common.UnitTests.Helpers
88
{
99
[TestFixture]
1010
public class FleetManagerClientTests
@@ -21,7 +21,7 @@ public void Setup()
2121
[Test]
2222
public void DoesGetJwtAuthUnpToken_Returns_OK()
2323
{
24-
string AuthToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IjJaUXBKM1VwYmpBWVh";
24+
var AuthToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IjJaUXBKM1VwYmpBWVh";
2525

2626
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
2727
AuthToken, HttpStatusCode.OK);

‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Fulfilment.UnitTests/Helpers/FssApiClientTests.cs‎ renamed to ‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Common.UnitTests/Helpers/FssApiClientTests.cs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
using System.Text;
33
using FakeItEasy;
44
using UKHO.PeriodicOutputService.Common.Helpers;
5-
using UKHO.PeriodicOutputService.Fulfilment.UnitTests.Handler;
5+
using UKHO.PeriodicOutputService.Common.UnitTests.Handler;
66

7-
namespace UKHO.PeriodicOutputService.Fulfilment.UnitTests.Helpers
7+
namespace UKHO.PeriodicOutputService.Common.UnitTests.Helpers
88
{
99
[TestFixture]
1010
public class FssApiClientTests
1111
{
12-
private IFssApiClient? _fakeFssApiClient;
12+
private FssApiClient? _fakeFssApiClient;
1313
private IHttpClientFactory _fakeHttpClientFactory;
1414
private readonly string _authToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IjJaUXBKM1VwYmpBWVh";
1515

@@ -19,7 +19,7 @@ public class FssApiClientTests
1919
[Test]
2020
public void DoesGetBatchStatusAsync_Returns_OK()
2121
{
22-
HttpMessageHandler messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
22+
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
2323
_authToken, HttpStatusCode.OK);
2424

2525
var httpClient = new HttpClient(messageHandler)
@@ -31,7 +31,7 @@ public void DoesGetBatchStatusAsync_Returns_OK()
3131

3232
_fakeFssApiClient = new FssApiClient(_fakeHttpClientFactory);
3333

34-
Task<HttpResponseMessage> result = _fakeFssApiClient.GetBatchStatusAsync("http://test.com", _authToken);
34+
var result = _fakeFssApiClient.GetBatchStatusAsync("http://test.com", _authToken);
3535

3636
Assert.Multiple(() =>
3737
{
@@ -44,9 +44,9 @@ public void DoesGetBatchStatusAsync_Returns_OK()
4444
[Test]
4545
public void DoesCreateBatchAsync_Returns_OK()
4646
{
47-
string content = "";
47+
var content = "";
4848

49-
HttpMessageHandler messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
49+
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
5050
content, HttpStatusCode.OK);
5151

5252
var httpClient = new HttpClient(messageHandler)
@@ -58,7 +58,7 @@ public void DoesCreateBatchAsync_Returns_OK()
5858

5959
_fakeFssApiClient = new FssApiClient(_fakeHttpClientFactory);
6060

61-
Task<HttpResponseMessage> result = _fakeFssApiClient.CreateBatchAsync("http://test.com", content, _authToken);
61+
var result = _fakeFssApiClient.CreateBatchAsync("http://test.com", content, _authToken);
6262

6363
Assert.Multiple(() =>
6464
{
@@ -70,9 +70,9 @@ public void DoesCreateBatchAsync_Returns_OK()
7070
[Test]
7171
public void DoesAddFileInBatchAsync_Returns_OK()
7272
{
73-
string content = "";
73+
var content = "";
7474

75-
HttpMessageHandler messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
75+
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
7676
content, HttpStatusCode.OK);
7777

7878
var httpClient = new HttpClient(messageHandler)
@@ -84,7 +84,7 @@ public void DoesAddFileInBatchAsync_Returns_OK()
8484

8585
_fakeFssApiClient = new FssApiClient(_fakeHttpClientFactory);
8686

87-
Task<HttpResponseMessage> result = _fakeFssApiClient.AddFileToBatchAsync("http://test.com", content, _authToken, 1231231, "application/octet-stream");
87+
var result = _fakeFssApiClient.AddFileToBatchAsync("http://test.com", content, _authToken, 1231231, "application/octet-stream");
8888

8989
Assert.Multiple(() =>
9090
{
@@ -96,9 +96,9 @@ public void DoesAddFileInBatchAsync_Returns_OK()
9696
[Test]
9797
public void DoesUploadFileBlockAsync_Returns_OK()
9898
{
99-
string content = "";
99+
var content = "";
100100

101-
HttpMessageHandler messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
101+
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
102102
content, HttpStatusCode.OK);
103103

104104
var httpClient = new HttpClient(messageHandler)
@@ -110,7 +110,7 @@ public void DoesUploadFileBlockAsync_Returns_OK()
110110

111111
_fakeFssApiClient = new FssApiClient(_fakeHttpClientFactory);
112112

113-
Task<HttpResponseMessage> result = _fakeFssApiClient.UploadFileBlockAsync("http://test.com", Encoding.UTF8.GetBytes("whatever"), Encoding.UTF8.GetBytes("whatever"), _authToken, "application/octet-stream");
113+
var result = _fakeFssApiClient.UploadFileBlockAsync("http://test.com", Encoding.UTF8.GetBytes("whatever"), Encoding.UTF8.GetBytes("whatever"), _authToken, "application/octet-stream");
114114

115115
Assert.Multiple(() =>
116116
{
@@ -122,9 +122,9 @@ public void DoesUploadFileBlockAsync_Returns_OK()
122122
[Test]
123123
public void DoesWriteBlockInFileAsync_Returns_OK()
124124
{
125-
string content = "";
125+
var content = "";
126126

127-
HttpMessageHandler messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
127+
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
128128
content, HttpStatusCode.OK);
129129

130130
var httpClient = new HttpClient(messageHandler)
@@ -136,7 +136,7 @@ public void DoesWriteBlockInFileAsync_Returns_OK()
136136

137137
_fakeFssApiClient = new FssApiClient(_fakeHttpClientFactory);
138138

139-
Task<HttpResponseMessage> result = _fakeFssApiClient.WriteBlockInFileAsync("http://test.com", content, _authToken, "application/octet-stream");
139+
var result = _fakeFssApiClient.WriteBlockInFileAsync("http://test.com", content, _authToken, "application/octet-stream");
140140

141141
Assert.Multiple(() =>
142142
{
@@ -148,9 +148,9 @@ public void DoesWriteBlockInFileAsync_Returns_OK()
148148
[Test]
149149
public void DoesCommitBatchAsync_Returns_OK()
150150
{
151-
string content = "";
151+
var content = "";
152152

153-
HttpMessageHandler messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
153+
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
154154
content, HttpStatusCode.OK);
155155

156156
var httpClient = new HttpClient(messageHandler)
@@ -162,7 +162,7 @@ public void DoesCommitBatchAsync_Returns_OK()
162162

163163
_fakeFssApiClient = new FssApiClient(_fakeHttpClientFactory);
164164

165-
Task<HttpResponseMessage> result = _fakeFssApiClient.CommitBatchAsync("http://test.com", content, _authToken);
165+
var result = _fakeFssApiClient.CommitBatchAsync("http://test.com", content, _authToken);
166166

167167
Assert.Multiple(() =>
168168
{
@@ -174,9 +174,9 @@ public void DoesCommitBatchAsync_Returns_OK()
174174
[Test]
175175
public void DoesDownloadFile_Returns_OK()
176176
{
177-
string content = "";
177+
var content = "";
178178

179-
HttpMessageHandler messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
179+
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
180180
content, HttpStatusCode.OK);
181181

182182
var httpClient = new HttpClient(messageHandler)
@@ -188,7 +188,7 @@ public void DoesDownloadFile_Returns_OK()
188188

189189
_fakeFssApiClient = new FssApiClient(_fakeHttpClientFactory);
190190

191-
Task<HttpResponseMessage> result = _fakeFssApiClient.DownloadFile("http://test.com", _authToken, "bytes=1-1024");
191+
var result = _fakeFssApiClient.DownloadFile("http://test.com", _authToken, "bytes=1-1024");
192192

193193
Assert.Multiple(() =>
194194
{
@@ -200,9 +200,9 @@ public void DoesDownloadFile_Returns_OK()
200200
[Test]
201201
public void DoesDownloadFile_With_Client_That_Allow_Redirect_As_False_Returns_OK()
202202
{
203-
string content = "";
203+
var content = "";
204204

205-
HttpMessageHandler messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
205+
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
206206
content, HttpStatusCode.OK);
207207

208208
var httpClient = new HttpClient(messageHandler)
@@ -214,17 +214,17 @@ public void DoesDownloadFile_With_Client_That_Allow_Redirect_As_False_Returns_OK
214214

215215
_fakeFssApiClient = new FssApiClient(_fakeHttpClientFactory);
216216

217-
Task<HttpResponseMessage> result = _fakeFssApiClient.DownloadFile("http://test.com", _authToken);
217+
var result = _fakeFssApiClient.DownloadFile("http://test.com", _authToken);
218218

219219
Assert.That(result.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
220220
}
221221

222222
[Test]
223223
public void DoesGetBatchDetailsAsync_Returns_OK()
224224
{
225-
string content = "";
225+
var content = "";
226226

227-
HttpMessageHandler messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
227+
var messageHandler = FakeHttpMessageHandler.GetHttpMessageHandler(
228228
content, HttpStatusCode.OK);
229229

230230
var httpClient = new HttpClient(messageHandler)
@@ -236,7 +236,7 @@ public void DoesGetBatchDetailsAsync_Returns_OK()
236236

237237
_fakeFssApiClient = new FssApiClient(_fakeHttpClientFactory);
238238

239-
Task<HttpResponseMessage> result = _fakeFssApiClient.GetBatchDetailsAsync("http://test.com", _authToken);
239+
var result = _fakeFssApiClient.GetBatchDetailsAsync("http://test.com", _authToken);
240240

241241
Assert.Multiple(() =>
242242
{

‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Fulfilment.UnitTests/Services/FleetManagerServiceTests.cs‎ renamed to ‎UKHO.PeriodicOutputService/UKHO.PeriodicOutputService.Common.UnitTests/Services/FleetManagerServiceTests.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
using UKHO.PeriodicOutputService.Common.Configuration;
88
using UKHO.PeriodicOutputService.Common.Helpers;
99
using UKHO.PeriodicOutputService.Common.Logging;
10-
using UKHO.PeriodicOutputService.Common.Models.Fm.Response;
1110
using UKHO.PeriodicOutputService.Common.Services;
1211

13-
namespace UKHO.PeriodicOutputService.Fulfilment.UnitTests.Services
12+
namespace UKHO.PeriodicOutputService.Common.UnitTests.Services
1413
{
1514
[TestFixture]
1615
public class FleetManagerServiceTests
@@ -21,7 +20,7 @@ public class FleetManagerServiceTests
2120
private IFileSystemHelper _fakefileSystemHelper;
2221
private IConfiguration _fakeconfiguration;
2322

24-
private IFleetManagerService _fleetManagerService;
23+
private FleetManagerService _fleetManagerService;
2524

2625
[SetUp]
2726
public void Setup()
@@ -49,7 +48,7 @@ public async Task DoesGetJwtAuthUnpToken_Returns_Token_WhenValidCredentialsPasse
4948
Content = new StreamContent(new MemoryStream(Encoding.UTF8.GetBytes("{\"token\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6I1234212CJ9.VLSE9fRk0ifQ.fd73LguLf_6VBefVQqu0nj8j3dovfUNVeqZDYGZ1234\",\"expiration\":\"2022-06-15T16:02:52Z\"}")))
5049
});
5150

52-
FleetMangerGetAuthTokenResponseModel result = await _fleetManagerService.GetJwtAuthUnpToken();
51+
var result = await _fleetManagerService.GetJwtAuthUnpToken();
5352

5453
Assert.Multiple(() =>
5554
{
@@ -105,7 +104,7 @@ public async Task DoesGetCatalogue_Returns_200_WhenValidAccessTokenPassed()
105104
.Returns(response);
106105
A.CallTo(() => _fakefileSystemHelper.CreateXmlFile(response.Content.ReadAsByteArrayAsync().Result, Path.Combine(_fakeconfiguration["HOME"], _fakeconfiguration["AVCSCatalogFileName"])));
107106

108-
FleetManagerGetCatalogueResponseModel result = await _fleetManagerService.GetCatalogue("JwtAuthJwtAccessToken");
107+
var result = await _fleetManagerService.GetCatalogue("JwtAuthJwtAccessToken");
109108
Assert.Multiple(() =>
110109
{
111110
Assert.That(result.StatusCode, Is.EqualTo(HttpStatusCode.OK));

0 commit comments

Comments
 (0)