Add more test cases to further increase code coverage

Author: amotl

test/elements/test_annotations.py

@@ -19,15 +19,16 @@ def setUp(self):
     def test_annotations(self, m):
         m.get(
             "http://localhost/api/annotations?from=1563183710618&to=1563185212275"
-            "&alertId=11&dashboardId=111&panelId=22&tags=tags-test&limit=1",
+            "&alertId=11&dashboardId=111&panelId=22&userId=42&type=alert&tags=tags-test&limit=1",
             json=[
                 {
                     "id": 80,
                     "alertId": 11,
                     "alertName": "",
                     "dashboardId": 111,
                     "panelId": 22,
-                    "userId": 0,
+                    "userId": 42,
+                    "type": "alert",
                     "newState": "",
                     "prevState": "",
                     "created": 1563280160455,
@@ -48,13 +49,17 @@ def test_annotations(self, m):
             alert_id=11,
             dashboard_id=111,
             panel_id=22,
+            user_id=42,
+            ann_type="alert",
             tags=["tags-test"],
             limit=1,
         )
         self.assertEqual(annotations[0]["text"], "Annotation Description")
         self.assertEqual(annotations[0]["alertId"], 11)
         self.assertEqual(annotations[0]["dashboardId"], 111)
         self.assertEqual(annotations[0]["panelId"], 22)
+        self.assertEqual(annotations[0]["userId"], 42)
+        self.assertEqual(annotations[0]["type"], "alert")
         self.assertEqual(annotations[0]["tags"][0], "tags-test")
 
         self.assertEqual(len(annotations), 1)

test/elements/test_user.py

@@ -0,0 +1,169 @@
+import unittest
+
+import requests_mock
+
+from grafana_client import GrafanaApi
+
+
+class UsersTestCase(unittest.TestCase):
+    def setUp(self):
+        self.grafana = GrafanaApi(("admin", "admin"), host="localhost", url_path_prefix="", protocol="http")
+
+    @requests_mock.Mocker()
+    def test_update_user(self, m):
+        m.put(
+            "http://localhost/api/users/foo",
+            json={},
+        )
+        user = self.grafana.users.update_user("foo", {})
+        self.assertEqual(user, {})
+
+    @requests_mock.Mocker()
+    def test_get_user(self, m):
+        m.get(
+            "http://localhost/api/users/foo",
+            json={},
+        )
+        user = self.grafana.users.get_user("foo")
+        self.assertEqual(user, {})
+
+    @requests_mock.Mocker()
+    def test_find_user(self, m):
+        m.get(
+            "http://localhost/api/users/lookup?loginOrEmail=foo",
+            json={},
+        )
+        user = self.grafana.users.find_user("foo")
+        self.assertEqual(user, {})
+
+    @requests_mock.Mocker()
+    def test_search_users_default(self, m):
+        m.get(
+            "http://localhost/api/users?query=foo&page=1",
+            json=[{"name": "foo"}, {"name": "bar"}],
+        )
+        m.get(
+            "http://localhost/api/users?query=foo&page=2",
+            json=[],
+        )
+        users = self.grafana.users.search_users("foo")
+        self.assertEqual(len(users), 2)
+
+    @requests_mock.Mocker()
+    def test_search_users_default_empty(self, m):
+        m.get(
+            "http://localhost/api/users?query=foo&page=1",
+            json=[],
+        )
+        users = self.grafana.users.search_users("foo")
+        self.assertEqual(len(users), 0)
+
+    @requests_mock.Mocker()
+    def test_search_users_page2(self, m):
+        m.get(
+            "http://localhost/api/users?query=foo&page=2",
+            json=[{}],
+        )
+        users = self.grafana.users.search_users("foo", page=2)
+        self.assertEqual(users, [{}])
+
+    @requests_mock.Mocker()
+    # FIXME: Runs into an endless loop.
+    #        See also https://github.com/panodata/grafana-client/issues/12.
+    def fixme_test_search_users_perpage(self, m):
+        m.get(
+            "http://localhost/api/users?query=foo&perpage=5",
+            json=[{}],
+        )
+        users = self.grafana.users.search_users("foo", perpage=5)
+        self.assertEqual(users, [{}])
+
+    @requests_mock.Mocker()
+    def test_search_users_perpage(self, m):
+        m.get(
+            "http://localhost/api/users?query=foo&page=1&perpage=1",
+            json=[{"name": "foo"}, {"name": "bar"}],
+        )
+        m.get(
+            "http://localhost/api/users?query=foo&page=2&perpage=1",
+            json=[],
+        )
+        users = self.grafana.users.search_users("foo", perpage=1)
+        self.assertEqual(len(users), 2)
+
+    @requests_mock.Mocker()
+    def test_get_user_organisations(self, m):
+        m.get(
+            "http://localhost/api/users/foo/orgs",
+            json=[],
+        )
+        users = self.grafana.users.get_user_organisations("foo")
+        self.assertEqual(users, [])
+
+
+class UserTestCase(unittest.TestCase):
+    def setUp(self):
+        self.grafana = GrafanaApi(("admin", "admin"), host="localhost", url_path_prefix="", protocol="http")
+
+    @requests_mock.Mocker()
+    def test_get_actual_user(self, m):
+        m.get(
+            "http://localhost/api/user",
+            json={},
+        )
+        result = self.grafana.user.get_actual_user()
+        self.assertEqual(result, {})
+
+    @requests_mock.Mocker()
+    def test_change_actual_user_password(self, m):
+        m.put(
+            "http://localhost/api/user/password",
+            json={},
+        )
+        result = self.grafana.user.change_actual_user_password("old", "new")
+        self.assertEqual(result, {})
+
+    @requests_mock.Mocker()
+    def test_switch_user_organisation(self, m):
+        m.post(
+            "http://localhost/api/users/foo/using/acme",
+            json={},
+        )
+        result = self.grafana.user.switch_user_organisation("foo", "acme")
+        self.assertEqual(result, {})
+
+    @requests_mock.Mocker()
+    def test_switch_actual_user_organisation(self, m):
+        m.post(
+            "http://localhost/api/user/using/acme",
+            json={},
+        )
+        result = self.grafana.user.switch_actual_user_organisation("acme")
+        self.assertEqual(result, {})
+
+    @requests_mock.Mocker()
+    def test_get_actual_user_organisations(self, m):
+        m.get(
+            "http://localhost/api/user/orgs",
+            json=[],
+        )
+        result = self.grafana.user.get_actual_user_organisations()
+        self.assertEqual(result, [])
+
+    @requests_mock.Mocker()
+    def test_star_actual_user_dashboard(self, m):
+        m.post(
+            "http://localhost/api/user/stars/dashboard/987vb7t33",
+            json={},
+        )
+        result = self.grafana.user.star_actual_user_dashboard("987vb7t33")
+        self.assertEqual(result, {})
+
+    @requests_mock.Mocker()
+    def test_unstar_actual_user_dashboard(self, m):
+        m.delete(
+            "http://localhost/api/user/stars/dashboard/987vb7t33",
+            json={},
+        )
+        result = self.grafana.user.unstar_actual_user_dashboard("987vb7t33")
+        self.assertEqual(result, {})