X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Futil%2FTestPasswordMigration.java;h=7ff4ea6dd76176bdc9e577c8610e4eb4c655e557;hb=4b9842acd7dd0e79de8fc3f88cb8241f9b2f134e;hp=030794cb03947ce5938bba4f1386bb9b190f13d0;hpb=ec24cf6925bb3729a644580ad4a9375d05883c62;p=gigi.git

diff --git a/tests/org/cacert/gigi/util/TestPasswordMigration.java b/tests/org/cacert/gigi/util/TestPasswordMigration.java
index 030794cb..7ff4ea6d 100644
--- a/tests/org/cacert/gigi/util/TestPasswordMigration.java
+++ b/tests/org/cacert/gigi/util/TestPasswordMigration.java
@@ -5,7 +5,6 @@ import static org.junit.Assert.*;
 
 import java.io.IOException;
 
-import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.testUtils.ManagedTest;
@@ -20,18 +19,20 @@ public class TestPasswordMigration extends ManagedTest {
 
     @Test
     public void testPasswordMigration() throws IOException {
-        GigiPreparedStatement stmt = DatabaseConnection.getInstance().prepare("UPDATE users SET `password`=SHA1(?) WHERE id=?");
-        stmt.setString(1, "a");
-        stmt.setInt(2, ru.getUser().getId());
-        stmt.execute();
+        try (GigiPreparedStatement stmt = new GigiPreparedStatement("UPDATE users SET `password`=? WHERE id=?")) {
+            stmt.setString(1, PasswordHash.sha1("a"));
+            stmt.setInt(2, ru.getUser().getId());
+            stmt.execute();
+        }
         String cookie = login(ru.getUser().getEmail(), "a");
         assertTrue(isLoggedin(cookie));
 
-        stmt = DatabaseConnection.getInstance().prepare("SELECT `password` FROM users WHERE id=?");
-        stmt.setInt(1, ru.getUser().getId());
-        GigiResultSet res = stmt.executeQuery();
-        assertTrue(res.next());
-        String newHash = res.getString(1);
-        assertThat(newHash, containsString("$"));
+        try (GigiPreparedStatement stmt = new GigiPreparedStatement("SELECT `password` FROM users WHERE id=?")) {
+            stmt.setInt(1, ru.getUser().getId());
+            GigiResultSet res = stmt.executeQuery();
+            assertTrue(res.next());
+            String newHash = res.getString(1);
+            assertThat(newHash, containsString("$"));
+        }
     }
 }