Changeset 7081 in josm for trunk/test/unit/org/openstreetmap/josm/io/remotecontrol

Timestamp:

2014-05-09T04:49:54+02:00 (11 years ago)

Author:

Don-vip

Message:

fixes for unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (modified) (9 diffs)

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

@@ -26 +26 @@
 import org.junit.Before;
 import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Utils;
@@ -36 +37 @@
     private String httpBase;
     private String httpsBase;
-    
+
     /**
      * Starts Remote control before testing requests.
@@ -42 +43 @@
     @Before
     public void setUp() {
-        Main.initApplicationPreferences();
+        JOSMFixture.createUnitTestFixture().init();
         RemoteControl.start();
         disableCertificateValidation();
@@ -48 +49 @@
         httpsBase = "https://127.0.0.1:"+Main.pref.getInteger("remote.control.https.port", 8112);
     }
-    
+
     /**
-     * Disable all HTTPS validation mechanisms as described 
+     * Disable all HTTPS validation mechanisms as described
      * <a href="http://stackoverflow.com/a/2893932/2257172">here</a> and
      * <a href="http://stackoverflow.com/a/19542614/2257172">here</a>
@@ -56 +57 @@
     public void disableCertificateValidation() {
         // Create a trust manager that does not validate certificate chains
-        TrustManager[] trustAllCerts = new TrustManager[] { 
+        TrustManager[] trustAllCerts = new TrustManager[] {
             new X509TrustManager() {
                 public X509Certificate[] getAcceptedIssuers() {
@@ -76 +77 @@
             fail(e.getMessage());
         }
-        
+
         // Create all-trusting host name verifier
         HostnameVerifier allHostsValid = new HostnameVerifier() {
@@ -100 +101 @@
      * Tests that sending an HTTP request without command results in HTTP 400, with all available commands in error message.
      * @throws IOException if an I/O error occurs
-     * @throws MalformedURLException if HTTP URL is invalid  
+     * @throws MalformedURLException if HTTP URL is invalid
      */
     @Test
@@ -110 +111 @@
      * Tests that sending an HTTPS request without command results in HTTP 400, with all available commands in error message.
      * @throws IOException if an I/O error occurs
-     * @throws MalformedURLException if HTTPS URL is invalid  
+     * @throws MalformedURLException if HTTPS URL is invalid
      */
     @Test
@@ -122 +123 @@
         assertEquals(connection.getResponseCode(), HttpURLConnection.HTTP_BAD_REQUEST);
         try (InputStream is = connection.getErrorStream()) {
-            // TODO this code should be refactored somewhere in Utils as it is used in several JOSM classes 
+            // TODO this code should be refactored somewhere in Utils as it is used in several JOSM classes
             StringBuilder responseBody = new StringBuilder();
             try (BufferedReader in = new BufferedReader(new InputStreamReader(is, Utils.UTF_8))) {