@@ -9,163 +9,239 @@ namespace UKHO.PeriodicOutputService.Common.UnitTests.Helpers
99 [ TestFixture ]
1010 public class FssApiClientTests
1111 {
12+ private FssApiClient ? _fakeFssApiClient ;
1213 private IHttpClientFactory _fakeHttpClientFactory ;
13- private FssApiClient ? _fssApiClient ;
14- private const string AuthToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IjJaUXBKM1VwYmpBWVh" ;
14+ private readonly string _authToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IjJaUXBKM1VwYmpBWVh" ;
1515
1616 [ SetUp ]
17- public void Setup ( )
18- {
19- _fakeHttpClientFactory = A . Fake < IHttpClientFactory > ( ) ;
20- }
17+ public void Setup ( ) => _fakeHttpClientFactory = A . Fake < IHttpClientFactory > ( ) ;
2118
2219 [ Test ]
2320 public void DoesGetBatchStatusAsync_Returns_OK ( )
2421 {
25- var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler ( AuthToken , HttpStatusCode . OK ) ;
26- var httpClient = new HttpClient ( messageHandler ) { BaseAddress = new Uri ( "http://test.com" ) } ;
22+ var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler (
23+ _authToken , HttpStatusCode . OK ) ;
24+
25+ var httpClient = new HttpClient ( messageHandler )
26+ {
27+ BaseAddress = new Uri ( "http://test.com" )
28+ } ;
29+
2730 A . CallTo ( ( ) => _fakeHttpClientFactory . CreateClient ( A < string > . Ignored ) ) . Returns ( httpClient ) ;
28- _fssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
2931
30- var result = _fssApiClient . GetBatchStatusAsync ( "http://test.com" , AuthToken ) ;
32+ _fakeFssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
33+
34+ var result = _fakeFssApiClient . GetBatchStatusAsync ( "http://test.com" , _authToken ) ;
3135
3236 Assert . Multiple ( ( ) =>
3337 {
3438 Assert . That ( result . Result . StatusCode , Is . EqualTo ( HttpStatusCode . OK ) ) ;
35- Assert . That ( result . Result . Content . ReadAsStringAsync ( ) . Result , Is . EqualTo ( AuthToken ) ) ;
39+ Assert . That ( result . Result . Content . ReadAsStringAsync ( ) . Result , Is . EqualTo ( _authToken ) ) ;
40+
3641 } ) ;
3742 }
3843
3944 [ Test ]
4045 public void DoesCreateBatchAsync_Returns_OK ( )
4146 {
42- const string content = "" ;
43- var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler ( content , HttpStatusCode . OK ) ;
44- var httpClient = new HttpClient ( messageHandler ) { BaseAddress = new Uri ( "http://test.com" ) } ;
47+ var content = "" ;
48+
49+ var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler (
50+ content , HttpStatusCode . OK ) ;
51+
52+ var httpClient = new HttpClient ( messageHandler )
53+ {
54+ BaseAddress = new Uri ( "http://test.com" )
55+ } ;
56+
4557 A . CallTo ( ( ) => _fakeHttpClientFactory . CreateClient ( A < string > . Ignored ) ) . Returns ( httpClient ) ;
46- _fssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
4758
48- var result = _fssApiClient . CreateBatchAsync ( "http://test.com" , content , AuthToken ) ;
59+ _fakeFssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
60+
61+ var result = _fakeFssApiClient . CreateBatchAsync ( "http://test.com" , content , _authToken ) ;
4962
5063 Assert . Multiple ( ( ) =>
5164 {
5265 Assert . That ( result . Result . StatusCode , Is . EqualTo ( HttpStatusCode . OK ) ) ;
66+
5367 } ) ;
5468 }
5569
5670 [ Test ]
5771 public void DoesAddFileInBatchAsync_Returns_OK ( )
5872 {
59- const string content = "" ;
60- var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler ( content , HttpStatusCode . OK ) ;
61- var httpClient = new HttpClient ( messageHandler ) { BaseAddress = new Uri ( "http://test.com" ) } ;
73+ var content = "" ;
74+
75+ var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler (
76+ content , HttpStatusCode . OK ) ;
77+
78+ var httpClient = new HttpClient ( messageHandler )
79+ {
80+ BaseAddress = new Uri ( "http://test.com" )
81+ } ;
82+
6283 A . CallTo ( ( ) => _fakeHttpClientFactory . CreateClient ( A < string > . Ignored ) ) . Returns ( httpClient ) ;
63- _fssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
6484
65- var result = _fssApiClient . AddFileToBatchAsync ( "http://test.com" , content , AuthToken , 1231231 , "application/octet-stream" ) ;
85+ _fakeFssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
86+
87+ var result = _fakeFssApiClient . AddFileToBatchAsync ( "http://test.com" , content , _authToken , 1231231 , "application/octet-stream" ) ;
6688
6789 Assert . Multiple ( ( ) =>
6890 {
6991 Assert . That ( result . Result . StatusCode , Is . EqualTo ( HttpStatusCode . OK ) ) ;
92+
7093 } ) ;
7194 }
7295
7396 [ Test ]
7497 public void DoesUploadFileBlockAsync_Returns_OK ( )
7598 {
76- const string content = "" ;
77- var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler ( content , HttpStatusCode . OK ) ;
78- var httpClient = new HttpClient ( messageHandler ) { BaseAddress = new Uri ( "http://test.com" ) } ;
99+ var content = "" ;
100+
101+ var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler (
102+ content , HttpStatusCode . OK ) ;
103+
104+ var httpClient = new HttpClient ( messageHandler )
105+ {
106+ BaseAddress = new Uri ( "http://test.com" )
107+ } ;
108+
79109 A . CallTo ( ( ) => _fakeHttpClientFactory . CreateClient ( A < string > . Ignored ) ) . Returns ( httpClient ) ;
80- _fssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
81110
82- var result = _fssApiClient . UploadFileBlockAsync ( "http://test.com" , Encoding . UTF8 . GetBytes ( "whatever" ) , Encoding . UTF8 . GetBytes ( "whatever" ) , AuthToken , "application/octet-stream" ) ;
111+ _fakeFssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
112+
113+ var result = _fakeFssApiClient . UploadFileBlockAsync ( "http://test.com" , Encoding . UTF8 . GetBytes ( "whatever" ) , Encoding . UTF8 . GetBytes ( "whatever" ) , _authToken , "application/octet-stream" ) ;
83114
84115 Assert . Multiple ( ( ) =>
85116 {
86117 Assert . That ( result . Result . StatusCode , Is . EqualTo ( HttpStatusCode . OK ) ) ;
118+
87119 } ) ;
88120 }
89121
90122 [ Test ]
91123 public void DoesWriteBlockInFileAsync_Returns_OK ( )
92124 {
93- const string content = "" ;
94- var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler ( content , HttpStatusCode . OK ) ;
95- var httpClient = new HttpClient ( messageHandler ) { BaseAddress = new Uri ( "http://test.com" ) } ;
125+ var content = "" ;
126+
127+ var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler (
128+ content , HttpStatusCode . OK ) ;
129+
130+ var httpClient = new HttpClient ( messageHandler )
131+ {
132+ BaseAddress = new Uri ( "http://test.com" )
133+ } ;
134+
96135 A . CallTo ( ( ) => _fakeHttpClientFactory . CreateClient ( A < string > . Ignored ) ) . Returns ( httpClient ) ;
97- _fssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
98136
99- var result = _fssApiClient . WriteBlockInFileAsync ( "http://test.com" , content , AuthToken , "application/octet-stream" ) ;
137+ _fakeFssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
138+
139+ var result = _fakeFssApiClient . WriteBlockInFileAsync ( "http://test.com" , content , _authToken , "application/octet-stream" ) ;
100140
101141 Assert . Multiple ( ( ) =>
102142 {
103143 Assert . That ( result . Result . StatusCode , Is . EqualTo ( HttpStatusCode . OK ) ) ;
144+
104145 } ) ;
105146 }
106147
107148 [ Test ]
108149 public void DoesCommitBatchAsync_Returns_OK ( )
109150 {
110- const string content = "" ;
111- var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler ( content , HttpStatusCode . OK ) ;
112- var httpClient = new HttpClient ( messageHandler ) { BaseAddress = new Uri ( "http://test.com" ) } ;
151+ var content = "" ;
152+
153+ var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler (
154+ content , HttpStatusCode . OK ) ;
155+
156+ var httpClient = new HttpClient ( messageHandler )
157+ {
158+ BaseAddress = new Uri ( "http://test.com" )
159+ } ;
160+
113161 A . CallTo ( ( ) => _fakeHttpClientFactory . CreateClient ( A < string > . Ignored ) ) . Returns ( httpClient ) ;
114- _fssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
115162
116- var result = _fssApiClient . CommitBatchAsync ( "http://test.com" , content , AuthToken ) ;
163+ _fakeFssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
164+
165+ var result = _fakeFssApiClient . CommitBatchAsync ( "http://test.com" , content , _authToken ) ;
117166
118167 Assert . Multiple ( ( ) =>
119168 {
120169 Assert . That ( result . Result . StatusCode , Is . EqualTo ( HttpStatusCode . OK ) ) ;
170+
121171 } ) ;
122172 }
123173
124174 [ Test ]
125175 public void DoesDownloadFile_Returns_OK ( )
126176 {
127- const string content = "" ;
128- var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler ( content , HttpStatusCode . OK ) ;
129- var httpClient = new HttpClient ( messageHandler ) { BaseAddress = new Uri ( "http://test.com" ) } ;
177+ var content = "" ;
178+
179+ var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler (
180+ content , HttpStatusCode . OK ) ;
181+
182+ var httpClient = new HttpClient ( messageHandler )
183+ {
184+ BaseAddress = new Uri ( "http://test.com" )
185+ } ;
186+
130187 A . CallTo ( ( ) => _fakeHttpClientFactory . CreateClient ( A < string > . Ignored ) ) . Returns ( httpClient ) ;
131- _fssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
132188
133- var result = _fssApiClient . DownloadFile ( "http://test.com" , AuthToken , "bytes=1-1024" ) ;
189+ _fakeFssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
190+
191+ var result = _fakeFssApiClient . DownloadFile ( "http://test.com" , _authToken , "bytes=1-1024" ) ;
134192
135193 Assert . Multiple ( ( ) =>
136194 {
137195 Assert . That ( result . Result . StatusCode , Is . EqualTo ( HttpStatusCode . OK ) ) ;
196+
138197 } ) ;
139198 }
140199
141200 [ Test ]
142201 public void DoesDownloadFile_With_Client_That_Allow_Redirect_As_False_Returns_OK ( )
143202 {
144- const string content = "" ;
145- var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler ( content , HttpStatusCode . OK ) ;
146- var httpClient = new HttpClient ( messageHandler ) { BaseAddress = new Uri ( "http://test.com" ) } ;
203+ var content = "" ;
204+
205+ var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler (
206+ content , HttpStatusCode . OK ) ;
207+
208+ var httpClient = new HttpClient ( messageHandler )
209+ {
210+ BaseAddress = new Uri ( "http://test.com" )
211+ } ;
212+
147213 A . CallTo ( ( ) => _fakeHttpClientFactory . CreateClient ( A < string > . Ignored ) ) . Returns ( httpClient ) ;
148- _fssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
149214
150- var result = _fssApiClient . DownloadFile ( "http://test.com" , AuthToken ) ;
215+ _fakeFssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
216+
217+ var result = _fakeFssApiClient . DownloadFile ( "http://test.com" , _authToken ) ;
151218
152219 Assert . That ( result . Result . StatusCode , Is . EqualTo ( HttpStatusCode . OK ) ) ;
153220 }
154221
155222 [ Test ]
156223 public void DoesGetBatchDetailsAsync_Returns_OK ( )
157224 {
158- const string content = "" ;
159- var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler ( content , HttpStatusCode . OK ) ;
160- var httpClient = new HttpClient ( messageHandler ) { BaseAddress = new Uri ( "http://test.com" ) } ;
225+ var content = "" ;
226+
227+ var messageHandler = FakeHttpMessageHandler . GetHttpMessageHandler (
228+ content , HttpStatusCode . OK ) ;
229+
230+ var httpClient = new HttpClient ( messageHandler )
231+ {
232+ BaseAddress = new Uri ( "http://test.com" )
233+ } ;
234+
161235 A . CallTo ( ( ) => _fakeHttpClientFactory . CreateClient ( A < string > . Ignored ) ) . Returns ( httpClient ) ;
162- _fssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
163236
164- var result = _fssApiClient . GetBatchDetailsAsync ( "http://test.com" , AuthToken ) ;
237+ _fakeFssApiClient = new FssApiClient ( _fakeHttpClientFactory ) ;
238+
239+ var result = _fakeFssApiClient . GetBatchDetailsAsync ( "http://test.com" , _authToken ) ;
165240
166241 Assert . Multiple ( ( ) =>
167242 {
168243 Assert . That ( result . Result . StatusCode , Is . EqualTo ( HttpStatusCode . OK ) ) ;
244+
169245 } ) ;
170246 }
171247 }
0 commit comments