X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Futil%2FTestNotary.java;h=9797a03eea4016a74dd756bac81bd0f7d58abd52;hb=943d8e7ed0ea5a9d56e7e694a3cbd849c52bad16;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..9797a03e 100644
--- a/tests/org/cacert/gigi/util/TestNotary.java
+++ b/tests/org/cacert/gigi/util/TestNotary.java
@@ -12,64 +12,50 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class TestNotary extends ManagedTest {
-	@Test
-	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°§");
-			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};
 
-		System.out.println(result.length);
-		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"));
-		}
-
-		assertEquals(35, assurer.getMaxAssurePoints());
-
-		assertEquals(2 + 60, assurer.getExperiencePoints());
-
-	}
-
-	@Test
-	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°§");
-			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=?");
-		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"));
-		}
-	}
+    @Test
+    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", TEST_PASSWORD);
+            users[i] = new User(id);
+        }
+        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
+        };
+
+        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"));
+        }
+
+        assertEquals(35, assurer.getMaxAssurePoints());
+
+        assertEquals(2 + 60, assurer.getExperiencePoints());
+
+    }
+
+    @Test
+    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", TEST_PASSWORD);
+            users[i] = new User(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"));
+        }
+    }
 }