From f09fbb946ab28d1b445c99224b3f24d0d24c1ca8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Fri, 20 Feb 2015 03:11:24 +0100
Subject: [PATCH] UPD: eliminating user.equals (it should be multitons already)

---
 src/org/cacert/gigi/dbObjects/User.java | 14 --------------
 tests/org/cacert/gigi/TestUser.java     |  4 +++-
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 6363757e..37d18aaf 100644
--- 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 9fcb1868..f4e0e60a 100644
--- 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
-- 
2.39.2