Fixed encryption test with 3.0 neo4j

Neo4j 3.0.x throws different error when encryption required but not
used by the driver. This commit fixes test to account for it.

Author: lutovich

driver/src/test/java/org/neo4j/driver/v1/integration/EncryptionIT.java

@@ -18,29 +18,42 @@
  */
 package org.neo4j.driver.v1.integration;
 
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
+import org.neo4j.driver.internal.util.ServerVersion;
 import org.neo4j.driver.v1.Config;
 import org.neo4j.driver.v1.Driver;
 import org.neo4j.driver.v1.GraphDatabase;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Session;
 import org.neo4j.driver.v1.StatementResult;
+import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
 import org.neo4j.driver.v1.util.Neo4jSettings;
 import org.neo4j.driver.v1.util.Neo4jSettings.BoltTlsLevel;
 import org.neo4j.driver.v1.util.TestNeo4j;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
+import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
 
 public class EncryptionIT
 {
     @Rule
-    public TestNeo4j neo4j = new TestNeo4j();
+    public final TestNeo4j neo4j = new TestNeo4j();
+
+    private ServerVersion neo4jVersion;
+
+    @Before
+    public void setUp()
+    {
+        neo4jVersion = neo4j.version();
+    }
 
     @Test
     public void shouldOperateWithNoEncryptionWhenItIsOptionalInTheDatabase()
@@ -108,9 +121,19 @@ private void testMismatchingEncryption( BoltTlsLevel tlsLevel, boolean driverEnc
             GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), config ).close();
             fail( "Exception expected" );
         }
-        catch ( ServiceUnavailableException e )
+        catch ( RuntimeException e )
         {
-            assertThat( e.getMessage(), startsWith( "Connection to the database terminated" ) );
+            // pre 3.1 neo4j throws different exception when encryption required but not used
+            if ( neo4jVersion.lessThan( v3_1_0 ) && tlsLevel == BoltTlsLevel.REQUIRED )
+            {
+                assertThat( e, instanceOf( ClientException.class ) );
+                assertThat( e.getMessage(), startsWith( "This server requires a TLS encrypted connection" ) );
+            }
+            else
+            {
+                assertThat( e, instanceOf( ServiceUnavailableException.class ) );
+                assertThat( e.getMessage(), startsWith( "Connection to the database terminated" ) );
+            }
         }
     }
 

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java

@@ -290,23 +290,22 @@ private void updateServerSettingsFile()
 
     private void installShutdownHook()
     {
-        Runtime.getRuntime().addShutdownHook( new Thread( new Runnable()
+        Runtime.getRuntime().addShutdownHook( new Thread( () ->
         {
-            @Override
-            public void run()
-            {
             try
             {
-                debug("Starting shutdown hook");
-                driver.close();
+                debug( "Starting shutdown hook" );
+                if ( driver != null )
+                {
+                    driver.close();
+                }
                 stopNeo4j();
-                debug("Finished shutdown hook");
+                debug( "Finished shutdown hook" );
             }
             catch ( Exception e )
             {
                 e.printStackTrace();
             }
-            }
         } ) );
     }