upd: change Experience Point calculation from magic number to constant

Change-Id: I2c28dafc6928fcd54f2f1021f5b5f8c984a30645

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 91ab46cbe8b3c70aa081208ad0b75c4abe683199..9f5d8e17cf1455a38c3cc7b874300b7f61c55893 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -48,6 +48,8 @@ public class User extends CertificateOwner {
 
     public static final boolean POJAM_ENABLED = false;
 
+    public static final int EXPERIENCE_POINTS = 2;
+
     /**
      * Time in months a verification is considered "recent".
      */
@@ -231,7 +233,7 @@ public class User extends CertificateOwner {
             int points = 0;
 
             if (rs.next()) {
-                points = rs.getInt(1) * 2;
+                points = rs.getInt(1) * EXPERIENCE_POINTS;
             }
 
             return points;
@@ -252,19 +254,19 @@ public class User extends CertificateOwner {
         int exp = getExperiencePoints();
         int points = 10;
 
-        if (exp >= 10) {
+        if (exp >= 5 * EXPERIENCE_POINTS) {
             points += 5;
         }
-        if (exp >= 20) {
+        if (exp >= 10 * EXPERIENCE_POINTS) {
             points += 5;
         }
-        if (exp >= 30) {
+        if (exp >= 15 * EXPERIENCE_POINTS) {
             points += 5;
         }
-        if (exp >= 40) {
+        if (exp >= 20 * EXPERIENCE_POINTS) {
             points += 5;
         }
-        if (exp >= 50) {
+        if (exp >= 25 * EXPERIENCE_POINTS) {
             points += 5;
         }
 

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index 65271f6d2db108cb6f9832cbdbe888c4a44cc826..d4810af9cb826f924de10c7afd028af1f943617b 100644 (file)
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -55,7 +55,7 @@ public class TestUser extends BusinessTest {
         int assurancePoints = u.getAssurancePoints();
         int expPoints = u.getExperiencePoints();
         assertEquals(100, assurancePoints);
-        assertEquals(2, expPoints);
+        assertEquals(User.EXPERIENCE_POINTS, expPoints);
         assertTrue(u.hasPassedCATS());
         assertEquals(10, u.getMaxAssurePoints());
     }

diff --git a/tests/org/cacert/gigi/dbObjects/TestAssurance.java b/tests/org/cacert/gigi/dbObjects/TestAssurance.java
index 14c7b35b0361f6d6a5a382697bae188674a20f90..71c996d53275be8fd54991f5e549d0c8558f409b 100644 (file)
--- a/tests/org/cacert/gigi/dbObjects/TestAssurance.java
+++ b/tests/org/cacert/gigi/dbObjects/TestAssurance.java
@@ -227,7 +227,6 @@ public class TestAssurance extends BusinessTest {
         // enter entry for second applicant
         enterAssuranceWhen(agentID, applicant.getPreferredName().getId(), yesterday);
 
-        assertEquals(agent.getExperiencePoints(), xPoints + 2);
-
+        assertEquals(agent.getExperiencePoints(), xPoints + User.EXPERIENCE_POINTS);
     }
 }

diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java
index 21045c9a229b1ef1d87bc453dfb35c5f7d4856a7..38f8582f73ed2cda3f7640de1bda553b54fed9d3 100644 (file)
--- a/tests/org/cacert/gigi/util/TestNotary.java
+++ b/tests/org/cacert/gigi/util/TestNotary.java
@@ -46,7 +46,7 @@ public class TestNotary extends BusinessTest {
 
         assertEquals(35, assurer.getMaxAssurePoints());
 
-        assertEquals(2 + 60, assurer.getExperiencePoints());
+        assertEquals(User.EXPERIENCE_POINTS + (30 * User.EXPERIENCE_POINTS), assurer.getExperiencePoints());
 
     }