Added some test cases to cover some edge cases (#80)

* Added some test cases to cover some edge cases

* Tests for _utils module

Author: hiranya911

firebase_admin/credentials.py

@@ -180,7 +180,7 @@ def __init__(self, refresh_token):
             refresh_token = json_data['refresh_token']
         except KeyError as error:
             raise ValueError('Failed to initialize a refresh token credential. '
-                             'Caused by: "{0}"'.format(error))
+                             'Missing key: {0}'.format(error))
         self._g_credential = credentials.Credentials(
             token=None, refresh_token=refresh_token,
             token_uri='https://accounts.google.com/o/oauth2/token',

firebase_admin/db.py

@@ -22,7 +22,6 @@
 
 import collections
 import json
-import numbers
 import sys
 
 import requests
@@ -361,15 +360,6 @@ def order_by_value(self):
     def _add_suffix(self, suffix='.json'):
         return self._pathurl + suffix
 
-    @classmethod
-    def _check_priority(cls, priority):
-        if isinstance(priority, six.string_types) and priority.isalnum():
-            return
-        if isinstance(priority, numbers.Number):
-            return
-        raise ValueError('Illegal priority value: "{0}". Priority values must be numeric or '
-                         'alphanumeric.'.format(priority))
-
 
 class Query(object):
     """Represents a complex query that can be executed on a Reference.
@@ -529,6 +519,7 @@ def __init__(self, message, error):
         Exception.__init__(self, message)
         self.detail = error
 
+
 class TransactionError(Exception):
     """Represents an Exception encountered while performing a transaction."""
 

firebase_admin/storage.py

@@ -64,14 +64,10 @@ def __init__(self, credentials, project, default_bucket):
     @classmethod
     def from_app(cls, app):
         credentials = app.credential.get_credential()
+        default_bucket = app.options.get('storageBucket')
         # Specifying project ID is not required, but providing it when available
         # significantly speeds up the initialization of the storage client.
-        try:
-            project = app.credential.project_id
-        except AttributeError:
-            project = None
-        default_bucket = app.options.get('storageBucket')
-        return _StorageClient(credentials, project, default_bucket)
+        return _StorageClient(credentials, app.project_id, default_bucket)
 
     def bucket(self, name=None):
         """Returns a handle to the specified Cloud Storage Bucket."""

tests/test_app.py

@@ -207,3 +207,13 @@ def test_app_services(self, init_app):
         firebase_admin.delete_app(init_app)
         with pytest.raises(ValueError):
             _utils.get_app_service(init_app, 'test.service', AppService)
+
+    @pytest.mark.parametrize('arg', [0, 1, True, False, 'str', list(), dict(), tuple()])
+    def test_app_services_invalid_arg(self, arg):
+        with pytest.raises(ValueError):
+            _utils.get_app_service(arg, 'test.service', AppService)
+
+    def test_app_services_invalid_app(self, init_app):
+        app = firebase_admin.App(init_app.name, init_app.credential, {})
+        with pytest.raises(ValueError):
+            _utils.get_app_service(app, 'test.service', AppService)

tests/test_auth.py

@@ -182,7 +182,8 @@ class TestCreateCustomToken(object):
         'StrClaims': (MOCK_UID, 'foo', ValueError),
         'ListClaims': (MOCK_UID, [], ValueError),
         'TupleClaims': (MOCK_UID, (1, 2), ValueError),
-        'ReservedClaims': (MOCK_UID, {'sub':'1234'}, ValueError),
+        'SingleReservedClaim': (MOCK_UID, {'sub':'1234'}, ValueError),
+        'MultipleReservedClaims': (MOCK_UID, {'sub':'1234', 'aud':'foo'}, ValueError),
     }
 
     @pytest.mark.parametrize('user,claims', valid_args.values(),

tests/test_credentials.py

@@ -146,6 +146,18 @@ def test_invalid_args(self, arg):
         with pytest.raises(ValueError):
             credentials.RefreshToken(arg)
 
+    @pytest.mark.parametrize('key', ['client_id', 'client_secret', 'refresh_token'])
+    def test_required_field(self, key):
+        data = {
+            'client_id': 'value',
+            'client_secret': 'value',
+            'refresh_token': 'value',
+            'type': 'authorized_user'
+        }
+        del data[key]
+        with pytest.raises(ValueError):
+            credentials.RefreshToken(data)
+
     def _verify_credential(self, credential):
         assert credential.client_id == 'mock.apps.googleusercontent.com'
         assert credential.client_secret == 'mock-secret'

tests/test_db.py

@@ -730,6 +730,11 @@ def test_all_in(self, initquery):
         expected = 'endAt=3&equalTo=2&limitToFirst=10&orderBy="{0}"&startAt=1'.format(order_by)
         assert query._querystr == expected
 
+    def test_invalid_query_args(self):
+        ref = db.Reference(path='foo')
+        with pytest.raises(ValueError):
+            db.Query(order_by='$key', client=ref._client, pathurl=ref._add_suffix(), foo='bar')
+
 
 class TestSorter(object):
     """Test cases for db._Sorter class."""
@@ -740,6 +745,7 @@ class TestSorter(object):
         ({'k1' : 3, 'k2' : 1, 'k3' : 2}, ['k2', 'k3', 'k1']),
         ({'k1' : 3, 'k2' : 1, 'k3' : 1}, ['k2', 'k3', 'k1']),
         ({'k1' : 1, 'k2' : 2, 'k3' : 1}, ['k1', 'k3', 'k2']),
+        ({'k1' : 2, 'k2' : 2, 'k3' : 1}, ['k3', 'k1', 'k2']),
         ({'k1' : 'foo', 'k2' : 'bar', 'k3' : 'baz'}, ['k2', 'k3', 'k1']),
         ({'k1' : 'foo', 'k2' : 'bar', 'k3' : 10}, ['k3', 'k2', 'k1']),
         ({'k1' : 'foo', 'k2' : 'bar', 'k3' : None}, ['k3', 'k2', 'k1']),
@@ -758,6 +764,8 @@ class TestSorter(object):
         ([1, 2, 3], [1, 2, 3]),
         ([3, 2, 1], [1, 2, 3]),
         ([1, 3, 2], [1, 2, 3]),
+        ([1, 3, 3], [1, 3, 3]),
+        ([2, 3, 2], [2, 2, 3]),
         (['foo', 'bar', 'baz'], ['bar', 'baz', 'foo']),
         (['foo', 1, False, None, 0, True], [None, False, True, 0, 1, 'foo']),
     ]

tests/test_http_client.py

@@ -0,0 +1,66 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Tests for firebase_admin._http_client."""
+import requests
+
+from firebase_admin import _http_client
+from tests import testutils
+
+
+_TEST_URL = 'http://firebase.test.url/'
+
+
+def test_http_client_default_session():
+    client = _http_client.HttpClient()
+    assert client.session is not None
+    assert client.base_url == ''
+    recorder = _instrument(client, 'body')
+    resp = client.request('get', _TEST_URL)
+    assert resp.status_code == 200
+    assert resp.text == 'body'
+    assert len(recorder) == 1
+    assert recorder[0].method == 'GET'
+    assert recorder[0].url == _TEST_URL
+
+def test_http_client_custom_session():
+    session = requests.Session()
+    client = _http_client.HttpClient(session=session)
+    assert client.session is session
+    assert client.base_url == ''
+    recorder = _instrument(client, 'body')
+    resp = client.request('get', _TEST_URL)
+    assert resp.status_code == 200
+    assert resp.text == 'body'
+    assert len(recorder) == 1
+    assert recorder[0].method == 'GET'
+    assert recorder[0].url == _TEST_URL
+
+def test_base_url():
+    client = _http_client.HttpClient(base_url=_TEST_URL)
+    assert client.session is not None
+    assert client.base_url == _TEST_URL
+    recorder = _instrument(client, 'body')
+    resp = client.request('get', 'foo')
+    assert resp.status_code == 200
+    assert resp.text == 'body'
+    assert len(recorder) == 1
+    assert recorder[0].method == 'GET'
+    assert recorder[0].url == _TEST_URL + 'foo'
+
+def _instrument(client, payload, status=200):
+    recorder = []
+    adapter = testutils.MockAdapter(payload, status, recorder)
+    client.session.mount(_TEST_URL, adapter)
+    return recorder