Changeset 10019 in josm

Timestamp:

2016-03-19T19:01:37+01:00 (8 years ago)

Author:

bastiK

Message:

fixed #12264 - repair unit test

adding certificates must happen before the first TLS connection is made
(don't know why, but so be it)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• JOSMFixture.java (modified) (3 diffs)
• io/CertificateAmendmentTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -5 +5 @@
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Paths;
 import java.text.MessageFormat;
@@ -12 +13 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
+import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.I18n;
@@ -93 +95 @@
         I18n.set(Main.pref.get("language", "en"));
 
+        try {
+            CertificateAmendment.addMissingCertificates();
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+
         // init projection
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator

trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java

@@ -25 +25 @@
     public static void setUp() throws IOException {
         JOSMFixture.createUnitTestFixture().init();
-        CertificateAmendment.addMissingCertificates();
     }
 
@@ -70 +69 @@
     }
 
-    private void connect(String url, boolean shouldWork) throws IOException {
+    /**
+     * Test overpass API.
+     * @throws IOException in case of I/O error
+     */
+    @Test
+    public void testOverpass() throws IOException {
+        connect("https://overpass-api.de", true);
+    }
+
+    private static void connect(String url, boolean shouldWork) throws IOException {
         URLConnection connection = new URL(url).openConnection();
         try {
@@ -76 +84 @@
         } catch (SSLHandshakeException e) {
             if (shouldWork) {
+                e.printStackTrace();
                 Assert.fail("Untrusted: " + url);
             } else {