From 4b91927aa8d90226414872ce5b3006d0e0f5d273 Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sat, 28 Feb 2015 22:31:03 +0100 Subject: [PATCH] Empty: rename fname,mname,lname,dob --- .../cacert/gigi/dbObjects/SupportedUser.java | 2 +- src/org/cacert/gigi/dbObjects/User.java | 26 ++++++++-------- .../gigi/pages/account/MyDetailsForm.java | 18 +++++------ .../cacert/gigi/pages/admin/TTPAdminForm.java | 2 +- .../admin/support/SupportUserDetailsForm.java | 8 ++--- src/org/cacert/gigi/pages/main/Signup.java | 24 +++++++-------- .../cacert/gigi/pages/wot/AssuranceForm.java | 6 ++-- src/org/cacert/gigi/util/Notary.java | 2 +- .../gigi/util/PasswordStrengthChecker.java | 6 ++-- tests/org/cacert/gigi/TestObjectCache.java | 8 ++--- tests/org/cacert/gigi/TestUser.java | 30 +++++++++---------- .../gigi/pages/account/TestMyDetailsEdit.java | 16 +++++----- tests/org/cacert/gigi/util/TestNotary.java | 10 +++---- .../util/TestPasswordStrengthChecker.java | 6 ++-- .../org/cacert/gigi/pages/Manager.java | 10 +++---- 15 files changed, 88 insertions(+), 86 deletions(-) diff --git a/src/org/cacert/gigi/dbObjects/SupportedUser.java b/src/org/cacert/gigi/dbObjects/SupportedUser.java index fe5243dc..bdad013a 100644 --- a/src/org/cacert/gigi/dbObjects/SupportedUser.java +++ b/src/org/cacert/gigi/dbObjects/SupportedUser.java @@ -24,7 +24,7 @@ public class SupportedUser { public void setDob(Date dob) { writeSELog("SE dob change"); - target.setDob(dob); + target.setDoB(dob); } public void revokeAllCertificates() { diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java index 37d18aaf..9b2cf515 100644 --- a/src/org/cacert/gigi/dbObjects/User.java +++ b/src/org/cacert/gigi/dbObjects/User.java @@ -59,15 +59,15 @@ public class User extends CertificateOwner { public User() {} - public String getFname() { + public String getFName() { return name.fname; } - public String getLname() { + public String getLName() { return name.lname; } - public String getMname() { + public String getMName() { return name.mname; } @@ -75,7 +75,7 @@ public class User extends CertificateOwner { return name; } - public void setMname(String mname) { + public void setMName(String mname) { this.name.mname = mname; } @@ -87,11 +87,11 @@ public class User extends CertificateOwner { this.name.suffix = suffix; } - public Date getDob() { + public Date getDoB() { return dob; } - public void setDob(Date dob) { + public void setDoB(Date dob) { this.dob = dob; } @@ -103,11 +103,11 @@ public class User extends CertificateOwner { this.email = email; } - public void setFname(String fname) { + public void setFName(String fname) { this.name.fname = fname; } - public void setLname(String lname) { + public void setLName(String lname) { this.name.lname = lname; } @@ -323,15 +323,17 @@ public class User extends CertificateOwner { public void updateUserData() throws GigiApiException { synchronized (Notary.class) { + // FIXME: No assurance, not no points. if (getAssurancePoints() != 0) { throw new GigiApiException("No change after assurance allowed."); } + GigiPreparedStatement update = DatabaseConnection.getInstance().prepare("UPDATE users SET fname=?, lname=?, mname=?, suffix=?, dob=? WHERE id=?"); - update.setString(1, getFname()); - update.setString(2, getLname()); - update.setString(3, getMname()); + update.setString(1, getFName()); + update.setString(2, getLName()); + update.setString(3, getMName()); update.setString(4, getSuffix()); - update.setDate(5, getDob()); + update.setDate(5, getDoB()); update.setInt(6, getId()); update.executeUpdate(); } diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java index efff2f0e..803bdea1 100644 --- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java +++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java @@ -30,7 +30,7 @@ public class MyDetailsForm extends Form { public MyDetailsForm(HttpServletRequest hsr, User target) { super(hsr); this.target = target; - this.ds = new DateSelector("day", "month", "year", target.getDob()); + this.ds = new DateSelector("day", "month", "year", target.getDoB()); } @Override @@ -44,12 +44,12 @@ public class MyDetailsForm extends Form { if (newLname.isEmpty()) { throw new GigiApiException("Last name cannot be empty."); } - target.setFname(newFname); - target.setLname(newLname); - target.setMname(newMname); + target.setFName(newFname); + target.setLName(newLname); + target.setMName(newMname); target.setSuffix(newSuffix); ds.update(req); - target.setDob(ds.getDate()); + target.setDoB(ds.getDate()); target.updateUserData(); } else { throw new GigiApiException("No change after assurance allowed."); @@ -66,16 +66,16 @@ public class MyDetailsForm extends Form { @Override protected void outputContent(PrintWriter out, Language l, Map vars) { - vars.put("fname", HTMLEncoder.encodeHTML(target.getFname())); - vars.put("mname", target.getMname() == null ? "" : HTMLEncoder.encodeHTML(target.getMname())); - vars.put("lname", HTMLEncoder.encodeHTML(target.getLname())); + vars.put("fname", HTMLEncoder.encodeHTML(target.getFName())); + vars.put("mname", target.getMName() == null ? "" : HTMLEncoder.encodeHTML(target.getMName())); + vars.put("lname", HTMLEncoder.encodeHTML(target.getLName())); vars.put("suffix", target.getSuffix() == null ? "" : HTMLEncoder.encodeHTML(target.getSuffix())); vars.put("details", ""); if (target.getAssurancePoints() == 0) { vars.put("DoB", ds); templ.output(out, l, vars); } else { - vars.put("DoB", DateSelector.getDateFormat().format(target.getDob())); + vars.put("DoB", DateSelector.getDateFormat().format(target.getDoB())); assured.output(out, l, vars); } } diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java index 69f07827..58bf2eea 100644 --- a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java +++ b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java @@ -39,7 +39,7 @@ public class TTPAdminForm extends Form { protected void outputContent(PrintWriter out, Language l, Map vars) { vars.put("name", u.getName()); vars.put("email", u.getEmail()); - vars.put("DoB", DateSelector.getDateFormat().format(u.getDob())); + vars.put("DoB", DateSelector.getDateFormat().format(u.getDoB())); vars.put("uid", Integer.toString(u.getId())); t.output(out, l, vars); } diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java index 8e6fac08..eff2b0f2 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java +++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java @@ -36,12 +36,12 @@ public class SupportUserDetailsForm extends Form { @Override protected void outputContent(PrintWriter out, Language l, Map vars) { vars.put("mail", user.getEmail()); - vars.put("fname", user.getFname()); - vars.put("mname", user.getMname()); - vars.put("lname", user.getLname()); + vars.put("fname", user.getFName()); + vars.put("mname", user.getMName()); + vars.put("lname", user.getLName()); vars.put("suffix", user.getSuffix()); vars.put("assurer", user.canAssure()); - vars.put("dob", new DateSelector("dobd", "dobm", "doby", user.getDob())); + vars.put("dob", new DateSelector("dobd", "dobm", "doby", user.getDoB())); vars.put("blockedassurer", user.isInGroup(Group.BLOCKEDASSURER)); vars.put("codesign", user.isInGroup(Group.CODESIGNING)); vars.put("orgassurer", user.isInGroup(Group.ORGASSURER)); diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java index 438c8fa9..844a227b 100644 --- a/src/org/cacert/gigi/pages/main/Signup.java +++ b/src/org/cacert/gigi/pages/main/Signup.java @@ -36,12 +36,12 @@ public class Signup extends Form { public Signup(HttpServletRequest hsr) { super(hsr); t = new Template(Signup.class.getResource("Signup.templ")); - buildup.setFname(""); - buildup.setMname(""); - buildup.setLname(""); + buildup.setFName(""); + buildup.setMName(""); + buildup.setLName(""); buildup.setSuffix(""); buildup.setEmail(""); - buildup.setDob(new Date(0)); + buildup.setDoB(new Date(0)); } DateSelector myDoB = new DateSelector("day", "month", "year"); @@ -49,9 +49,9 @@ public class Signup extends Form { @Override public void outputContent(PrintWriter out, Language l, Map outerVars) { HashMap vars = new HashMap(); - vars.put("fname", HTMLEncoder.encodeHTML(buildup.getFname())); - vars.put("mname", HTMLEncoder.encodeHTML(buildup.getMname())); - vars.put("lname", HTMLEncoder.encodeHTML(buildup.getLname())); + vars.put("fname", HTMLEncoder.encodeHTML(buildup.getFName())); + vars.put("mname", HTMLEncoder.encodeHTML(buildup.getMName())); + vars.put("lname", HTMLEncoder.encodeHTML(buildup.getLName())); vars.put("suffix", HTMLEncoder.encodeHTML(buildup.getSuffix())); vars.put("dob", myDoB); vars.put("email", HTMLEncoder.encodeHTML(buildup.getEmail())); @@ -66,13 +66,13 @@ public class Signup extends Form { private void update(HttpServletRequest r) { if (r.getParameter("fname") != null) { - buildup.setFname(r.getParameter("fname")); + buildup.setFName(r.getParameter("fname")); } if (r.getParameter("lname") != null) { - buildup.setLname(r.getParameter("lname")); + buildup.setLName(r.getParameter("lname")); } if (r.getParameter("mname") != null) { - buildup.setMname(r.getParameter("mname")); + buildup.setMName(r.getParameter("mname")); } if (r.getParameter("suffix") != null) { buildup.setSuffix(r.getParameter("suffix")); @@ -93,7 +93,7 @@ public class Signup extends Form { @Override public synchronized boolean submit(PrintWriter out, HttpServletRequest req) { update(req); - if (buildup.getLname().trim().equals("")) { + if (buildup.getLName().trim().equals("")) { outputError(out, req, "Last name were blank."); } if ( !myDoB.isValid()) { @@ -175,7 +175,7 @@ public class Signup extends Form { try { DatabaseConnection.getInstance().beginTransaction(); buildup.setPreferredLocale(Page.getLanguage(req).getLocale()); - buildup.setDob(myDoB.getDate()); + buildup.setDoB(myDoB.getDate()); buildup.insert(password); int memid = buildup.getId(); EmailAddress ea = new EmailAddress(buildup, buildup.getEmail()); diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java index a5fd52d2..36e5247c 100644 --- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java +++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java @@ -34,7 +34,7 @@ public class AssuranceForm extends Form { super(hsr); this.assuree = assuree; assureeName = this.assuree.getName(); - dob = this.assuree.getDob(); + dob = this.assuree.getDoB(); } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -48,8 +48,8 @@ public class AssuranceForm extends Form { res.put("nameExplicit", assuree.getName()); res.put("name", assuree.getName().toString()); res.put("maxpoints", assuree.getMaxAssurePoints()); - res.put("dob", sdf.format(assuree.getDob())); - res.put("dobFmt2", sdf2.format(assuree.getDob())); + res.put("dob", sdf.format(assuree.getDoB())); + res.put("dobFmt2", sdf2.format(assuree.getDoB())); templ.output(out, l, res); } diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java index 3dfc4faa..767230b0 100644 --- a/src/org/cacert/gigi/util/Notary.java +++ b/src/org/cacert/gigi/util/Notary.java @@ -105,7 +105,7 @@ public class Notary { gae.mergeInto(e); } - if ( !assuree.getName().equals(assureeName) || !assuree.getDob().equals(dob)) { + if ( !assuree.getName().equals(assureeName) || !assuree.getDoB().equals(dob)) { gae.mergeInto(new GigiApiException("The person you are assuring changed his personal details.")); } if (awarded > assurer.getMaxAssurePoints() || awarded < 0) { diff --git a/src/org/cacert/gigi/util/PasswordStrengthChecker.java b/src/org/cacert/gigi/util/PasswordStrengthChecker.java index cc0acfa5..6ae79181 100644 --- a/src/org/cacert/gigi/util/PasswordStrengthChecker.java +++ b/src/org/cacert/gigi/util/PasswordStrengthChecker.java @@ -59,13 +59,13 @@ public class PasswordStrengthChecker { if (contained(pw, u.getEmail())) { light -= 2; } - if (contained(pw, u.getFname())) { + if (contained(pw, u.getFName())) { light -= 2; } - if (contained(pw, u.getLname())) { + if (contained(pw, u.getLName())) { light -= 2; } - if (contained(pw, u.getMname())) { + if (contained(pw, u.getMName())) { light -= 2; } if (contained(pw, u.getSuffix())) { diff --git a/tests/org/cacert/gigi/TestObjectCache.java b/tests/org/cacert/gigi/TestObjectCache.java index dd9c04a5..f143c471 100644 --- a/tests/org/cacert/gigi/TestObjectCache.java +++ b/tests/org/cacert/gigi/TestObjectCache.java @@ -24,14 +24,14 @@ public class TestObjectCache extends ManagedTest { assertThat(User.getById(uid), is(sameInstance(User.getById(uid)))); User u = new User(); - u.setFname("fname"); - u.setMname("mname"); + u.setFName("fname"); + u.setMName("mname"); u.setSuffix("suffix"); - u.setLname("lname"); + u.setLName("lname"); u.setEmail(createUniqueName() + "@example.org"); Calendar c = Calendar.getInstance(); c.set(1950, 1, 1); - u.setDob(new Date(c.getTime().getTime())); + u.setDoB(new Date(c.getTime().getTime())); u.setPreferredLocale(Locale.ENGLISH); u.insert(TEST_PASSWORD); diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java index f4e0e60a..93deebaa 100644 --- a/tests/org/cacert/gigi/TestUser.java +++ b/tests/org/cacert/gigi/TestUser.java @@ -19,20 +19,20 @@ public class TestUser extends ManagedTest { @Test public void testStoreAndLoad() throws SQLException { User u = new User(); - u.setFname("user"); - u.setLname("last"); - u.setMname(""); + u.setFName("user"); + u.setLName("last"); + u.setMName(""); u.setSuffix(""); u.setPreferredLocale(Locale.ENGLISH); long dob = System.currentTimeMillis(); dob -= dob % (1000 * 60 * 60 * 24); - u.setDob(new java.sql.Date(dob)); + u.setDoB(new java.sql.Date(dob)); u.setEmail(createUniqueName() + "a@email.org"); u.insert("password"); int id = u.getId(); User u2 = User.getById(id); assertEquals(u.getName(), u2.getName()); - assertEquals(u.getDob().toString(), u2.getDob().toString()); + assertEquals(u.getDoB().toString(), u2.getDoB().toString()); assertEquals(u.getEmail(), u2.getEmail()); } @@ -41,9 +41,9 @@ public class TestUser extends ManagedTest { int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD); User u = User.getById(id); - assertEquals("aä", u.getFname()); - assertEquals("b", u.getLname()); - assertEquals("", u.getMname()); + assertEquals("aä", u.getFName()); + assertEquals("b", u.getLName()); + assertEquals("", u.getMName()); } @Test @@ -59,9 +59,9 @@ public class TestUser extends ManagedTest { assertTrue(u.hasPassedCATS()); assertEquals(10, u.getMaxAssurePoints()); - assertEquals("aä", u.getFname()); - assertEquals("b", u.getLname()); - assertEquals("", u.getMname()); + assertEquals("aä", u.getFName()); + assertEquals("b", u.getLName()); + assertEquals("", u.getMName()); } @Test @@ -99,12 +99,12 @@ public class TestUser extends ManagedTest { @Test public void testDoubleInsert() { User u = new User(); - u.setFname("f"); - u.setLname("l"); - u.setMname("m"); + u.setFName("f"); + u.setLName("l"); + u.setMName("m"); u.setSuffix("s"); u.setEmail(createUniqueName() + "@example.org"); - u.setDob(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 365)); + u.setDoB(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 365)); u.setPreferredLocale(Locale.ENGLISH); u.insert(TEST_PASSWORD); try { diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java index ab59025b..57bb4206 100644 --- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java +++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java @@ -26,7 +26,7 @@ public class TestMyDetailsEdit extends ManagedTest { String newName = createUniqueName(); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "fname=" + newName + "&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0)); User u = User.getById(id); - assertEquals(newName, u.getFname()); + assertEquals(newName, u.getFName()); } @Test @@ -34,7 +34,7 @@ public class TestMyDetailsEdit extends ManagedTest { String newName = createUniqueName(); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=" + newName + "&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0)); User u = User.getById(id); - assertEquals(newName, u.getLname()); + assertEquals(newName, u.getLName()); } @Test @@ -42,7 +42,7 @@ public class TestMyDetailsEdit extends ManagedTest { String newName = createUniqueName(); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=" + newName + "&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0)); User u = User.getById(id); - assertEquals(newName, u.getMname()); + assertEquals(newName, u.getMName()); } @Test @@ -69,7 +69,7 @@ public class TestMyDetailsEdit extends ManagedTest { public void testUnsetFname() throws IOException { assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "fname=&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0)); User u = User.getById(id); - assertEquals("", u.getFname()); + assertEquals("", u.getFName()); } @@ -77,7 +77,7 @@ public class TestMyDetailsEdit extends ManagedTest { public void testUnsetLname() throws IOException { assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0)); User u = User.getById(id); - assertEquals("Hansel", u.getLname()); + assertEquals("Hansel", u.getLName()); } @Test @@ -85,11 +85,11 @@ public class TestMyDetailsEdit extends ManagedTest { String newName = createUniqueName(); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=" + newName + "&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0)); User u = User.getById(id); - assertEquals(newName, u.getMname()); + assertEquals(newName, u.getMName()); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0)); clearCaches(); u = User.getById(id); - assertEquals("", u.getMname()); + assertEquals("", u.getMName()); } @@ -102,7 +102,7 @@ public class TestMyDetailsEdit extends ManagedTest { cal.set(Calendar.DAY_OF_MONTH, Calendar.FEBRUARY); cal.set(Calendar.MONTH, 1); Date d = new Date(cal.getTimeInMillis()); - assertEquals(d.toString(), u.getDob().toString()); + assertEquals(d.toString(), u.getDoB().toString()); } @Test diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java index 1c2119f9..4bfb26d6 100644 --- a/tests/org/cacert/gigi/util/TestNotary.java +++ b/tests/org/cacert/gigi/util/TestNotary.java @@ -28,7 +28,7 @@ public class TestNotary extends ManagedTest { }; try { - Notary.assure(assurer, users[0], users[0].getName(), users[0].getDob(), -1, "test-notary", "2014-01-01"); + Notary.assure(assurer, users[0], users[0].getName(), users[0].getDoB(), -1, "test-notary", "2014-01-01"); fail("This shouldn't have passed"); } catch (GigiApiException e) { // expected @@ -37,7 +37,7 @@ public class TestNotary extends ManagedTest { assertEquals(result[i], assurer.getMaxAssurePoints()); assuranceFail(assurer, users[i], result[i] + 1, "test-notary", "2014-01-01"); - Notary.assure(assurer, users[i], users[i].getName(), users[i].getDob(), result[i], "test-notary", "2014-01-01"); + Notary.assure(assurer, users[i], users[i].getName(), users[i].getDoB(), result[i], "test-notary", "2014-01-01"); assuranceFail(assurer, users[i], result[i], "test-notary", "2014-01-01"); } @@ -49,7 +49,7 @@ public class TestNotary extends ManagedTest { private void assuranceFail(User assurer, User user, int i, String location, String date) throws SQLException { try { - Notary.assure(assurer, user, user.getName(), user.getDob(), i, location, date); + Notary.assure(assurer, user, user.getName(), user.getDoB(), i, location, date); fail("This shouldn't have passed"); } catch (GigiApiException e) { // expected @@ -71,7 +71,7 @@ public class TestNotary extends ManagedTest { for (int i = 0; i < users.length; i++) { assuranceFail(assurer, users[i], -1, "test-notary", "2014-01-01"); assuranceFail(assurer, users[i], 11, "test-notary", "2014-01-01"); - Notary.assure(assurer, users[i], users[i].getName(), users[i].getDob(), 10, "test-notary", "2014-01-01"); + Notary.assure(assurer, users[i], users[i].getName(), users[i].getDoB(), 10, "test-notary", "2014-01-01"); assuranceFail(assurer, users[i], 10, "test-notary", "2014-01-01"); } } @@ -106,7 +106,7 @@ public class TestNotary extends ManagedTest { assuranceFail(assuree, assuranceUser, 10, "notary-junit-test", "2014-01-01"); // valid - Notary.assure(assuranceUser, assuree, assuree.getName(), assuree.getDob(), 10, "notary-junit-test", "2014-01-01"); + Notary.assure(assuranceUser, assuree, assuree.getName(), assuree.getDoB(), 10, "notary-junit-test", "2014-01-01"); // assure double assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", "2014-01-01"); diff --git a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java b/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java index 500cdfd2..eabb042b 100644 --- a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java +++ b/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java @@ -11,9 +11,9 @@ public class TestPasswordStrengthChecker { public TestPasswordStrengthChecker() { u = new User(); - u.setFname("fname"); - u.setLname("lname"); - u.setMname("mname"); + u.setFName("fname"); + u.setLName("lname"); + u.setMName("mname"); u.setEmail("email"); u.setSuffix("suffix"); } diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java index 5b16ce79..9f4567e7 100644 --- a/util-testing/org/cacert/gigi/pages/Manager.java +++ b/util-testing/org/cacert/gigi/pages/Manager.java @@ -155,14 +155,14 @@ public class Manager extends Page { private void createUser(String email) throws GigiApiException, IllegalAccessException { User u = new User(); - u.setFname("Först"); - u.setMname("Müddle"); - u.setLname("Läst"); + u.setFName("Först"); + u.setMName("Müddle"); + u.setLName("Läst"); u.setSuffix("Süffix"); u.setEmail(email); Calendar gc = GregorianCalendar.getInstance(); gc.set(1990, 0, 1); - u.setDob(new Date(gc.getTime().getTime())); + u.setDoB(new Date(gc.getTime().getTime())); u.setPreferredLocale(Locale.ENGLISH); u.insert("xvXV12°§"); EmailAddress ea = new EmailAddress(u, email); @@ -213,7 +213,7 @@ public class Manager extends Page { } try { for (int i = 0; i < getAssurers().length; i++) { - Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDob(), 10, "Testmanager Assure up code", "2014-11-06"); + Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDoB(), 10, "Testmanager Assure up code", "2014-11-06"); } } catch (GigiApiException e) { throw new Error(e); -- 2.39.2