add: 2 simple tests + simple "certificate"-code cleanup

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index 7318ad802ece837cae337919fc638d360fd9bbdc..7dabe8cc56087cb52ea5e483720190b06db509a1 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -238,9 +238,6 @@ public class Certificate implements IdCachable {
     }
 
     public synchronized CertificateStatus getStatus() {
-        if (id == 0) {
-            return CertificateStatus.DRAFT;
-        }
         GigiPreparedStatement searcher = DatabaseConnection.getInstance().prepare("SELECT crt_name, created, revoked, serial, caid FROM certs WHERE id=?");
         searcher.setInt(1, id);
         GigiResultSet rs = searcher.executeQuery();

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index edee51f04581e90669452eb4efbd86d94ef931f8..9fd1fe7a331d3e63d0a5c50571be67af7a5c8191 100644 (file)
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -114,4 +114,19 @@ public class TestUser extends ManagedTest {
         assertSame(u, emailUser);
     }
 
+    @Test
+    public void testNoCats() {
+        String email = createUniqueName() + "a@email.org";
+        int id = createVerifiedUser("aä", "b", email, TEST_PASSWORD);
+        User emailUser = User.getByEmail(email);
+        assertFalse(emailUser.hasPassedCATS());
+    }
+
+    @Test
+    public void testGetByMailFail() {
+        String email = createUniqueName() + "d@email.org";
+        User emailUser = User.getByEmail(email);
+        assertNull(emailUser);
+    }
+
 }