upd: move external keywords to own class

[gigi.git] / tests / org / cacert / gigi / ping / TestHTTP.java

diff --git a/tests/org/cacert/gigi/ping/TestHTTP.java b/tests/org/cacert/gigi/ping/TestHTTP.java
index 18dff3851e0219ab882e806f64d62d21f3c31028..748305e934264b69da1286ebd26ed1c5d8f6c9e2 100644 (file)
--- a/tests/org/cacert/gigi/ping/TestHTTP.java
+++ b/tests/org/cacert/gigi/ping/TestHTTP.java
@@ -27,6 +27,7 @@ import org.cacert.gigi.testUtils.IOUtils;
 import org.cacert.gigi.testUtils.PingTest;
 import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail;
 import org.cacert.gigi.util.RandomToken;
+import org.cacert.gigi.util.SystemKeywords;
 import org.junit.Test;
 
 public class TestHTTP extends PingTest {
@@ -98,6 +99,7 @@ public class TestHTTP extends PingTest {
             }
             if (dpc == null) {
                 fail("Http config not found");
+                return;
             }
             String res = executeBasicWebInteraction(cookie, p2, "configId=" + dpc.getId());
             assertThat(res, containsString("only allowed after"));
@@ -107,7 +109,7 @@ public class TestHTTP extends PingTest {
     private String readHTTP(String token) throws IOException {
         String httpDom = getTestProps().getProperty("domain.http");
         assumeNotNull(httpDom);
-        URL u = new URL("http://" + httpDom + "/cacert-" + token + ".txt");
+        URL u = new URL("http://" + httpDom + "/" + SystemKeywords.HTTP_CHALLENGE_PREFIX + token + ".txt");
         return IOUtils.readURL(new InputStreamReader(u.openStream(), "UTF-8")).trim();
 
     }
@@ -153,8 +155,8 @@ public class TestHTTP extends PingTest {
         try (Socket s0 = s.accept()) {
             BufferedReader br = new BufferedReader(new InputStreamReader(s0.getInputStream(), "UTF-8"));
             String fst = br.readLine();
-            assertEquals("GET /cacert-" + m.group(1) + ".txt HTTP/1.1", fst);
-            while ( !br.readLine().equals("")) {
+            assertEquals("GET /" + SystemKeywords.HTTP_CHALLENGE_PREFIX + m.group(1) + ".txt HTTP/1.1", fst);
+            while ( !"".equals(br.readLine())) {
             }
             String res = m.group(2);
             PrintWriter out = new PrintWriter(new OutputStreamWriter(s0.getOutputStream(), "UTF-8"));