From 44a6afb91b986d4bb90460307ea9578041713342 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 4 Sep 2014 20:20:29 +0200 Subject: [PATCH] UPD: Clean Up "TestMyDetailsEdit" (by moving common code up) --- .../gigi/pages/account/TestMyDetailsEdit.java | 38 ++++--------------- 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java index 19d5c745..af6cecb3 100644 --- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java +++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java @@ -13,11 +13,16 @@ import org.junit.Test; public class TestMyDetailsEdit extends ManagedTest { + String email = createUniqueName() + "@e.de"; + + int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); + + String cookie = login(email, TEST_PASSWORD); + + public TestMyDetailsEdit() throws IOException {} + @Test public void testChangeFnameValid() throws IOException { - String email = createUniqueName() + "@e.de"; - int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); 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); @@ -26,9 +31,6 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testChangeLnameValid() throws IOException { - String email = createUniqueName() + "@e.de"; - int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); 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); @@ -37,9 +39,6 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testChangeMnameValid() throws IOException { - String email = createUniqueName() + "@e.de"; - int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); 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); @@ -48,9 +47,6 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testChangeSuffixValid() throws IOException { - String email = createUniqueName() + "@e.de"; - int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); String newName = createUniqueName(); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=" + newName + "&day=1&month=1&year=2000&processDetails", 0)); User u = User.getById(id); @@ -59,9 +55,6 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testUnsetSuffix() throws IOException { - String email = createUniqueName() + "@e.de"; - int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); String newName = createUniqueName(); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=" + newName + "&day=1&month=1&year=2000&processDetails", 0)); User u = User.getById(id); @@ -73,9 +66,6 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testUnsetFname() throws IOException { - String email = createUniqueName() + "@e.de"; - int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "fname=&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0)); User u = User.getById(id); assertEquals("Kurti", u.getFname()); @@ -84,9 +74,6 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testUnsetLname() throws IOException { - String email = createUniqueName() + "@e.de"; - int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); 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()); @@ -94,9 +81,6 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testUnsetMname() throws IOException { - String email = createUniqueName() + "@e.de"; - int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); 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); @@ -109,9 +93,6 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testChangeDOBValid() throws IOException { - String email = createUniqueName() + "@e.de"; - int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=2&year=2000&processDetails", 0)); User u = User.getById(id); Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); @@ -124,9 +105,6 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testChangeDOBInvalid() throws IOException { - String email = createUniqueName() + "@e.de"; - createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=test&processDetails", 0)); } } -- 2.39.2