Skip to content

Commit a363d92

Browse files
linvilinvi
committed
Fixed test for release 0.9.13.0
1 parent 682a68c commit a363d92

File tree

2 files changed

+25
-61
lines changed

2 files changed

+25
-61
lines changed

‎Testinvi/TweetinviControllers/GeoTests/GeoQueryGeneratorTests.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ public void TestInitialize()
2323
#region GetPlaceFromIdQuery
2424

2525
[TestMethod]
26+
[ExpectedException(typeof(ArgumentNullException))]
2627
public void GenerateGeoParameter_CoordinatesIsNull_ReturnsNull()
2728
{
2829
// Arrange
2930
var controller = CreateGeoQueryGenerator();
3031

3132
// Act
32-
var result = controller.GenerateGeoParameter(null);
33-
// Assert
34-
Assert.AreEqual(result, null);
33+
controller.GenerateGeoParameter(null);
3534
}
3635

3736
[TestMethod]

‎Testinvi/TweetinviControllers/UserTests/UserJsonControllerTests.cs

+23-58
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using FakeItEasy;
43
using Microsoft.VisualStudio.TestTools.UnitTesting;
54
using Testinvi.Helpers;
@@ -11,7 +10,6 @@
1110
using Tweetinvi.Core.Interfaces.DTO.QueryDTO;
1211
using Tweetinvi.Core.Interfaces.Models;
1312
using Tweetinvi.Core.Interfaces.QueryGenerators;
14-
using Tweetinvi.Core.Parameters;
1513
using Tweetinvi.Core.Parameters.QueryParameters;
1614

1715
namespace Testinvi.TweetinviControllers.UserTests
@@ -40,33 +38,33 @@ public void GetFriendIdsWithNullUser_ReturnsNull()
4038
var queryExecutor = CreateUserJsonController();
4139
var maximumNumberOfFriends = TestHelper.GenerateRandomInt();
4240
var expectedQuery = TestHelper.GenerateString();
41+
var expectedResult = GenerateExpectedCursorResults();
4342

4443
_fakeUserQueryGenerator.CallsTo(x => x.GetFriendIdsQuery(A<IUserDTO>.Ignored, A<int>.Ignored)).Returns(expectedQuery);
45-
_fakeTwitterAccessor.ArrangeExecuteJsonCursorGETQuery<IIdsCursorQueryResultDTO>(expectedQuery, A.Fake<IEnumerable<string>>());
44+
_fakeTwitterAccessor.ArrangeExecuteJsonCursorGETQuery<IIdsCursorQueryResultDTO>(expectedQuery, expectedResult);
4645

4746
// Act
4847
var result = queryExecutor.GetFriendIds((IUser)null, maximumNumberOfFriends);
4948

5049
// Assert
51-
Assert.IsNull(result);
50+
Assert.AreEqual(result, expectedResult);
5251
}
5352

