From 280d6da278bcb19eb962fbc87403b88b1dc3e661 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 28 Sep 2014 18:03:51 +0200 Subject: [PATCH] Purging db before test kills its own users :-): --- tests/org/cacert/gigi/testUtils/PingTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tests/org/cacert/gigi/testUtils/PingTest.java b/tests/org/cacert/gigi/testUtils/PingTest.java index 0a65ec51..50d5d7fc 100644 --- a/tests/org/cacert/gigi/testUtils/PingTest.java +++ b/tests/org/cacert/gigi/testUtils/PingTest.java @@ -16,7 +16,7 @@ import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.pages.account.domain.DomainOverview; -import org.junit.Before; +import org.junit.After; public abstract class PingTest extends ClientTest { @@ -50,7 +50,9 @@ public abstract class PingTest extends ClientTest { String newcontent = IOUtils.readURL(cookie(u.openConnection(), cookie)); Pattern dlink = Pattern.compile(DomainOverview.PATH + "([0-9]+)'>"); Matcher m1 = dlink.matcher(newcontent); - m1.find(); + if ( !m1.find()) { + throw new Error(newcontent); + } URL u2 = new URL(u.toString() + m1.group(1)); return u2; } @@ -67,14 +69,8 @@ public abstract class PingTest extends ClientTest { return m; } - private static boolean first = true; - - @Before + @After public void purgeDbAfterTest() throws SQLException, IOException { - if (first) { - first = false; - return; - } purgeDatabase(); } -- 2.39.2