UPD: eliminating user.equals (it should be multitons already)

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 6363757eaafa55ec51faf049d81f4c85700ae282..37d18aaf20634fd2662c78ebdfae23dbec625d67 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -195,20 +195,6 @@ public class User extends CertificateOwner {
         return points;
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if ( !(obj instanceof User)) {
-            return false;
-        }
-        User s = (User) obj;
-        return name.equals(s.name) && email.equals(s.email) && dob.toString().equals(s.dob.toString()); // This
-                                                                                                        // is
-                                                                                                        // due
-                                                                                                        // to
-                                                                                                        // day
-                                                                                                        // cutoff
-    }
-
     /**
      * Gets the maximum allowed points NOW. Note that an assurance needs to
      * re-check PoJam as it has taken place in the past.

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index 9fcb1868a1276a5d7382328fc5cbc930c950397f..f4e0e60a07fc29f69537d23336cbf0113ab6d2b5 100644 (file)
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -31,7 +31,9 @@ public class TestUser extends ManagedTest {
         u.insert("password");
         int id = u.getId();
         User u2 = User.getById(id);
-        assertEquals(u, u2);
+        assertEquals(u.getName(), u2.getName());
+        assertEquals(u.getDob().toString(), u2.getDob().toString());
+        assertEquals(u.getEmail(), u2.getEmail());
     }
 
     @Test