Fixed tests.

Some more documentation.

Author: rohe

doc/keyhandling.rst

@@ -251,6 +251,46 @@ Key Jar
 A key jar keeps keys sorted by owner/issuer. The keys in a key jar are all
 part of key bundles.
 
+Creating a key jar with your own newly minted keys you would do:
+
+    >>> from cryptojwt.key_jar import build_keyjar
+    >>> key_specs = [
+        {"type": "RSA", "use": ["enc", "sig"]},
+        {"type": "EC", "crv": "P-256", "use": ["sig"]},
+    ]
+    >>> key_jar = build_keyjar(key_specs)
+    >>> len(key_jar.get_issuer_keys(''))
+    3
+
+**Note* that the default issuer ID is the empty string ''.
+
+To import a JWKS you would do::
+
+    >>> from cryptojwt.key_bundle import KeyBundle
+    >>> from cryptojwt.key_jar import KeyJar
+    >>> JWKS = {
+      "keys": [
+        {
+           "kty": "RSA",
+           "e": "AQAB",
+           "kid": "abc",
+           "n":
+             "wf-wiusGhA-gleZYQAOPQlNUIucPiqXdPVyieDqQbXXOPBe3nuggtVzeq7
+              pVFH1dZz4dY2Q2LA5DaegvP8kRvoSB_87ds3dy3Rfym_GUSc5B0l1TgEob
+              cyaep8jguRoHto6GWHfCfKqoUYZq4N8vh4LLMQwLR6zi6Jtu82nB5k8"
+        }
+      ]}
+    >>> kb = KeyBundle(JWKS)
+    >>> key_jar = KeyJar()
+    >>> key_jar.add_kb('', kb)
+
+The last line can also be expressed as::
+
+    >>> keyjar[''] = kb
+
+**Note** both variants, adds a key bundle to the list of key bundles that
+belongs to '' it does not overwrite anything that was already there.
+
 
 .. _cryptography: https://cryptography.io/en/latest/
 .. _JWK: https://tools.ietf.org/html/rfc7517

tests/test_04_key_jar.py

@@ -8,10 +8,13 @@
 from cryptojwt.jws.jws import factory
 from cryptojwt.jws.jws import JWS
 
-from cryptojwt.key_bundle import keybundle_from_local_file, rsa_init
+from cryptojwt.key_bundle import keybundle_from_local_file
+from cryptojwt.key_bundle import rsa_init
 from cryptojwt.key_bundle import KeyBundle
-from cryptojwt.key_jar import build_keyjar, update_keyjar, key_summary, \
-    init_key_jar
+from cryptojwt.key_jar import build_keyjar
+from cryptojwt.key_jar import init_key_jar
+from cryptojwt.key_jar import key_summary
+from cryptojwt.key_jar import update_keyjar
 from cryptojwt.key_jar import KeyJar
 
 __author__ = 'Roland Hedberg'
@@ -176,10 +179,6 @@ def full_path(local_file):
 }
 
 
-# def test_key_setup():
-#     x = key_setup()
-
-
 def test_build_keyjar():
     keys = [
         {"type": "RSA", "use": ["enc", "sig"]},
@@ -192,17 +191,20 @@ def test_build_keyjar():
         assert "d" not in key  # the JWKS shouldn't contain the private part
         # of the keys
 
-    assert len(keyjar[""]) == 2  # 1 with RSA keys and 1 with EC key
+    assert len(keyjar[""]) == 1  # One key bundle
+    assert len(keyjar.get_issuer_keys('')) == 3  # A total of 3 keys
+    assert len(keyjar.get('sig')) == 2  # 2 for signing
+    assert len(keyjar.get('enc')) == 1  # 1 for encryption
 
 
 def test_build_keyjar_missing(tmpdir):
     keys = [
         {"type": "RSA", "key": os.path.join(tmpdir.dirname, "missing_file"),
          "use": ["enc", "sig"]}]
 
-    keyjar = build_keyjar(keys)
+    key_jar = build_keyjar(keys)
 
-    assert len(keyjar[""]) == 1
+    assert len(key_jar[""]) == 1
 
 
 class TestKeyJar(object):
@@ -289,17 +291,6 @@ def test_get_enc_not_mine(self):
 
         assert ks.get('enc', 'oct', 'http://www.example.org/')
 
-    # def test_get_by_kid(self):
-    #     kb = keybundle_from_local_file("file://%s/jwk.json" % BASE_PATH,
-    # "jwks",
-    #                                    ["sig"])
-    #     kj = KeyJar()
-    #     kj.issuer_keys["https://example.com"] = [kb]
-    #
-    #     _key = kj.get_key_by_kid("abc", "https://example.com")
-    #     assert _key
-    #     assert _key.kid == "abc"
-
     def test_dump_issuer_keys(self):
         kb = keybundle_from_local_file("file://%s/jwk.json" % BASE_PATH, "jwks",
                                        ["sig"])