Skip to content

Commit

Permalink
linvi#265 - TweetSearchParameters has been renamed SearchTweetsParame…
Browse files Browse the repository at this point in the history 
…ters
  • Loading branch information
@linvi
linvi committed Jun 23, 2016
1 parent 01cc084 commit d19c310
Show file tree
Hide file tree
Showing 18 changed files with 269 additions and 269 deletions.
2 changes: 1 addition & 1 deletion Testinvi/TweetinviControllers/SearchTests/SearchControllerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void SearchTweets_WithSearchTweetParameter_ReturnsQueryExecutorDTOTransfo
{
// Arrange
var controller = CreateSearchController();
var searchParameter = A.Fake<ITweetSearchParameters>();
var searchParameter = A.Fake<ISearchTweetsParameters>();
var searchDTOResult = new List<ITweetDTO>();
var searchResult = new List<ITweet>();

Expand Down
2 changes: 1 addition & 1 deletion Testinvi/TweetinviControllers/SearchTests/SearchJsonControllerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void SearchTweet_BasedOnSearchParameters_ReturnsTwitterAccessorStatuses()
// Arrange
var queryExecutor = CreateSearchJsonController();
var httpQuery = TestHelper.GenerateString();
var searchQueryParameter = A.Fake<ITweetSearchParameters>();
var searchQueryParameter = A.Fake<ISearchTweetsParameters>();
var jsonResult = TestHelper.GenerateString();

_fakeSearchQueryGenerator.CallsTo(x => x.GetSearchTweetsQuery(searchQueryParameter)).Returns(httpQuery);
Expand Down
14 changes: 7 additions & 7 deletions Testinvi/TweetinviControllers/SearchTests/SearchQueryExecutorTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class SearchQueryExecutorTests
private ITweetWithSearchMetadataDTO _originalTweetDTO;
private ITweetWithSearchMetadataDTO _retweetDTO;
private JObject _jObject;
private ITweetSearchParameters _tweetSearchParameter;
private ISearchTweetsParameters _searchTweetsParameter;
private ITweetWithSearchMetadataDTO[] _tweetDTOs;
private ISearchResultsDTO _searchResultDTO;

Expand All @@ -55,8 +55,8 @@ public void TestInitialize()
_searchResultDTO = A.Fake<ISearchResultsDTO>();
_searchResultDTO.CallsTo(x => x.TweetDTOs).Returns(_tweetDTOs);

_tweetSearchParameter = A.Fake<ITweetSearchParameters>();
_fakeSearchQueryParameterGenerator.CallsTo(x => x.CreateSearchTweetParameter(_searchQuery)).Returns(_tweetSearchParameter);
_searchTweetsParameter = A.Fake<ISearchTweetsParameters>();
_fakeSearchQueryParameterGenerator.CallsTo(x => x.CreateSearchTweetParameter(_searchQuery)).Returns(_searchTweetsParameter);
}

#region Search Tweet
Expand All @@ -67,7 +67,7 @@ public void SearchTweet_BasedOnQuery_ReturnsTwitterAccessorStatuses()
// Arrange
var queryExecutor = CreateSearchQueryExecutor();

_fakeSearchQueryGenerator.CallsTo(x => x.GetSearchTweetsQuery(_tweetSearchParameter)).Returns(_httpQuery);
_fakeSearchQueryGenerator.CallsTo(x => x.GetSearchTweetsQuery(_searchTweetsParameter)).Returns(_httpQuery);
_fakeTwitterAccessor.ArrangeExecuteGETQuery(_httpQuery, _searchResultDTO);

