Changeset 11943 in josm for trunk/test/unit/org

Timestamp:

2017-04-17T14:07:04+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14649 - load Dutch Government (G2 & G3) certificates from Windows keystore if not found in Java keystore

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• JOSMFixture.java (modified) (2 diffs)
• io/CertificateAmendmentTest.java (modified) (2 diffs)
• testutils/JOSMTestRules.java (modified) (6 diffs)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -111 +112 @@
             CertificateAmendment.addMissingCertificates();
         } catch (IOException | GeneralSecurityException ex) {
-            throw new RuntimeException(ex);
+            throw new JosmRuntimeException(ex);
         }
 

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

@@ -26 +26 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().platform().https();
 
     /**
@@ -82 +82 @@
     }
 
+    /**
+     * Test Dutch government.
+     * @throws IOException in case of I/O error
+     */
+    @Test
+    public void testDutchGovernment() throws IOException {
+        connect("https://geodata.nationaalgeoregister.nl", true);
+    }
+
     private static void connect(String url, boolean shouldWork) throws IOException {
         URLConnection connection = new URL(url).openConnection();

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -4 +4 @@
 import java.io.File;
 import java.io.IOException;
+import java.security.GeneralSecurityException;
 import java.text.MessageFormat;
 import java.util.TimeZone;
@@ -17 +18 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApiInitializationException;
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManagerTest;
@@ -46 +49 @@
     private boolean allowMemoryManagerLeaks;
     private boolean useMapStyles;
+    private boolean useHttps;
 
     /**
@@ -137 +141 @@
     public JOSMTestRules projection() {
         useProjection = true;
+        return this;
+    }
+
+    /**
+     * Set up HTTPS certificates
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules https() {
+        useHttps = true;
         return this;
     }
@@ -222 +235 @@
         }
 
+        // Set Platform
+        if (platform) {
+            Main.determinePlatformHook();
+        }
+
+        if (useHttps) {
+            try {
+                CertificateAmendment.addMissingCertificates();
+            } catch (IOException | GeneralSecurityException ex) {
+                throw new JosmRuntimeException(ex);
+            }
+        }
+
         if (useProjection) {
             Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
@@ -241 +267 @@
                 throw new InitializationError(e);
             }
-        }
-
-        // Set Platform
-        if (platform) {
-            Main.determinePlatformHook();
         }