[CONJ-737] sha256User testing correction

mariadb-corporation · Oct 15, 2019 · e1b9d5a · e1b9d5a
1 parent 3d4586a
commit e1b9d5a
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/test/java/org/mariadb/jdbc/Sha256AuthenticationTest.java b/src/test/java/org/mariadb/jdbc/Sha256AuthenticationTest.java
@@ -41,16 +41,22 @@ public void checkSsl() throws SQLException {
       // eat
     }
 
-    stmt.execute("CREATE USER 'sha256User'@'%'");
-    stmt.execute(
-        "GRANT ALL PRIVILEGES ON *.* TO 'sha256User'@'%' IDENTIFIED WITH "
-            + "sha256_password BY 'password'");
     if (minVersion(8, 0, 0)) {
-
-      stmt.execute("CREATE USER 'cachingSha256User'@'%'");
       stmt.execute(
-          "GRANT ALL PRIVILEGES ON *.* TO 'cachingSha256User'@'%' IDENTIFIED WITH "
-              + "caching_sha2_password BY 'password'");
+          "CREATE USER 'sha256User'@'%' IDENTIFIED WITH sha256_password BY 'password'");
+      stmt.execute(
+          "GRANT ALL PRIVILEGES ON *.* TO 'sha256User'@'%'");
+    } else {
+      stmt.execute("CREATE USER 'sha256User'@'%'");
+      stmt.execute(
+          "GRANT ALL PRIVILEGES ON *.* TO 'sha256User'@'%' IDENTIFIED WITH "
+              + "sha256_password BY 'password'");
+    }
+    if (minVersion(8, 0, 0)) {
+      stmt.execute(
+          "CREATE USER 'cachingSha256User'@'%'  IDENTIFIED WITH caching_sha2_password BY 'password'");
+      stmt.execute(
+          "GRANT ALL PRIVILEGES ON *.* TO 'cachingSha256User'@'%'");
     } else {
       forceTls = "&enabledSslProtocolSuites=TLSv1.1";
     }