Changeset 15232 in josm

Timestamp:

2019-07-07T23:38:39+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17861 - update scripts/tests

Location:

trunk

Files:

• scripts/TagInfoExtract.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (2 diffs)

trunk/scripts/TagInfoExtract.java

@@ -72 +72 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.Http1Client;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OptionParser;
@@ -92 +94 @@
     /**
      * Main method.
+     * @param args Main program arguments
+     * @throws Exception if any error occurs
      */
     public static void main(String[] args) throws Exception {
+        HttpClient.setFactory(Http1Client::new);
         TagInfoExtract script = new TagInfoExtract();
         script.parseCommandLineArguments(args);

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

@@ -58 +58 @@
 import org.openstreetmap.josm.testutils.mockers.WindowlessMapViewStateMocker;
 import org.openstreetmap.josm.testutils.mockers.WindowlessNavigatableComponentMocker;
+import org.openstreetmap.josm.tools.Http1Client;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -479 +481 @@
         DeleteCommand.setDeletionCallback(DeleteAction.defaultDeletionCallback);
         OsmConnection.setOAuthAccessTokenFetcher(OAuthAuthorizationWizard::obtainAccessToken);
+        HttpClient.setFactory(Http1Client::new);
 
         // Set up i18n