X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Futil%2FTestPasswordStrengthChecker.java;h=eabb042bfecb1448ed8f3b1854fff9d27fea997c;hp=91a918c465c19d5f25734562f098430f579803ca;hb=4b91927aa8d90226414872ce5b3006d0e0f5d273;hpb=28f6b558d8116f8cbb17390a83235976b50903b0

diff --git a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java b/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java
index 91a918c4..eabb042b 100644
--- a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java
+++ b/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java
@@ -1,64 +1,75 @@
 package org.cacert.gigi.util;
 
-import org.cacert.gigi.User;
-import org.junit.Test;
 import static org.junit.Assert.*;
 
+import org.cacert.gigi.dbObjects.User;
+import org.junit.Test;
+
 public class TestPasswordStrengthChecker {
-	User u;
-	public TestPasswordStrengthChecker() {
-		u = new User();
-		u.setFname("fname");
-		u.setLname("lname");
-		u.setMname("mname");
-		u.setEmail("email");
-		u.setSuffix("suffix");
-	}
-	@Test
-	public void testPasswordLength() {
-		assertEquals(1, PasswordStrengthChecker.checkpw("01234", u));
-		assertEquals(2, PasswordStrengthChecker.checkpw("0123456789012345", u));
-		assertEquals(3,
-				PasswordStrengthChecker.checkpw("012345678901234567890", u));
-		assertEquals(4, PasswordStrengthChecker.checkpw(
-				"01234567890123456789012345", u));
-		assertEquals(5, PasswordStrengthChecker.checkpw(
-				"0123456789012345678901234567890", u));
-	}
-	@Test
-	public void testPasswordCharTypes() {
-		assertEquals(1, PasswordStrengthChecker.checkpw("0", u));
-		assertEquals(2, PasswordStrengthChecker.checkpw("0a", u));
-		assertEquals(2, PasswordStrengthChecker.checkpw("0az", u));
-		assertEquals(3, PasswordStrengthChecker.checkpw("0azZ", u));
-		assertEquals(4, PasswordStrengthChecker.checkpw("0a zZ", u));
-		assertEquals(5, PasswordStrengthChecker.checkpw("0a. zZ", u));
 
-		assertEquals(1, PasswordStrengthChecker.checkpw(".", u));
-		assertEquals(1, PasswordStrengthChecker.checkpw(" ", u));
-		assertEquals(1, PasswordStrengthChecker.checkpw("b", u));
-		assertEquals(1, PasswordStrengthChecker.checkpw("Z", u));
+    User u;
+
+    public TestPasswordStrengthChecker() {
+        u = new User();
+        u.setFName("fname");
+        u.setLName("lname");
+        u.setMName("mname");
+        u.setEmail("email");
+        u.setSuffix("suffix");
+    }
+
+    @Test
+    public void testPasswordLength() {
+        assertEquals(1, PasswordStrengthChecker.checkpw("01234", u));
+        assertEquals(2, PasswordStrengthChecker.checkpw("0123456789012345", u));
+        assertEquals(3, PasswordStrengthChecker.checkpw("012345678901234567890", u));
+        assertEquals(4, PasswordStrengthChecker.checkpw("01234567890123456789012345", u));
+        assertEquals(5, PasswordStrengthChecker.checkpw("0123456789012345678901234567890", u));
+    }
+
+    @Test
+    public void testPasswordNonASCII() {
+        assertEquals(2, PasswordStrengthChecker.checkpw("0ä", u));
+        assertEquals(3, PasswordStrengthChecker.checkpw("0aä", u));
+        assertEquals(3, PasswordStrengthChecker.checkpw("0azä", u));
+        assertEquals(3, PasswordStrengthChecker.checkpw("0az.ä", u));
+    }
+
+    @Test
+    public void testPasswordCharTypes() {
+        assertEquals(1, PasswordStrengthChecker.checkpw("0", u));
+        assertEquals(2, PasswordStrengthChecker.checkpw("0a", u));
+        assertEquals(2, PasswordStrengthChecker.checkpw("0az", u));
+        assertEquals(3, PasswordStrengthChecker.checkpw("0azZ", u));
+        assertEquals(4, PasswordStrengthChecker.checkpw("0a zZ", u));
+        assertEquals(5, PasswordStrengthChecker.checkpw("0a. zZ", u));
+
+        assertEquals(1, PasswordStrengthChecker.checkpw(".", u));
+        assertEquals(1, PasswordStrengthChecker.checkpw(" ", u));
+        assertEquals(1, PasswordStrengthChecker.checkpw("b", u));
+        assertEquals(1, PasswordStrengthChecker.checkpw("Z", u));
+
+        assertEquals(2, PasswordStrengthChecker.checkpw("0.", u));
+        assertEquals(2, PasswordStrengthChecker.checkpw("0 ", u));
+        assertEquals(2, PasswordStrengthChecker.checkpw("0a", u));
+        assertEquals(2, PasswordStrengthChecker.checkpw("0Z", u));
 
-		assertEquals(2, PasswordStrengthChecker.checkpw("0.", u));
-		assertEquals(2, PasswordStrengthChecker.checkpw("0 ", u));
-		assertEquals(2, PasswordStrengthChecker.checkpw("0a", u));
-		assertEquals(2, PasswordStrengthChecker.checkpw("0Z", u));
+        assertEquals(2, PasswordStrengthChecker.checkpw(" .", u));
+        assertEquals(2, PasswordStrengthChecker.checkpw(" a", u));
+        assertEquals(2, PasswordStrengthChecker.checkpw(" Z", u));
 
-		assertEquals(2, PasswordStrengthChecker.checkpw(" .", u));
-		assertEquals(2, PasswordStrengthChecker.checkpw(" a", u));
-		assertEquals(2, PasswordStrengthChecker.checkpw(" Z", u));
+    }
 
-	}
-	@Test
-	public void testPasswordContains() {
-		assertEquals(-1, PasswordStrengthChecker.checkpw("fnamea", u));
-		assertEquals(-5, PasswordStrengthChecker.checkpw("na", u));
-		assertEquals(0, PasswordStrengthChecker.checkpw("1lname", u));
-		assertEquals(0, PasswordStrengthChecker.checkpw("1email", u));
-		assertEquals(-1, PasswordStrengthChecker.checkpw("mai", u));
-		assertEquals(-1, PasswordStrengthChecker.checkpw("suff", u));
-		assertEquals(0, PasswordStrengthChecker.checkpw("1suffix", u));
+    @Test
+    public void testPasswordContains() {
+        assertEquals( -1, PasswordStrengthChecker.checkpw("fnamea", u));
+        assertEquals( -5, PasswordStrengthChecker.checkpw("na", u));
+        assertEquals(0, PasswordStrengthChecker.checkpw("1lname", u));
+        assertEquals(0, PasswordStrengthChecker.checkpw("1email", u));
+        assertEquals( -1, PasswordStrengthChecker.checkpw("mai", u));
+        assertEquals( -1, PasswordStrengthChecker.checkpw("suff", u));
+        assertEquals(0, PasswordStrengthChecker.checkpw("1suffix", u));
 
-	}
+    }
 
 }