Merge branch '1.2-auth-examples' into 1.3-auth-example

Author: Zhen

test/examples/auth_example.py

@@ -18,7 +18,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from neo4j.v1 import GraphDatabase, kerberos_auth
+from neo4j.v1 import GraphDatabase, kerberos_auth, custom_auth
 
 
 class BasicAuthExample:
@@ -47,9 +47,13 @@ def close(self):
 
 class CustomAuthExample:
     # tag::custom-auth[]
-    def __init__(self, uri, principal, credentials, realm, scheme, parameters):
-        self._driver = GraphDatabase.driver( uri, auth=(principal, credentials, realm, scheme, parameters))
+    def __init__(self, uri, principal, credentials, realm, scheme, **parameters):
+        self._driver = GraphDatabase.driver(uri, auth=custom_auth(principal, credentials, realm, scheme, **parameters))
     # end::custom-auth[]
 
     def close(self):
         self._driver.close()
+
+    def can_connect(self):
+        record_list = list(self._driver.session().run("RETURN 1"))
+        return int(record_list[0][0]) == 1

test/examples/test_examples.py

@@ -61,6 +61,13 @@ def test_basic_auth_example(self):
 
         self.assertTrue(example.can_connect())
 
+    def test_custom_auth_example(self):
+        from test.examples.auth_example import CustomAuthExample
+
+        example = CustomAuthExample(self.bolt_uri, self.user, self.password, None, "basic", **{"key":"value"})
+
+        self.assertTrue(example.can_connect())
+
     def test_config_unencrypted_example(self):
         from test.examples.config_unencrypted_example import ConfigUnencryptedExample