Updated tests for esquery.py

[aswanipranjal]

Divided test_get_query_agg_ts and test_get_query_basic into 2 parts in test_esquery.py.
The tests might fail because they were changed in #63.

[jgbarah]

@aswanipranjal did you notice that tests are failing? Could you please have a look at the Travis output, and try to fix them?

[jgbarah]

The problem with the test is that json.loads can extract the list in the dictionary in any order, which makes the test fail. I suggest that you write a simple auxiliary function to order the list (say, alphabetic order), and just apply it to the lists after json.loads... (of course, test_agg_dict1 should match this order).

[aswanipranjal]

@jgbarah please review.

[jgbarah]

I think it is better to do this in tests, instead of here. The main reason is performance (this is not really needed when working as usual, but the performance penalty of ordering will be paid every time you query), but also that the code does not ready this added complexity: tests do need, but not this code....

[aswanipranjal]

I changed the tests to sort the list only during the tests and not other wise in esquery.py

The reason the tests are failing is this:
The function

__get_query_filters

takes in a dictionary containing the filters to be applied to the Search object and returns a list of elasticsearch_dsl Query object (the filters were converted to these Query objects).
When we are testing this function, we can sort the output list containing these Query objects.

But when this function is called internally (in esquery.py) in __get_query_basic, then there is no way that we can sort this list externally, and for testing the test_get_query_basic we will be unable to sort the list to get the queries in ordered form and thus the test will fail.

We will have to apply the sorting function in __get_query_filters only so that when it is called inside __get_query_basic, it sorts the list and adds the filters in ordered manner so that the test_get_query_basic has the filters in ordered manner and hence it passes the test.

The same thing happens in get_aggs and test_get_aggs.

[aswanipranjal]

@jgbarah I was using self.filters as an OrderedDict previously, but I suppose the dictionary of filters that I was passing into the ordered dict had the key-value pairs in different order. It was a silly mistake on my part. I suppose this is it?

[jgbarah]

Thanks for the changes!