]> WPIA git - gigi.git/commitdiff
Fix "TestCertificate"-test on port 443 (default...)
authorFelix Dörre <felix@dogcraft.de>
Thu, 17 Jul 2014 10:35:02 +0000 (12:35 +0200)
committerFelix Dörre <felix@dogcraft.de>
Thu, 17 Jul 2014 10:35:02 +0000 (12:35 +0200)
tests/org/cacert/gigi/TestCertificate.java

index 24ffbcab64cb3ce05593c6306df5274d6352355e..f0fe0209df9e1dfa68a82615313ed34f5e6ad3e8 100644 (file)
@@ -85,12 +85,11 @@ public class TestCertificate extends ManagedTest {
                }
                if (success) {
                        assertEquals(302, connection.getResponseCode());
                }
                if (success) {
                        assertEquals(302, connection.getResponseCode());
-                       assertEquals("https://" + getServerName().replaceFirst("^www.", "secure.") + "/",
-                               connection.getHeaderField("Location"));
+                       assertEquals("https://" + getServerName().replaceFirst("^www.", "secure.").replaceFirst(":443$", "") + "/",
+                               connection.getHeaderField("Location").replaceFirst(":443$", ""));
                } else {
                        assertNotEquals(302, connection.getResponseCode());
                } else {
                        assertNotEquals(302, connection.getResponseCode());
-                       assertNotEquals("https://" + getServerName().replaceFirst("^www.", "secure.") + "/",
-                               connection.getHeaderField("Location"));
+                       assertNull(connection.getHeaderField("Location"));
                }
        }
 
                }
        }