Ignore:
Timestamp:
2020-10-28T20:41:00+01:00 (3 years ago)
Author:
Don-vip
Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

Location:
trunk/test/unit/org/openstreetmap/josm/io/remotecontrol
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/AddTagsDialogTest.java

    r16328 r17275  
    22package org.openstreetmap.josm.io.remotecontrol;
    33
    4 import static org.junit.Assert.assertEquals;
     4import static org.junit.jupiter.api.Assertions.assertEquals;
    55
    66import java.util.Map;
    77
    8 import org.junit.Rule;
    9 import org.junit.Test;
     8import org.junit.jupiter.api.extension.RegisterExtension;
     9import org.junit.jupiter.api.Test;
    1010import org.openstreetmap.josm.testutils.JOSMTestRules;
    1111
    … …  
    1515 * Unit tests for class {@link AddTagsDialog}.
    1616 */
    17 public class AddTagsDialogTest {
     17class AddTagsDialogTest {
    1818    /**
    1919     * Setup test.
    2020     */
    21     @Rule
     21    @RegisterExtension
    2222    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    2323    public JOSMTestRules test = new JOSMTestRules().preferences();
    … …  
    2727     */
    2828    @Test
    29     public void testParseUrlTagsToKeyValues() {
     29    void testParseUrlTagsToKeyValues() {
    3030        Map<String, String> strings = AddTagsDialog.parseUrlTagsToKeyValues("wikipedia:de=Residenzschloss Dresden|name:en=Dresden Castle");
    3131        assertEquals(2, strings.size());

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

    r16436 r17275  
    22package org.openstreetmap.josm.io.remotecontrol;
    33
    4 import static org.junit.Assert.assertEquals;
     4import static org.junit.jupiter.api.Assertions.assertEquals;
    55
    66import java.io.BufferedReader;
    … …  
    1515import java.util.stream.Collectors;
    1616
    17 import org.junit.After;
    18 import org.junit.Before;
    19 import org.junit.Rule;
    20 import org.junit.Test;
     17import org.junit.jupiter.api.AfterEach;
     18import org.junit.jupiter.api.BeforeEach;
     19import org.junit.jupiter.api.Test;
     20import org.junit.jupiter.api.extension.RegisterExtension;
    2121import org.openstreetmap.josm.TestUtils;
    2222import org.openstreetmap.josm.spi.preferences.Config;
    … …  
    3232 * Unit tests for Remote Control
    3333 */
    34 public class RemoteControlTest {
     34class RemoteControlTest {
    3535
    3636    private String httpBase;
    … …  
    4646     * Setup test.
    4747     */
    48     @Rule
     48    @RegisterExtension
    4949    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    5050    public JOSMTestRules test = new JOSMTestRules().preferences().https().assertionsInEDT();
    … …  
    5454     * @throws GeneralSecurityException if a security error occurs
    5555     */
    56     @Before
     56    @BeforeEach
    5757    public void setUp() throws GeneralSecurityException {
    5858        if (PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR"))) {
    … …  
    6969     * Stops Remote control after testing requests.
    7070     */
    71     @After
     71    @AfterEach
    7272    public void tearDown() {
    7373        RemoteControl.stop();
    … …  
    7979     */
    8080    @Test
    81     public void testHttpListOfCommands() throws Exception {
     81    void testHttpListOfCommands() throws Exception {
    8282        testListOfCommands(httpBase);
    8383    }

  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RequestProcessorTest.java

    r16825 r17275  
    1313 * @author Taylor Smock
    1414 */
    15 public class RequestProcessorTest {
     15class RequestProcessorTest {
    1616    /**
    1717     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/19436">#19436</a>
    1818     */
    1919    @Test
    20     public void testFeaturesDoesNotThrowNPE() {
     20    void testFeaturesDoesNotThrowNPE() {
    2121        assertTrue(RequestProcessor.getHandlersInfo(Arrays.asList("add_node", "/add_node", "", null))
    2222                .noneMatch(Objects::isNull));

  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java

    r16618 r17275  
    66import static org.junit.jupiter.api.Assertions.assertThrows;
    77
    8 import org.junit.Rule;
    9 import org.junit.Test;
     8import org.junit.jupiter.api.extension.RegisterExtension;
     9import org.junit.jupiter.api.Test;
    1010import org.openstreetmap.josm.data.osm.DataSet;
    1111import org.openstreetmap.josm.gui.MainApplication;
    … …  
    1919 * Unit tests of {@link AddNodeHandler} class.
    2020 */
    21 public class AddNodeHandlerTest {
     21class AddNodeHandlerTest {
    2222    /**
    2323     * Setup test.
    2424     */
    25     @Rule
     25    @RegisterExtension
    2626    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    2727    public JOSMTestRules test = new JOSMTestRules().main().assertionsInEDT().projection();
    … …  
    3838     */
    3939    @Test
    40     public void testBadRequestNoLayer() {
     40    void testBadRequestNoLayer() {
    4141        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost?lat=0&lon=0").handle());
    4242        assertEquals("There is no layer opened to add node", e.getMessage());
    … …  
    4747     */
    4848    @Test
    49     public void testBadRequestNoParam() {
     49    void testBadRequestNoParam() {
    5050        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
    5151        MainApplication.getLayerManager().addLayer(layer);
    … …  
    5858     */
    5959    @Test
    60     public void testBadRequestInvalidUrl() {
     60    void testBadRequestInvalidUrl() {
    6161        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("invalid_url").handle());
    6262        assertEquals("The following keys are mandatory, but have not been provided: lat, lon", e.getMessage());
    … …  
    6767     */
    6868    @Test
    69     public void testBadRequestIncompleteUrl() {
     69    void testBadRequestIncompleteUrl() {
    7070        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost").handle());
    7171        assertEquals("The following keys are mandatory, but have not been provided: lat, lon", e.getMessage());
    … …  
    7676     */
    7777    @Test
    78     public void testNominalRequest() {
     78    void testNominalRequest() {
    7979        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
    8080        MainApplication.getLayerManager().addLayer(layer);

  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java

    r16618 r17275  
    66import static org.junit.jupiter.api.Assertions.assertThrows;
    77
    8 import org.junit.Rule;
    9 import org.junit.Test;
     8import org.junit.jupiter.api.extension.RegisterExtension;
     9import org.junit.jupiter.api.Test;
    1010import org.openstreetmap.josm.data.osm.DataSet;
    1111import org.openstreetmap.josm.gui.MainApplication;
    … …  
    1919 * Unit tests of {@link AddWayHandler} class.
    2020 */
    21 public class AddWayHandlerTest {
     21class AddWayHandlerTest {
    2222    /**
    2323     * Setup test.
    2424     */
    25     @Rule
     25    @RegisterExtension
    2626    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    2727    public JOSMTestRules test = new JOSMTestRules();
    … …  
    3838     */
    3939    @Test
    40     public void testBadRequestNoLayer() {
     40    void testBadRequestNoLayer() {
    4141        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost?way=0,0;1,1").handle());
    4242        assertEquals("There is no layer opened to add way", e.getMessage());
    … …  
    4747     */
    4848    @Test
    49     public void testBadRequestNoParam() {
     49    void testBadRequestNoParam() {
    5050        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
    5151        try {
    … …  
    6262     */
    6363    @Test
    64     public void testBadRequestInvalidUrl() {
     64    void testBadRequestInvalidUrl() {
    6565        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("invalid_url").handle());
    6666        assertEquals("The following keys are mandatory, but have not been provided: way", e.getMessage());
    … …  
    7171     */
    7272    @Test
    73     public void testBadRequestIncompleteUrl() {
     73    void testBadRequestIncompleteUrl() {
    7474        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost").handle());
    7575        assertEquals("The following keys are mandatory, but have not been provided: way", e.getMessage());
    … …  
    8080     */
    8181    @Test
    82     public void testNominalRequest() {
     82    void testNominalRequest() {
    8383        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
    8484        try {

  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java

    r16739 r17275  
    44import static org.hamcrest.CoreMatchers.hasItem;
    55import static org.hamcrest.MatcherAssert.assertThat;
    6 import static org.junit.Assert.assertEquals;
     6import static org.junit.jupiter.api.Assertions.assertEquals;
    77import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
    88import static org.junit.jupiter.api.Assertions.assertThrows;
    … …  
    1111import java.util.List;
    1212
    13 import org.junit.Rule;
    14 import org.junit.Test;
     13import org.junit.jupiter.api.extension.RegisterExtension;
     14import org.junit.jupiter.api.Test;
    1515import org.openstreetmap.josm.data.imagery.ImageryInfo;
    1616import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
    … …  
    2222 * Unit tests of {@link ImageryHandler} class.
    2323 */
    24 public class ImageryHandlerTest {
     24class ImageryHandlerTest {
    2525    /**
    2626     * Setup test.
    2727     */
    28     @Rule
     28    @RegisterExtension
    2929    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    3030    public JOSMTestRules test = new JOSMTestRules();
    … …  
    4141     */
    4242    @Test
    43     public void testBadRequestNoParam() {
     43    void testBadRequestNoParam() {
    4444        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler(null).handle());
    4545        assertEquals("Parameter must not be null", e.getMessage());
    … …  
    5151     */
    5252    @Test
    53     public void testBadRequestInvalidUrl() {
     53    void testBadRequestInvalidUrl() {
    5454        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("invalid_url").handle());
    5555        assertEquals("The following keys are mandatory, but have not been provided: url", e.getMessage());
    … …  
    6060     */
    6161    @Test
    62     public void testBadRequestIncompleteUrl() {
     62    void testBadRequestIncompleteUrl() {
    6363        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost").handle());
    6464        assertEquals("The following keys are mandatory, but have not been provided: url", e.getMessage());
    … …  
    6969     */
    7070    @Test
    71     public void testNominalRequest() {
     71    void testNominalRequest() {
    7272        assertDoesNotThrow(() -> newHandler("https://localhost?url=foo").handle());
    7373    }
    … …  
    7878     */
    7979    @Test
    80     public void testOptionalParams() throws Exception {
     80    void testOptionalParams() throws Exception {
    8181        List<String> optionalParams = Arrays.asList(newHandler("").getOptionalParams());
    8282        assertThat(optionalParams, hasItem("type"));
    … …  
    9191     */
    9292    @Test
    93     public void testBuildImageryInfo() throws Exception {
     93    void testBuildImageryInfo() throws Exception {
    9494        String url = "https://localhost/imagery?title=osm"
    9595                + "&type=tms&min_zoom=3&max_zoom=23&category=osmbasedmap&country_code=XA"
    … …  
    110110     */
    111111    @Test
    112     public void testTicket19483() throws Exception {
     112    void testTicket19483() throws Exception {
    113113        String url = "https://localhost/imagery?url=" +
    114114                "tms[3-7]%3Ahttps%3A%2F%2Fservices.digitalglobe.com%2Fearthservice%2Ftmsaccess%2F" +

  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java

    r16618 r17275  
    22package org.openstreetmap.josm.io.remotecontrol.handler;
    33
    4 import static org.junit.Assert.assertEquals;
     4import static org.junit.jupiter.api.Assertions.assertEquals;
    55import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
    66import static org.junit.jupiter.api.Assertions.assertThrows;
    … …  
    88import java.io.File;
    99
    10 import org.junit.Rule;
    11 import org.junit.Test;
     10import org.junit.jupiter.api.extension.RegisterExtension;
     11import org.junit.jupiter.api.Test;
    1212import org.openstreetmap.josm.TestUtils;
    1313import org.openstreetmap.josm.gui.MainApplication;
    … …  
    2222 * Unit tests of {@link ImportHandler} class.
    2323 */
    24 public class ImportHandlerTest {
     24class ImportHandlerTest {
    2525    /**
    2626     * Setup test.
    2727     */
    28     @Rule
     28    @RegisterExtension
    2929    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    3030    public JOSMTestRules test = new JOSMTestRules().main();
    … …  
    4242     */
    4343    @Test
    44     public void testTicket7434() throws Exception {
     44    void testTicket7434() throws Exception {
    4545        ImportHandler req = newHandler("http://localhost:8111/import?url=http://localhost:8888/relations?relations=19711&mode=recursive");
    4646        assertEquals("http://localhost:8888/relations?relations=19711&mode=recursive", req.args.get("url"));
    … …  
    5252     */
    5353    @Test
    54     public void testBadRequestNoParam() throws Exception {
     54    void testBadRequestNoParam() throws Exception {
    5555        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler(null).handle());
    5656        assertEquals("MalformedURLException: null", e.getMessage());
    … …  
    6262     */
    6363    @Test
    64     public void testBadRequestInvalidUrl() throws Exception {
     64    void testBadRequestInvalidUrl() throws Exception {
    6565        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost?url=invalid_url").handle());
    6666        assertEquals("MalformedURLException: no protocol: invalid_url", e.getMessage());
    … …  
    7272     */
    7373    @Test
    74     public void testBadRequestIncompleteUrl() throws Exception {
     74    void testBadRequestIncompleteUrl() throws Exception {
    7575        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost").handle());
    7676        assertEquals("The following keys are mandatory, but have not been provided: url", e.getMessage());
    … …  
    8282     */
    8383    @Test
    84     public void testNominalRequest() throws Exception {
     84    void testNominalRequest() throws Exception {
    8585        String url = new File(TestUtils.getRegressionDataFile(11957, "data.osm")).toURI().toURL().toExternalForm();
    8686        try {

  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java

    r16618 r17275  
    66import static org.junit.jupiter.api.Assertions.assertThrows;
    77
    8 import org.junit.Rule;
    9 import org.junit.Test;
     8import org.junit.jupiter.api.extension.RegisterExtension;
     9import org.junit.jupiter.api.Test;
    1010import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
    1111import org.openstreetmap.josm.testutils.JOSMTestRules;
    … …  
    1616 * Unit tests of {@link LoadAndZoomHandler} class.
    1717 */
    18 public class LoadAndZoomHandlerTest {
     18class LoadAndZoomHandlerTest {
    1919    /**
    2020     * Setup test.
    2121     */
    22     @Rule
     22    @RegisterExtension
    2323    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    2424    public JOSMTestRules test = new JOSMTestRules();
    … …  
    3636     */
    3737    @Test
    38     public void testBadRequestNoParam() throws Exception {
     38    void testBadRequestNoParam() throws Exception {
    3939        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler(null).handle());
    4040        assertEquals("NumberFormatException (empty String)", e.getMessage());
    … …  
    4646     */
    4747    @Test
    48     public void testBadRequestInvalidUrl() throws Exception {
     48    void testBadRequestInvalidUrl() throws Exception {
    4949        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("invalid_url").handle());
    5050        assertEquals("The following keys are mandatory, but have not been provided: bottom, top, left, right", e.getMessage());
    … …  
    5656     */
    5757    @Test
    58     public void testBadRequestIncompleteUrl() throws Exception {
     58    void testBadRequestIncompleteUrl() throws Exception {
    5959        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost").handle());
    6060        assertEquals("The following keys are mandatory, but have not been provided: bottom, top, left, right", e.getMessage());
    … …  
    6666     */
    6767    @Test
    68     public void testNominalRequest() throws Exception {
     68    void testNominalRequest() throws Exception {
    6969        assertDoesNotThrow(() -> newHandler("https://localhost?bottom=0&top=0&left=1&right=1").handle());
    7070    }

  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandlerTest.java

    r16618 r17275  
    66import static org.junit.jupiter.api.Assertions.assertThrows;
    77
    8 import org.junit.Rule;
    9 import org.junit.Test;
     8import org.junit.jupiter.api.extension.RegisterExtension;
     9import org.junit.jupiter.api.Test;
    1010import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
    1111import org.openstreetmap.josm.testutils.JOSMTestRules;
    … …  
    1616 * Unit tests of {@link LoadObjectHandler} class.
    1717 */
    18 public class LoadObjectHandlerTest {
     18class LoadObjectHandlerTest {
    1919    /**
    2020     * Setup test.
    2121     */
    22     @Rule
     22    @RegisterExtension
    2323    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    2424    public JOSMTestRules test = new JOSMTestRules();
    … …  
    3535     */
    3636    @Test
    37     public void testBadRequestNoParam() {
     37    void testBadRequestNoParam() {
    3838        assertDoesNotThrow(() -> newHandler(null).handle());
    3939    }
    … …  
    4343     */
    4444    @Test
    45     public void testBadRequestInvalidUrl() {
     45    void testBadRequestInvalidUrl() {
    4646        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("invalid_url").handle());
    4747        assertEquals("The following keys are mandatory, but have not been provided: objects", e.getMessage());
    … …  
    5252     */
    5353    @Test
    54     public void testBadRequestIncompleteUrl() {
     54    void testBadRequestIncompleteUrl() {
    5555        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost").handle());
    5656        assertEquals("The following keys are mandatory, but have not been provided: objects", e.getMessage());
    … …  
    6161     */
    6262    @Test
    63     public void testNominalRequest() {
     63    void testNominalRequest() {
    6464        assertDoesNotThrow(() -> newHandler("https://localhost?objects=foo,bar").handle());
    6565    }

  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java

    r12558 r17275  
    22package org.openstreetmap.josm.io.remotecontrol.handler;
    33
    4 import static org.junit.Assert.assertEquals;
     4import static org.junit.jupiter.api.Assertions.assertEquals;
     5import static org.junit.jupiter.api.Assertions.assertThrows;
    56
    67import java.util.Collections;
    … …  
    89import java.util.Map;
    910
    10 import org.junit.Rule;
    11 import org.junit.Test;
     11import org.junit.jupiter.api.Test;
     12import org.junit.jupiter.api.extension.RegisterExtension;
    1213import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
    1314import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
    … …  
    1920 * Unit tests of {@link RequestHandler} class.
    2021 */
    21 public class RequestHandlerTest {
     22class RequestHandlerTest {
    2223
    2324    /**
    2425     * Setup test.
    2526     */
    26     @Rule
     27    @RegisterExtension
    2728    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    2829    public JOSMTestRules test = new JOSMTestRules();
    … …  
    6263     */
    6364    @Test
    64     public void testRequestParameter1() throws RequestHandlerBadRequestException {
     65    void testRequestParameter1() throws RequestHandlerBadRequestException {
    6566        final Map<String, String> expected = new HashMap<>();
    6667        expected.put("query", "a");
    … …  
    7475     */
    7576    @Test
    76     public void testRequestParameter2() throws RequestHandlerBadRequestException {
     77    void testRequestParameter2() throws RequestHandlerBadRequestException {
    7778        assertEquals(Collections.singletonMap("query", "a&b==c"),
    7879                getRequestParameter("http://example.com/?query=a%26b==c"));
    … …  
    8485     */
    8586    @Test
    86     public void testRequestParameter3() throws RequestHandlerBadRequestException {
     87    void testRequestParameter3() throws RequestHandlerBadRequestException {
    8788        assertEquals(Collections.singleton("blue+light blue"),
    8889                getRequestParameter("http://example.com/blue+light%20blue?blue%2Blight+blue").keySet());
    … …  
    9697     */
    9798    @Test
    98     public void testRequestParameter4() throws RequestHandlerBadRequestException {
     99    void testRequestParameter4() throws RequestHandlerBadRequestException {
    99100        assertEquals(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;=="), getRequestParameter(
    100101            "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="
    … …  
    107108     */
    108109    @Test
    109     public void testRequestParameter5() throws RequestHandlerBadRequestException {
     110    void testRequestParameter5() throws RequestHandlerBadRequestException {
    110111        final Map<String, String> expected = new HashMap<>();
    111112        expected.put("space", " ");
    … …  
    119120     */
    120121    @Test
    121     public void testRequestParameter6() throws RequestHandlerBadRequestException {
     122    void testRequestParameter6() throws RequestHandlerBadRequestException {
    122123        final Map<String, String> expected = new HashMap<>();
    123124        expected.put("addtags", "wikipedia:de=Weiße_Gasse|maxspeed=5");
    … …  
    135136    /**
    136137     * Test request parameter - invalid case
    137      * @throws RequestHandlerBadRequestException always
    138138     */
    139     @Test(expected = RequestHandlerBadRequestException.class)
    140     public void testRequestParameterInvalid() throws RequestHandlerBadRequestException {
    141         getRequestParameter("http://localhost:8111/load_and_zoom"+
     139    @Test
     140    void testRequestParameterInvalid() {
     141        assertThrows(RequestHandlerBadRequestException.class,
     142                () -> getRequestParameter("http://localhost:8111/load_and_zoom"+
    142143                "?addtags=wikipedia:de=Wei%C3%9Fe_Gasse|maxspeed=5"+
    143144                "&select=way23071688,way23076176,way23076177,"+
    144                 "&left=13.739727546842&right=13.740890970188&top=51.049987191025&bottom=51.048466954325");
     145                "&left=13.739727546842&right=13.740890970188&top=51.049987191025&bottom=51.048466954325"));
    145146    }
    146147}
Note: See TracChangeset for help on using the changeset viewer.