// Act
Expand All @@ -82,7 +82,7 @@ public void SearchTweet_BasedOnSearchParameters_ReturnsTwitterAccessorStatuses()
{
// Arrange
var queryExecutor = CreateSearchQueryExecutor();
var searchQueryParameter = A.Fake<ITweetSearchParameters>();
var searchQueryParameter = A.Fake<ISearchTweetsParameters>();

_fakeSearchQueryGenerator.CallsTo(x => x.GetSearchTweetsQuery(searchQueryParameter)).Returns(_httpQuery);
_fakeTwitterAccessor.ArrangeExecuteGETQuery(_httpQuery, _searchResultDTO);
Expand All @@ -99,7 +99,7 @@ public void SearchTweet_FilterOriginal_FilterTheResults()
{
// Arrange
var queryExecutor = CreateSearchQueryExecutor();
var searchParameter = A.Fake<ITweetSearchParameters>();
var searchParameter = A.Fake<ISearchTweetsParameters>();
searchParameter.CallsTo(x => x.SearchQuery).Returns(_searchQuery);
searchParameter.CallsTo(x => x.TweetSearchType).Returns(TweetSearchType.OriginalTweetsOnly);

Expand Down Expand Up @@ -127,7 +127,7 @@ public void SearchTweet_FilterRetweets_FilterTheResults()
{
// Arrange
var queryExecutor = CreateSearchQueryExecutor();
var searchParameter = A.Fake<ITweetSearchParameters>();
var searchParameter = A.Fake<ISearchTweetsParameters>();
searchParameter.CallsTo(x => x.SearchQuery).Returns(_searchQuery);
searchParameter.CallsTo(x => x.TweetSearchType).Returns(TweetSearchType.RetweetsOnly);

Expand Down
28 changes: 14 additions & 14 deletions Testinvi/TweetinviControllers/SearchTests/SearchQueryGeneratorTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class SearchQueryGeneratorTests
private Fake<ISearchQueryParameterGenerator> _fakeSearchQueryParameterGenerator;
private Fake<IQueryParameterGenerator> _fakeQueryParameterGenerator;

private ITweetSearchParameters _tweetSearchParameters;
private ISearchTweetsParameters _searchTweetsParameters;

private string _searchQuery;
private SearchResultType _searchResultType;
Expand Down Expand Up @@ -108,17 +108,17 @@ private void InitData()
_geoCode = A.Fake<IGeoCode>();
_geoCodeParameter = TestHelper.GenerateString();

_tweetSearchParameters = A.Fake<ITweetSearchParameters>();
_tweetSearchParameters.SearchQuery = _searchQuery;
_tweetSearchParameters.SearchType = _searchResultType;
_tweetSearchParameters.MaximumNumberOfResults = _maximumNumberOfResults;
_tweetSearchParameters.SinceId = _sinceId;
_tweetSearchParameters.MaxId = _maxId;
_tweetSearchParameters.Since = _since;
_tweetSearchParameters.Until = _until;
_tweetSearchParameters.Locale = _locale;
_tweetSearchParameters.Lang = _lang;
_tweetSearchParameters.GeoCode = _geoCode;
_searchTweetsParameters = A.Fake<ISearchTweetsParameters>();
_searchTweetsParameters.SearchQuery = _searchQuery;
_searchTweetsParameters.SearchType = _searchResultType;
_searchTweetsParameters.MaximumNumberOfResults = _maximumNumberOfResults;
_searchTweetsParameters.SinceId = _sinceId;
_searchTweetsParameters.MaxId = _maxId;
_searchTweetsParameters.Since = _since;
_searchTweetsParameters.Until = _until;
_searchTweetsParameters.Locale = _locale;
_searchTweetsParameters.Lang = _lang;
_searchTweetsParameters.GeoCode = _geoCode;
}

[TestMethod]
Expand All @@ -128,7 +128,7 @@ public void GetSearchTweetQuery_WithFilters_ReturnsExpectedQuery()
var searchQueryGenerator = CreateSearchQueryGenerator();

_fakeSearchQueryParameterGenerator.CallsTo(x => x.GenerateSearchQueryParameter(It.IsAny<string>())).ReturnsLazily((string a) => a);
var tweetSearchParameters = A.Fake<ITweetSearchParameters>();
var tweetSearchParameters = A.Fake<ISearchTweetsParameters>();
tweetSearchParameters.CallsTo(x => x.Filters).Returns(TweetSearchFilters.Videos);

// Act
Expand All @@ -147,7 +147,7 @@ public void GetSearchTweetQuery_WithTweetSearchParameter_QueryIsValid_ReturnsExp
var searchQueryGenerator = CreateSearchQueryGenerator();

// Act
var result = searchQueryGenerator.GetSearchTweetsQuery(_tweetSearchParameters);
var result = searchQueryGenerator.GetSearchTweetsQuery(_searchTweetsParameters);

// Assert
VerifyResultContainsParameters(result, _searchQueryParameter,
Expand Down
6 changes: 3 additions & 3 deletions Testinvi/TweetinviControllers/SearchTests/SearchQueryValidatorTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void IsSearchParameterValid_SearchQueryIsNull_Succeed()
{
// Arrange
var queryValidator = CreateSearchQueryValidator();
var searchParameter = A.Fake<ITweetSearchParameters>();
var searchParameter = A.Fake<ISearchTweetsParameters>();
searchParameter.CallsTo(x => x.SearchQuery).Returns(null);

// Act
Expand All @@ -52,7 +52,7 @@ public void IsSearchParameterValid_SearchQueryIsEmpty_Throws()
{
// Arrange
var queryValidator = CreateSearchQueryValidator();
var searchParameter = A.Fake<ITweetSearchParameters>();
var searchParameter = A.Fake<ISearchTweetsParameters>();
searchParameter.CallsTo(x => x.SearchQuery).Returns(string.Empty);
searchParameter.CallsTo(x => x.GeoCode).Returns(null);
searchParameter.CallsTo(x => x.Filters).Returns(TweetSearchFilters.None);
Expand All @@ -66,7 +66,7 @@ public void IsSearchParameterValid_SearchQueryIsValid_ReturnsTrue()
{
// Arrange
var queryValidator = CreateSearchQueryValidator();
var searchParameter = A.Fake<ITweetSearchParameters>();
var searchParameter = A.Fake<ISearchTweetsParameters>();
searchParameter.CallsTo(x => x.SearchQuery).Returns(TestHelper.GenerateString());

// Act
Expand Down
12 changes: 6 additions & 6 deletions Tweetinvi.Controllers/Search/SearchController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ namespace Tweetinvi.Controllers.Search
public interface ISearchController
{
IEnumerable<ITweet> SearchTweets(string searchQuery);
IEnumerable<ITweet> SearchTweets(ITweetSearchParameters tweetSearchParameters);
IEnumerable<ITweet> SearchTweets(ISearchTweetsParameters searchTweetsParameters);

ISearchResult SearchTweetsWithMetadata(string searchQuery);
ISearchResult SearchTweetsWithMetadata(ITweetSearchParameters tweetSearchParameters);
ISearchResult SearchTweetsWithMetadata(ISearchTweetsParameters searchTweetsParameters);

IEnumerable<ITweet> SearchDirectRepliesTo(ITweet tweet);
IEnumerable<ITweet> SearchRepliesTo(ITweet tweet, bool recursiveReplies);
Expand Down Expand Up @@ -47,9 +47,9 @@ public IEnumerable<ITweet> SearchTweets(string searchQuery)
return _tweetFactory.GenerateTweetsFromDTO(tweetsDTO);
}

public IEnumerable<ITweet> SearchTweets(ITweetSearchParameters tweetSearchParameters)
public IEnumerable<ITweet> SearchTweets(ISearchTweetsParameters searchTweetsParameters)
{
var tweetsDTO = _searchQueryExecutor.SearchTweets(tweetSearchParameters);
var tweetsDTO = _searchQueryExecutor.SearchTweets(searchTweetsParameters);
return _tweetFactory.GenerateTweetsFromDTO(tweetsDTO);
}

Expand All @@ -59,9 +59,9 @@ public ISearchResult SearchTweetsWithMetadata(string searchQuery)
return _searchResultFactory.Create(new [] { searchResultsDTO });
}

public ISearchResult SearchTweetsWithMetadata(ITweetSearchParameters tweetSearchParameters)
public ISearchResult SearchTweetsWithMetadata(ISearchTweetsParameters searchTweetsParameters)
{
var searchResultsDTO = _searchQueryExecutor.SearchTweetsWithMetadata(tweetSearchParameters).ToArray();
var searchResultsDTO = _searchQueryExecutor.SearchTweetsWithMetadata(searchTweetsParameters).ToArray();
return _searchResultFactory.Create(searchResultsDTO);
}

Expand Down
18 changes: 9 additions & 9 deletions Tweetinvi.Controllers/Search/SearchJsonController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Tweetinvi.Controllers.Search
public interface ISearchJsonController
{
string SearchTweets(string searchQuery);
IEnumerable<string> SearchTweets(ITweetSearchParameters tweetSearchParameters);
IEnumerable<string> SearchTweets(ISearchTweetsParameters searchTweetsParameters);
}

public class SearchJsonController : ISearchJsonController
Expand Down Expand Up @@ -39,14 +39,14 @@ public string SearchTweets(string searchQuery)
return _twitterAccessor.ExecuteGETQueryReturningJson(query);
}

public IEnumerable<string> SearchTweets(ITweetSearchParameters tweetSearchParameters)
public IEnumerable<string> SearchTweets(ISearchTweetsParameters searchTweetsParameters)
{
if (tweetSearchParameters.MaximumNumberOfResults > 100)
if (searchTweetsParameters.MaximumNumberOfResults > 100)
{
return SearchTweetsRecursively(tweetSearchParameters);
return SearchTweetsRecursively(searchTweetsParameters);
}

string query = _searchQueryGenerator.GetSearchTweetsQuery(tweetSearchParameters);
string query = _searchQueryGenerator.GetSearchTweetsQuery(searchTweetsParameters);
return new[] { GetJsonResultFromQuery(query) };
}

Expand All @@ -55,9 +55,9 @@ private string GetJsonResultFromQuery(string query)
return _twitterAccessor.ExecuteGETQueryReturningJson(query);
}

private IEnumerable<string> SearchTweetsRecursively(ITweetSearchParameters tweetSearchParameters)
private IEnumerable<string> SearchTweetsRecursively(ISearchTweetsParameters searchTweetsParameters)
{
var searchParameter = _searchQueryHelper.CloneTweetSearchParameters(tweetSearchParameters);
var searchParameter = _searchQueryHelper.CloneTweetSearchParameters(searchTweetsParameters);
searchParameter.MaximumNumberOfResults = Math.Min(searchParameter.MaximumNumberOfResults, 100);

string query = _searchQueryGenerator.GetSearchTweetsQuery(searchParameter);
Expand All @@ -71,7 +71,7 @@ private IEnumerable<string> SearchTweetsRecursively(ITweetSearchParameters tweet
return jsonResult;
}

while (tweetDTOResult.Count < tweetSearchParameters.MaximumNumberOfResults)
while (tweetDTOResult.Count < searchTweetsParameters.MaximumNumberOfResults)
{
if (currentResult.IsNullOrEmpty())
{
Expand All @@ -82,7 +82,7 @@ private IEnumerable<string> SearchTweetsRecursively(ITweetSearchParameters tweet
var oldestTweetId = _tweetHelper.GetOldestTweetId(currentResult);
searchParameter.MaxId = oldestTweetId - 1;

searchParameter.MaximumNumberOfResults = Math.Min(tweetSearchParameters.MaximumNumberOfResults - tweetDTOResult.Count, 100);
searchParameter.MaximumNumberOfResults = Math.Min(searchTweetsParameters.MaximumNumberOfResults - tweetDTOResult.Count, 100);
query = _searchQueryGenerator.GetSearchTweetsQuery(searchParameter);

json = GetJsonResultFromQuery(query);
Expand Down
Loading

0 comments on commit d19c310

Please sign in to comment.