From 29a56cb5f3b067880f675ad2bcb3b19120f93410 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Wed, 23 Jul 2014 19:04:06 +0200 Subject: [PATCH] Factor out dummy password. --- tests/org/cacert/gigi/TestSeparateSessionScope.java | 2 -- tests/org/cacert/gigi/TestUser.java | 4 ++-- tests/org/cacert/gigi/pages/wot/TestAssurance.java | 6 +++--- tests/org/cacert/gigi/testUtils/ManagedTest.java | 5 +++++ tests/org/cacert/gigi/util/TestNotary.java | 8 ++++---- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/org/cacert/gigi/TestSeparateSessionScope.java index d59c6c97..a28def7c 100644 --- a/tests/org/cacert/gigi/TestSeparateSessionScope.java +++ b/tests/org/cacert/gigi/TestSeparateSessionScope.java @@ -17,8 +17,6 @@ import org.junit.Test; public class TestSeparateSessionScope extends ManagedTest { - private static final String TEST_PASSWORD = "xvXV12°§"; - @Test public void testSeparateScope() throws IOException, GeneralSecurityException, SQLException, InterruptedException { String mail = "thisgo" + createUniqueName() + "@example.com"; diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java index 72d72491..ed854498 100644 --- a/tests/org/cacert/gigi/TestUser.java +++ b/tests/org/cacert/gigi/TestUser.java @@ -26,7 +26,7 @@ public class TestUser extends ManagedTest { @Test public void testWebStoreAndLoad() throws SQLException { - int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", "xvXV12°§"); + int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD); User u = new User(id); assertEquals("aä", u.getFname()); @@ -36,7 +36,7 @@ public class TestUser extends ManagedTest { @Test public void testAssurerUtilMethods() throws SQLException { - int id = createAssuranceUser("aä", "b", createUniqueName() + "a@email.org", "xvXV12°§"); + int id = createAssuranceUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD); User u = new User(id); assertTrue(u.canAssure()); diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java index 42e2c18a..98248933 100644 --- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java +++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java @@ -31,9 +31,9 @@ public class TestAssurance extends ManagedTest { public void setup() throws IOException { assurerM = createUniqueName() + "@cacert-test.org"; assureeM = createUniqueName() + "@cacert-test.org"; - assurer = createAssuranceUser("a", "b", assurerM, "xvXV.1"); - assuree = createAssuranceUser("a", "c", assureeM, "xvXV.1"); - cookie = login(assurerM, "xvXV.1"); + assurer = createAssuranceUser("a", "b", assurerM, TEST_PASSWORD); + assuree = createAssuranceUser("a", "c", assureeM, TEST_PASSWORD); + cookie = login(assurerM, TEST_PASSWORD); } diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index aa800251..36ae2ca1 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -47,6 +47,11 @@ import org.junit.AfterClass; import org.junit.BeforeClass; public class ManagedTest { + /** + * Some password that fullfills the password criteria. + */ + protected static final String TEST_PASSWORD = "xvXV12°§"; + private final String registerService = "/register"; private static TestEmailReciever ter; diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java index ec143d24..d3570e52 100644 --- a/tests/org/cacert/gigi/util/TestNotary.java +++ b/tests/org/cacert/gigi/util/TestNotary.java @@ -16,10 +16,10 @@ public class TestNotary extends ManagedTest { public void testNormalAssurance() throws SQLException { User[] users = new User[30]; for (int i = 0; i < users.length; i++) { - int id = createVerifiedUser("fn" + i, "ln" + i, createUniqueName() + "@email.org", "xvXV12°§"); + int id = createVerifiedUser("fn" + i, "ln" + i, createUniqueName() + "@email.org", TEST_PASSWORD); users[i] = new User(id); } - User assurer = new User(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", "xvXV12°§")); + User assurer = new User(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD)); int[] result = new int[] { 10, 10, 10, 10, 15, 15, 15, 15, 15, 20, 20, 20, 20, 20, 25, 25, 25, 25, 25, 30, 30, 30, 30, 30, 35, 35, 35, 35, 35, 35 }; @@ -45,10 +45,10 @@ public class TestNotary extends ManagedTest { public void testPoJam() throws SQLException { User[] users = new User[30]; for (int i = 0; i < users.length; i++) { - int id = createVerifiedUser("fn" + i, "ln" + i, createUniqueName() + "@email.org", "xvXV12°§"); + int id = createVerifiedUser("fn" + i, "ln" + i, createUniqueName() + "@email.org", TEST_PASSWORD); users[i] = new User(id); } - int id = createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", "xvXV12°§"); + int id = createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD); PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE users SET dob=NOW() WHERE id=?"); ps.setInt(1, id); ps.execute(); -- 2.39.2