upd: adjust time conditions according to BR requirements

fix issue #167
Change-Id: I47145e69e277c7d765aca8f4ff635b4627dc31aa

diff --git a/src/club/wpia/gigi/util/TimeConditions.java b/src/club/wpia/gigi/util/TimeConditions.java
index 3396881450f7b2fcfaa1eabfa2502d8e17bc213b..bd6751fb935046c228ecfa926f0150a5fff7283b 100644 (file)
--- a/src/club/wpia/gigi/util/TimeConditions.java
+++ b/src/club/wpia/gigi/util/TimeConditions.java
@@ -21,7 +21,7 @@ public class TimeConditions {
     private TimeConditions(Properties ppts) {
         testValidMonths = Integer.parseInt(ppts.getProperty("time.testValidMonths", "12"));
         reverificationDays = Integer.parseInt(ppts.getProperty("time.reverificationDays", "90"));
-        verificationFreshMonths = Integer.parseInt(ppts.getProperty("time.verificationFreshMonths", "39"));
+        verificationFreshMonths = Integer.parseInt(ppts.getProperty("time.verificationFreshMonths", "27"));
         verificationMaxAgeMonths = Integer.parseInt(ppts.getProperty("time.verificationMaxAgeMonths", "24"));
         emailPingMonths = Integer.parseInt(ppts.getProperty("time.emailPingMonths", "6"));
     }

diff --git a/tests/club/wpia/gigi/dbObjects/TestVerification.java b/tests/club/wpia/gigi/dbObjects/TestVerification.java
index a20f4cefa75aa22f2659d4004e89f71368f13ffc..2cb26ca8dac0d014444961f6901b5ffa760e8f7e 100644 (file)
--- a/tests/club/wpia/gigi/dbObjects/TestVerification.java
+++ b/tests/club/wpia/gigi/dbObjects/TestVerification.java
@@ -10,7 +10,6 @@ import org.junit.Test;
 
 import club.wpia.gigi.GigiApiException;
 import club.wpia.gigi.database.GigiPreparedStatement;
-import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.testUtils.BusinessTest;
 import club.wpia.gigi.util.DayDate;
 import club.wpia.gigi.util.Notary;
@@ -22,13 +21,13 @@ public class TestVerification extends BusinessTest {
     private final Timestamp tomorrow = new Timestamp(System.currentTimeMillis() + DayDate.MILLI_DAY);
 
     /**
-     * at least 39 months ago, so is outside the window of
+     * at least 27 months ago, so is outside the window of
      * {@link User#VERIFICATION_MONTHS}
      */
-    private final Timestamp min39month = new Timestamp(System.currentTimeMillis() - DayDate.MILLI_DAY * 39 * 31);
+    private final Timestamp min27month = new Timestamp(System.currentTimeMillis() - DayDate.MILLI_DAY * 27 * 31);
 
     /**
-     * at least 24 months ago (but less than 39), so is inside the window of
+     * at least 24 months ago (but less than 27), so is inside the window of
      * {@link User#VERIFICATION_MONTHS}
      */
     private final Timestamp min24month = new Timestamp(System.currentTimeMillis() - DayDate.MILLI_DAY * 24 * 31);
@@ -134,7 +133,7 @@ public class TestVerification extends BusinessTest {
 
     @Test
     public void testApprox39MonthAgo() throws IOException {
-        enterVerificationWhen(agentID, applicantNameID, min39month);
+        enterVerificationWhen(agentID, applicantNameID, min27month);
         assertFalse(applicant.isInVerificationLimit());
     }
 
@@ -167,7 +166,7 @@ public class TestVerification extends BusinessTest {
         User agent = User.getById(agentID);
         User applicantMult = User.getById(applicantMultID);
 
-        enterVerificationWhen(agentID, applicantMult.getPreferredName().getId(), min39month);
+        enterVerificationWhen(agentID, applicantMult.getPreferredName().getId(), min27month);
 
         // test that new entry would be possible
         assertTrue(Notary.checkVerificationIsPossible(agent, applicantMult.getPreferredName()));
@@ -186,7 +185,7 @@ public class TestVerification extends BusinessTest {
         User agent = User.getById(agentID);
         User applicantMult = User.getById(applicantMultID);
 
-        enterVerificationWhen(agentID, applicantMult.getPreferredName().getId(), min39month);
+        enterVerificationWhen(agentID, applicantMult.getPreferredName().getId(), min27month);
         int xPoints = agent.getExperiencePoints();
 
         // test that VP after first entry