5453
[TestMethod]
5554
public void GetFriendIdsWithUser_ReturnsTwitterAccessorResult()
5655
{
5756
// Arrange
5857
var queryExecutor = CreateUserJsonController();
59-
var userDTO = A.Fake<IUserDTO>();
60-
var user = TestHelper.GenerateUser(userDTO);
58+
var userIdentifier = A.Fake<IUserIdentifier>();
6159
var maximumNumberOfFriends = TestHelper.GenerateRandomInt();
6260
var expectedQuery = TestHelper.GenerateString();
6361
var expectedCursorResults = GenerateExpectedCursorResults();
6462

65-
_fakeUserQueryGenerator.CallsTo(x => x.GetFriendIdsQuery(userDTO, maximumNumberOfFriends)).Returns(expectedQuery);
63+
_fakeUserQueryGenerator.CallsTo(x => x.GetFriendIdsQuery(userIdentifier, maximumNumberOfFriends)).Returns(expectedQuery);
6664
_fakeTwitterAccessor.ArrangeExecuteJsonCursorGETQuery<IIdsCursorQueryResultDTO>(expectedQuery, expectedCursorResults);
6765

6866
// Act
69-
var result = queryExecutor.GetFriendIds(user, maximumNumberOfFriends);
67+
var result = queryExecutor.GetFriendIds(userIdentifier, maximumNumberOfFriends);
7068

7169
// Assert
7270
Assert.AreEqual(result, expectedCursorResults);
@@ -137,37 +135,39 @@ public void GetFriendIdsWithUserId_AnyData_ReturnsTwitterAccessorResult()
137135
#region FollowerIds
138136

139137
[TestMethod]
140-
[ExpectedException(typeof(ArgumentException))]
141-
public void GetFollowerIdsWithNullUser_ThrowsArgumentException()
138+
public void GetFollowerIdsWithNullUser()
142139
{
143140
// Arrange
144141
var queryExecutor = CreateUserJsonController();
145142
var maximumNumberOfFollowers = TestHelper.GenerateRandomInt();
146143
var expectedQuery = TestHelper.GenerateString();
144+
var expectedResult = new string[0];
147145

148-
_fakeUserQueryGenerator.CallsTo(x => x.GetFollowerIdsQuery(A<IUserDTO>.Ignored, A<int>.Ignored)).Returns(expectedQuery);
149-
_fakeTwitterAccessor.ArrangeExecuteJsonCursorGETQuery<IIdsCursorQueryResultDTO>(expectedQuery, A.Fake<IEnumerable<string>>());
146+
_fakeUserQueryGenerator.CallsTo(x => x.GetFollowerIdsQuery(A<IUserIdentifier>.Ignored, It.IsAny<int>())).Returns(expectedQuery);
147+
_fakeTwitterAccessor.ArrangeExecuteJsonCursorGETQuery<IIdsCursorQueryResultDTO>(expectedQuery, expectedResult);
150148

151149
// Act
152-
queryExecutor.GetFollowerIds((IUser)null, maximumNumberOfFollowers);
150+
var result = queryExecutor.GetFollowerIds((IUserIdentifier)null, maximumNumberOfFollowers);
151+
152+
// Assert
153+
Assert.AreEqual(result, expectedResult);
153154
}
154155

155156
[TestMethod]
156157
public void GetFollowerIdsWithUser_ReturnsTwitterAccessorResult()
157158
{
158159
// Arrange
159160
var queryExecutor = CreateUserJsonController();
160-
var userDTO = A.Fake<IUserDTO>();
161-
var user = TestHelper.GenerateUser(userDTO);
161+
var userIdentifier = A.Fake<IUserIdentifier>();
162162
var maximumNumberOfFollowers = TestHelper.GenerateRandomInt();
163163
var expectedQuery = TestHelper.GenerateString();
164164
var expectedCursorResults = GenerateExpectedCursorResults();
165165

166-
_fakeUserQueryGenerator.CallsTo(x => x.GetFollowerIdsQuery(userDTO, maximumNumberOfFollowers)).Returns(expectedQuery);
166+
_fakeUserQueryGenerator.CallsTo(x => x.GetFollowerIdsQuery(userIdentifier, maximumNumberOfFollowers)).Returns(expectedQuery);
167167
_fakeTwitterAccessor.ArrangeExecuteJsonCursorGETQuery<IIdsCursorQueryResultDTO>(expectedQuery, expectedCursorResults);
168168

169169
// Act
170-
var result = queryExecutor.GetFollowerIds(user, maximumNumberOfFollowers);
170+
var result = queryExecutor.GetFollowerIds(userIdentifier, maximumNumberOfFollowers);
171171

172172
// Assert
173173
Assert.AreEqual(result, expectedCursorResults);
@@ -260,56 +260,21 @@ public void GetFavoriteTweetsWithUser_AnyData_ReturnsTwitterAccessorResult()
260260

261261
#region Block User
262262

263-
[TestMethod]
264-
[ExpectedException(typeof(ArgumentException))]
265-
public void BlockUser_WithNullUser_ThrowsArgumentException()
266-
{
267-
// Arrange
268-
var queryExecutor = CreateUserJsonController();
269-
var expectedQuery = TestHelper.GenerateString();
270-
var expectedResult = TestHelper.GenerateString();
271-
272-
_fakeUserQueryGenerator.CallsTo(x => x.GetBlockUserQuery(A<IUserDTO>.Ignored)).Returns(expectedQuery);
273-
_fakeTwitterAccessor.ArrangeExecuteJsonPOSTQuery(expectedQuery, expectedResult);
274-
275-
// Act
276-
queryExecutor.BlockUser((IUser)null);
277-
}
278263

279264
[TestMethod]
280265
public void BlockUser_WithUser_ReturnsTwitterAccessorResult()
281266
{
282267
// Arrange
283268
var queryExecutor = CreateUserJsonController();
284-
var userDTO = A.Fake<IUserDTO>();
285-
var user = TestHelper.GenerateUser(userDTO);
286-
var expectedQuery = TestHelper.GenerateString();
287-
var expectedResult = TestHelper.GenerateString();
288-
289-
_fakeUserQueryGenerator.CallsTo(x => x.GetBlockUserQuery(userDTO)).Returns(expectedQuery);
290-
_fakeTwitterAccessor.ArrangeExecuteJsonPOSTQuery(expectedQuery, expectedResult);
291-
292-
// Act
293-
var result = queryExecutor.BlockUser(user);
294-
295-
// Assert
296-
Assert.AreEqual(result, expectedResult);
297-
}
298-
299-
[TestMethod]
300-
public void BlockUser_WithUserDTO_ReturnsTwitterAccessorResult()
301-
{
302-
// Arrange
303-
var queryExecutor = CreateUserJsonController();
304-
var userDTO = A.Fake<IUserDTO>();
269+
var userIdentifier = A.Fake<IUserIdentifier>();
305270
var expectedQuery = TestHelper.GenerateString();
306271
var expectedResult = TestHelper.GenerateString();
307272

308-
_fakeUserQueryGenerator.CallsTo(x => x.GetBlockUserQuery(userDTO)).Returns(expectedQuery);
273+
_fakeUserQueryGenerator.CallsTo(x => x.GetBlockUserQuery(userIdentifier)).Returns(expectedQuery);
309274
_fakeTwitterAccessor.ArrangeExecuteJsonPOSTQuery(expectedQuery, expectedResult);
310275

311276
// Act
312-
var result = queryExecutor.BlockUser(userDTO);
277+
var result = queryExecutor.BlockUser(userIdentifier);
313278

314279
// Assert
315280
Assert.AreEqual(result, expectedResult);
@@ -355,9 +320,9 @@ public void BlockUser_WithUserId_ReturnsTwitterAccessorResult()
355320

356321
#endregion
357322

358-
private IEnumerable<string> GenerateExpectedCursorResults()
323+
private string[] GenerateExpectedCursorResults()
359324
{
360-
return new List<string>();
325+
return new string[0];
361326
}
362327

363328
public UserJsonController CreateUserJsonController()

0 commit comments

Comments
 (0)