Merge branch 'master' into xml

Author: daminisatya

loklak.py

@@ -61,10 +61,9 @@ def getBaseUrl(self):
         """Return the string value of baseUrl."""
         return self.baseUrl
 
-    def status(self):
+    def status(self, status_application='api/status.json'):
         """Retrieve a json response about the status of the server."""
-        status_application = 'api/status.json'
-        url_to_give = self.baseUrl+status_application
+        url_to_give = self.baseUrl + status_application
         return_to_user = requests.get(url_to_give)
         if return_to_user.status_code == 200:
             return return_to_user.json()
@@ -422,7 +421,7 @@ def aggregations(self, query=None, since=None, until=None,
                 return json.dumps(return_to_user)
         else:
             return_to_user = {}
-            return_to_user['error'] = ('No Query string has been given to run'
+            return_to_user['error'] = ('No Query string has been given to run '
                                         'query for aggregations')
             return json.dumps(return_to_user)
 

tests/test.py

@@ -29,6 +29,9 @@ def test_status(self):
                 msg='{} not found in index'.format(prop)
             )
 
+        result = self.loklak.status("nonexisturl")
+        self.assertEqual(result, "{}")
+
     def test_hello(self):
         """Test hello instance."""
         result = self.loklak.hello()
@@ -102,10 +105,15 @@ def test_push(self):
     def test_user(self):
         """Test user."""
         result = self.loklak.user('dhruvRamani98')
-        self.assertTrue('error' in self.loklak.user())
         self.assertTrue('user' in result)
         self.assertTrue('name' in result['user'])
         self.assertTrue('screen_name' in result['user'])
+        result = self.loklak.user("fossasia", 1500, 330)
+        self.assertTrue('user' in result)
+        self.assertTrue('name' in result['user'])
+        result = self.loklak.user()
+        self.assertTrue('error' in self.loklak.user())
+        self.assertEqual(result, '{"error": "No user name given to query. Please check and try again"}')
 
     def test_search(self):
         """Test search result."""
@@ -117,13 +125,22 @@ def test_search(self):
                          int(result['search_metadata']['maximumRecords']))
         self.assertEqual(int(result['search_metadata']['maximumRecords']), 18)
 
+        result = self.loklak.search('FOSSASIA', since='2000-01-01', until='2017-12-31_12:24', from_user='fossasia', count=20)
+        self.assertTrue('statuses' in result)
+
+        result = self.loklak.search()
+        self.assertEqual(result, '{"error": "No Query string has been given to query for an account"}')
+
     def test_aggregations(self):
         """Test aggregations."""
         result = self.loklak.aggregations('fossasia', '2017-01-10',
                                           '2018-01-10', 10)
         data = result.json()
         self.assertEqual(result.status_code, 200)
         self.assertTrue('aggregations' in data)
+
+        result = self.loklak.aggregations()
+        self.assertEqual(result, '{"error": "No Query string has been given to run query for aggregations"}')
     #     self.assertTrue('hashtags' in data['aggregations'])
     #     self.assertTrue('mentions' in data['aggregations'])