fix: user.inVerificationLimit should be non-static

Change-Id: Idc23b300ac23a4c90e57efd8dbf99b34831da346

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index c0b0128bdd37e28040605d141a80dd3fcad24b49..d3d5da02e3a1dc7c65a01b0c9531f9e98b0fb223 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -542,9 +542,9 @@ public class User extends CertificateOwner {
         return new Assurance(res.getInt("id"), User.getById(res.getInt("from")), User.getById(res.getInt("to")), res.getString("location"), res.getString("method"), res.getInt("points"), res.getString("date"));
     }
 
-    public static boolean isInVerificationLimit(int id) {
+    public boolean isInVerificationLimit() {
         try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `notary` WHERE `to` = ? AND `when` > (now() - (interval '1 month' * ?)) AND (`expire` IS NULL OR `expire` > now()) AND `deleted` IS NULL;")) {
-            ps.setInt(1, id);
+            ps.setInt(1, getId());
             ps.setInt(2, VERIFICATION_MONTHS);
 
             GigiResultSet rs = ps.executeQuery();

diff --git a/tests/org/cacert/gigi/dbObjects/TestAssurance.java b/tests/org/cacert/gigi/dbObjects/TestAssurance.java
index 44809c02d6e1a7a8eda88aadd1f6a78193c5d66a..dda8d81de9c3579298d4e49bac4bce256896155f 100644 (file)
--- a/tests/org/cacert/gigi/dbObjects/TestAssurance.java
+++ b/tests/org/cacert/gigi/dbObjects/TestAssurance.java
@@ -37,6 +37,8 @@ public class TestAssurance extends BusinessTest {
 
     private int applicantID;
 
+    private User applicant;
+
     private int applicantMultID;
 
     public TestAssurance() throws GigiApiException {
@@ -109,49 +111,50 @@ public class TestAssurance extends BusinessTest {
         agentID = createAssuranceUser("a", "b", createUniqueName() + "@example.com", TEST_PASSWORD);
         agent2ID = createAssuranceUser("a", "d", createUniqueName() + "@example.com", TEST_PASSWORD);
         applicantID = createVerifiedUser("a", "c", createUniqueName() + "@example.com", TEST_PASSWORD);
+        applicant = User.getById(applicantID);
         applicantMultID = createVerifiedUser("a", "e", createUniqueName() + "@example.com", TEST_PASSWORD);
     }
 
     @Test
     public void testVerificationYesterday() throws IOException {
         enterAssuranceWhen(agentID, applicantID, yesterday);
-        assertTrue(User.isInVerificationLimit(applicantID));
+        assertTrue(applicant.isInVerificationLimit());
     }
 
     @Test
     public void testApprox24MonthAgo() throws IOException {
         enterAssuranceWhen(agentID, applicantID, min24month);
-        assertTrue(User.isInVerificationLimit(applicantID));
+        assertTrue(applicant.isInVerificationLimit());
     }
 
     @Test
     public void testApprox39MonthAgo() throws IOException {
         enterAssuranceWhen(agentID, applicantID, min39month);
-        assertFalse(User.isInVerificationLimit(applicantID));
+        assertFalse(applicant.isInVerificationLimit());
     }
 
     @Test
     public void testTomorrowExpired() throws IOException {
         enterAssuranceExpired(agentID, applicantID, tomorrow);
-        assertTrue(User.isInVerificationLimit(applicantID));
+        assertTrue(applicant.isInVerificationLimit());
     }
 
     @Test
     public void testYesterdayExpired() throws IOException {
         enterAssuranceExpired(agentID, applicantID, yesterday);
-        assertFalse(User.isInVerificationLimit(applicantID));
+        assertFalse(applicant.isInVerificationLimit());
     }
 
     @Test
     public void testNormal() throws IOException {
         enterAssurance(agentID, applicantID);
-        assertTrue(User.isInVerificationLimit(applicantID));
+        assertTrue(applicant.isInVerificationLimit());
     }
 
     @Test
     public void testDeletedYesterday() throws IOException {
         enterAssuranceDeleted(agentID, applicantID, yesterday);
-        assertFalse(User.isInVerificationLimit(applicantID));
+        assertFalse(applicant.isInVerificationLimit());
     }
 
     @Test