Factor out dummy password.

diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/org/cacert/gigi/TestSeparateSessionScope.java
index d59c6c975d2f667bde1f75239a57a3f51c8c7819..a28def7c5abbc8b6a1d66137b89e89f310e1da53 100644 (file)
--- 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 72d72491cf5c61a25da9be8d989d93f48a5190fc..ed854498ab9b8b2ea1b44edab552862369f98875 100644 (file)
--- 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 42e2c18a40c2778e370c5047b492b9203a228b89..98248933cd215b710d99fd9a2d22dde3e65a7b77 100644 (file)
--- 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 aa800251e5b7a9995fd3d7a25e9a89c7d9a1c2ad..36ae2ca1802beec9cd821a1b0569e4f14b0941a8 100644 (file)
--- 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 ec143d2427a2d40b848c18f3f96d5471c8342852..d3570e522bf3d5d864006ded0fd381677e7da7c6 100644 (file)
--- 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();