From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 5 Jul 2014 17:06:03 +0000 (+0200)
Subject: Prohibit negative points in Bussiness-Logic
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=d0a1017a937de3c426b7524c21400d23ff0c6bcb

Prohibit negative points in Bussiness-Logic
---

diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java
index 657264a6..f7327eb9 100644
--- a/src/org/cacert/gigi/util/Notary.java
+++ b/src/org/cacert/gigi/util/Notary.java
@@ -72,7 +72,7 @@ public class Notary {
 			return false;
 		}
 		System.out.println("Would now assure.");
-		if (awarded > assurer.getMaxAssurePoints()) {
+		if (awarded > assurer.getMaxAssurePoints() || awarded < 0) {
 			return false;
 		}
 
diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java
index 9af8ccc4..750fd938 100644
--- a/tests/org/cacert/gigi/util/TestNotary.java
+++ b/tests/org/cacert/gigi/util/TestNotary.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.*;
 public class TestNotary extends ManagedTest {
 	@Test
 	public void testSigning() throws SQLException {
-		User[] users = new User[10];
+		User[] users = new User[30];
 		for (int i = 0; i < users.length; i++) {
 			int id = createVerifiedUser("fn" + i, "ln" + i, createUniqueName()
 					+ "@email.org", "xvXV12°§");
@@ -19,54 +19,26 @@ public class TestNotary extends ManagedTest {
 		}
 		User assurer = new User(createAssuranceUser("fn", "ln",
 				createUniqueName() + "@email.org", "xvXV12°§"));
-		assertEquals(10, assurer.getMaxAssurePoints());
-		assertTrue(Notary.assure(assurer, users[1], 10, "test-notary",
-				"2014-01-01"));
-		assertEquals(10, assurer.getMaxAssurePoints());
-		assertTrue(Notary.assure(assurer, users[2], 10, "test-notary",
-				"2014-01-01"));
-		assertEquals(10, assurer.getMaxAssurePoints());
-		assertTrue(Notary.assure(assurer, users[3], 10, "test-notary",
-				"2014-01-01"));
-		assertEquals(10, assurer.getMaxAssurePoints());
-		assertTrue(Notary.assure(assurer, users[4], 10, "test-notary",
-				"2014-01-01"));
-		assertEquals(15, assurer.getMaxAssurePoints());
-		assertTrue(Notary.assure(assurer, users[5], 15, "test-notary",
-				"2014-01-01"));
-		// Assure someone again
-		assertTrue(!Notary.assure(assurer, users[5], 15, "test-notary",
-				"2014-01-01"));
-
-		// Assure too much
-		assertTrue(!Notary.assure(assurer, users[6], 20, "test-notary",
-				"2014-01-01"));
-		assertTrue(!Notary.assure(assurer, users[6], 16, "test-notary",
-				"2014-01-01"));
-
-		assertTrue(Notary.assure(assurer, users[6], 15, "test-notary",
-				"2014-01-01"));
-		assertEquals(15, assurer.getMaxAssurePoints());
-
-		// Assure self
-		assertTrue(!Notary.assure(assurer, assurer, 10, "test-notary",
-				"2014-01-01"));
-
-		assertTrue(Notary.assure(assurer, users[7], 15, "test-notary",
-				"2014-01-01"));
-		assertEquals(15, assurer.getMaxAssurePoints());
-		assertTrue(Notary.assure(assurer, users[8], 15, "test-notary",
-				"2014-01-01"));
-		assertEquals(15, assurer.getMaxAssurePoints());
-		assertTrue(Notary.assure(assurer, users[9], 15, "test-notary",
-				"2014-01-01"));
-		assertEquals(20, assurer.getMaxAssurePoints());
+		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);
+		assertFalse(Notary.assure(assurer, users[0], -1, "test-notary",
+				"2014-01-01"));
+		for (int i = 0; i < result.length; i++) {
+			assertEquals(result[i], assurer.getMaxAssurePoints());
+			assertFalse(Notary.assure(assurer, users[i], result[i] + 1,
+					"test-notary", "2014-01-01"));
+			assertTrue(Notary.assure(assurer, users[i], result[i],
+					"test-notary", "2014-01-01"));
+			assertFalse(Notary.assure(assurer, users[i], result[i],
+					"test-notary", "2014-01-01"));
+		}
 
-		assertTrue(Notary.assure(assurer, users[0], 15, "test-notary",
-				"2014-01-01"));
-		assertEquals(20, assurer.getMaxAssurePoints());
+		assertEquals(35, assurer.getMaxAssurePoints());
 
-		assertEquals(2 + 20, assurer.getExperiencePoints());
+		assertEquals(2 + 60, assurer.getExperiencePoints());
 
 	}
 }