From b2e7c5e9f23632503e7a6ec7f86e6d8279a39c93 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 31 Aug 2014 16:17:01 +0200 Subject: [PATCH] UPD: use more advanced hamcrest matchers where possible. --- .../pages/account/TestContactInformation.java | 5 ++-- .../gigi/pages/main/RegisterPageTest.java | 27 ++++++++++--------- .../cacert/gigi/pages/wot/TestAssurance.java | 5 ++-- .../cacert/gigi/testUtils/ManagedTest.java | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/tests/org/cacert/gigi/pages/account/TestContactInformation.java b/tests/org/cacert/gigi/pages/account/TestContactInformation.java index 65fd0779..6360578b 100644 --- a/tests/org/cacert/gigi/pages/account/TestContactInformation.java +++ b/tests/org/cacert/gigi/pages/account/TestContactInformation.java @@ -1,5 +1,6 @@ package org.cacert.gigi.pages.account; +import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import java.io.IOException; @@ -22,7 +23,7 @@ public class TestContactInformation extends ManagedTest { url.setRequestProperty("Cookie", cookie); String res = IOUtils.readURL(url); res = res.split(java.util.regex.Pattern.quote(""))[1]; - assertTrue(res.contains("value=\"1\" selected")); + assertThat(res, containsString("value=\"1\" selected")); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "listme=0&contactinfo=&processContact", 1)); url = new URL("https://" + getServerName() + MyDetails.PATH).openConnection(); url.setRequestProperty("Cookie", cookie); @@ -42,6 +43,6 @@ public class TestContactInformation extends ManagedTest { url.setRequestProperty("Cookie", cookie); String res = IOUtils.readURL(url); res = res.split(java.util.regex.Pattern.quote(""))[1]; - assertTrue(res.contains(text)); + assertThat(res, containsString(text)); } } diff --git a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java index c21d7a26..28ced07c 100644 --- a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java +++ b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java @@ -1,5 +1,6 @@ package org.cacert.gigi.pages.main; +import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import java.io.IOException; @@ -124,26 +125,26 @@ public class RegisterPageTest extends ManagedTest { public void testDataStays() throws IOException { long uniq = System.currentTimeMillis(); String run = runRegister("fname=fn" + uniq + "&lname=ln" + uniq + "&email=ma" + uniq + "@cacert.org&pword1=pas" + uniq + "&pword2=pas2" + uniq + "&day=1&month=1&year=0"); - assertTrue(run.contains("fn" + uniq)); - assertTrue(run.contains("ln" + uniq)); - assertTrue(run.contains("ma" + uniq + "@cacert.org")); - assertTrue( !run.contains("pas" + uniq)); - assertTrue( !run.contains("pas2" + uniq)); + assertThat(run, containsString("fn" + uniq)); + assertThat(run, containsString("ln" + uniq)); + assertThat(run, containsString("ma" + uniq + "@cacert.org")); + assertThat(run, not(containsString("pas" + uniq))); + assertThat(run, not(containsString("pas2" + uniq))); } @Test public void testCheckboxesStay() throws IOException { String run2 = runRegister("general=1&country=a®ional=1&radius=0"); - assertTrue(run2.contains("name=\"general\" value=\"1\" checked=\"checked\">")); - assertTrue(run2.contains("name=\"country\" value=\"1\">")); - assertTrue(run2.contains("name=\"regional\" value=\"1\" checked=\"checked\">")); - assertTrue(run2.contains("name=\"radius\" value=\"1\">")); + assertThat(run2, containsString("name=\"general\" value=\"1\" checked=\"checked\">")); + assertThat(run2, containsString("name=\"country\" value=\"1\">")); + assertThat(run2, containsString("name=\"regional\" value=\"1\" checked=\"checked\">")); + assertThat(run2, containsString("name=\"radius\" value=\"1\">")); run2 = runRegister("general=0&country=1&radius=1"); - assertTrue(run2.contains("name=\"general\" value=\"1\">")); - assertTrue(run2.contains("name=\"country\" value=\"1\" checked=\"checked\">")); - assertTrue(run2.contains("name=\"regional\" value=\"1\">")); - assertTrue(run2.contains("name=\"radius\" value=\"1\" checked=\"checked\">")); + assertThat(run2, containsString("name=\"general\" value=\"1\">")); + assertThat(run2, containsString("name=\"country\" value=\"1\" checked=\"checked\">")); + assertThat(run2, containsString("name=\"regional\" value=\"1\">")); + assertThat(run2, containsString("name=\"radius\" value=\"1\" checked=\"checked\">")); } @Test diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java index 3db48d65..03e499df 100644 --- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java +++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java @@ -1,5 +1,6 @@ package org.cacert.gigi.pages.wot; +import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import java.io.IOException; @@ -158,7 +159,7 @@ public class TestAssurance extends ManagedTest { url.setRequestProperty("Cookie", cookie); String resp = IOUtils.readURL(url); resp = resp.split(Pattern.quote(""))[0]; - assertTrue(resp.contains(uniqueLoc)); + assertThat(resp, containsString(uniqueLoc)); } @Test @@ -171,7 +172,7 @@ public class TestAssurance extends ManagedTest { url.setRequestProperty("Cookie", cookie); String resp = IOUtils.readURL(url); resp = resp.split(Pattern.quote(""))[1]; - assertTrue(resp.contains(uniqueLoc)); + assertThat(resp, containsString(uniqueLoc)); } private String getError(String query) throws MalformedURLException, IOException { diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index ae62beb5..df19e0cf 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -509,7 +509,7 @@ public class ManagedTest { EmailAddress adrr = new EmailAddress(createUniqueName() + "test@test.tld", u); adrr.insert(Language.getInstance(Locale.ENGLISH)); TestMail testMail = getMailReciever().recieve(); - assertTrue(adrr.getAddress().equals(testMail.getTo())); + assertEquals(adrr.getAddress(), testMail.getTo()); String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1); adrr.verify(hash); getMailReciever().clearMails(); -- 2.39.2