X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Futil%2FTestNotary.java;h=d3570e522bf3d5d864006ded0fd381677e7da7c6;hb=29a56cb5f3b067880f675ad2bcb3b19120f93410;hp=274b323967acd2c6b2a2d1ce225ea5e5d599ba4b;hpb=43a9a9b70dc1201901d333492e8efeb015a2e33c;p=gigi.git

diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java
index 274b3239..d3570e52 100644
--- a/tests/org/cacert/gigi/util/TestNotary.java
+++ b/tests/org/cacert/gigi/util/TestNotary.java
@@ -16,28 +16,23 @@ 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°§"));
-		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};
+		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 };
 
-		System.out.println(result.length);
-		assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
-				assurer, users[0], -1, "test-notary", "2014-01-01"));
+		assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED,
+			Notary.assure(assurer, users[0], -1, "test-notary", "2014-01-01"));
 		for (int i = 0; i < result.length; i++) {
 			assertEquals(result[i], assurer.getMaxAssurePoints());
-			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
-					assurer, users[i], result[i] + 1, "test-notary",
-					"2014-01-01"));
-			assertEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
-					assurer, users[i], result[i], "test-notary", "2014-01-01"));
-			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
-					assurer, users[i], result[i], "test-notary", "2014-01-01"));
+			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED,
+				Notary.assure(assurer, users[i], result[i] + 1, "test-notary", "2014-01-01"));
+			assertEquals(AssuranceResult.ASSURANCE_SUCCEDED,
+				Notary.assure(assurer, users[i], result[i], "test-notary", "2014-01-01"));
+			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED,
+				Notary.assure(assurer, users[i], result[i], "test-notary", "2014-01-01"));
 		}
 
 		assertEquals(35, assurer.getMaxAssurePoints());
@@ -50,26 +45,23 @@ 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°§");
-		PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-				"UPDATE users SET dob=NOW() WHERE id=?");
+		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();
 		User assurer = new User(id);
 		for (int i = 0; i < users.length; i++) {
-			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
-					assurer, users[i], -1, "test-notary", "2014-01-01"));
-			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
-					assurer, users[i], 11, "test-notary", "2014-01-01"));
-			assertEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
-					assurer, users[i], 10, "test-notary", "2014-01-01"));
-			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
-					assurer, users[i], 10, "test-notary", "2014-01-01"));
+			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED,
+				Notary.assure(assurer, users[i], -1, "test-notary", "2014-01-01"));
+			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED,
+				Notary.assure(assurer, users[i], 11, "test-notary", "2014-01-01"));
+			assertEquals(AssuranceResult.ASSURANCE_SUCCEDED,
+				Notary.assure(assurer, users[i], 10, "test-notary", "2014-01-01"));
+			assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED,
+				Notary.assure(assurer, users[i], 10, "test-notary", "2014-01-01"));
 		}
 	}
 }