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


Ignore:
Timestamp:
2024-04-22T20:59:26+02:00 (7 months ago)
Author:
taylor.smock
Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

Location:
trunk/test/unit/org/openstreetmap/josm
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/actions/UploadActionTest.java

    r18870 r19050  
    8585    }
    8686
    87     private static class UploadDialogMock extends MockUp<UploadDialog> {
     87    private static final class UploadDialogMock extends MockUp<UploadDialog> {
    8888        @Mock
    8989        public void pack(final Invocation invocation) {
    … …  
    101101
    102102        @Mock
    103         public final boolean isCanceled(final Invocation invocation) {
     103        public boolean isCanceled(final Invocation invocation) {
    104104            if (!GraphicsEnvironment.isHeadless()) {
    105105                return Boolean.TRUE.equals(invocation.proceed());

  • trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java

    r18965 r19050  
    5151    private static final int HEIGHT = 600;
    5252
    53     private static class AlwaysDeleteCallback implements DeleteCommand.DeletionCallback {
     53    private static final class AlwaysDeleteCallback implements DeleteCommand.DeletionCallback {
    5454        @Override
    5555        public boolean checkAndConfirmOutlyingDelete(Collection<? extends OsmPrimitive> primitives, Collection<? extends OsmPrimitive> ignore) {

  • trunk/test/unit/org/openstreetmap/josm/actions/upload/UploadNotesTaskTest.java

    r18870 r19050  
    157157    }
    158158
    159     private static class FakeOsmApiMocker extends MockUp<FakeOsmApi> {
     159    private static final class FakeOsmApiMocker extends MockUp<FakeOsmApi> {
    160160        Collection<Note> closed = new ArrayList<>();
    161161        Collection<Note> commented = new ArrayList<>();

  • trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java

    r18037 r19050  
    44import java.util.Arrays;
    55
     6import org.junit.jupiter.api.Test;
    67import org.openstreetmap.josm.TestUtils;
    78import org.openstreetmap.josm.data.coor.LatLon;
    … …  
    1920import nl.jqno.equalsverifier.EqualsVerifier;
    2021import nl.jqno.equalsverifier.Warning;
    21 import org.junit.jupiter.api.Test;
    2222
    2323/**
    … …  
    100100         * @return The way.
    101101         */
    102         public Way createWay(int id, Node...nodes) {
     102        public Way createWay(int id, Node... nodes) {
    103103            Way way = new Way();
    104104            way.setOsmId(id, 1);
    … …  
    115115         * @return The relation.
    116116         */
    117         public Relation createRelation(int id, RelationMember...members) {
     117        public Relation createRelation(int id, RelationMember... members) {
    118118            Relation relation = new Relation(id, 1);
    119119            for (RelationMember member : members) {

  • trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java

    r18106 r19050  
    8585    }
    8686
    87     private static class Listener implements ICachedLoaderListener {
     87    private static final class Listener implements ICachedLoaderListener {
    8888        private CacheEntryAttributes attributes;
    8989        private boolean ready;
    … …  
    513513     */
    514514    @Test
    515     public void testCheckUsing304() throws IOException {
     515    void testCheckUsing304() throws IOException {
    516516        ICacheAccess<String, CacheEntry> cache = getCache();
    517517        long expires = TimeUnit.DAYS.toMillis(1);

  • trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java

    r18870 r19050  
    457457    }
    458458
    459     private static class TestChangeListener implements GpxDataChangeListener {
     459    private static final class TestChangeListener implements GpxDataChangeListener {
    460460
    461461        private GpxDataChangeEvent lastEvent;

  • trunk/test/unit/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJobTest.java

    r18106 r19050  
    9999    }
    100100
    101     private static class Listener implements TileLoaderListener {
     101    private static final class Listener implements TileLoaderListener {
    102102        private CacheEntryAttributes attributes;
    103103        private boolean ready;

  • trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSourceTest.java

    r18766 r19050  
    2727 */
    2828class MapboxVectorTileSourceTest implements TileSourceTest {
    29     private static class SelectLayerDialogMocker extends ExtendedDialogMocker {
     29    private static final class SelectLayerDialogMocker extends ExtendedDialogMocker {
    3030        int index;
    3131        @Override

  • trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuth20AuthorizationTest.java

    r18991 r19050  
    1717import java.util.stream.Stream;
    1818
    19 import com.github.tomakehurst.wiremock.client.WireMock;
    20 import com.github.tomakehurst.wiremock.common.FileSource;
    21 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
    22 import com.github.tomakehurst.wiremock.extension.Parameters;
    23 import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
    24 import com.github.tomakehurst.wiremock.http.FixedDelayDistribution;
    25 import com.github.tomakehurst.wiremock.http.HttpHeader;
    26 import com.github.tomakehurst.wiremock.http.HttpHeaders;
    27 import com.github.tomakehurst.wiremock.http.QueryParameter;
    28 import com.github.tomakehurst.wiremock.http.Request;
    29 import com.github.tomakehurst.wiremock.http.Response;
    30 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
    31 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
    32 import com.github.tomakehurst.wiremock.matching.AnythingPattern;
    33 import com.github.tomakehurst.wiremock.matching.EqualToPattern;
    34 import com.github.tomakehurst.wiremock.matching.StringValuePattern;
    35 import mockit.Mock;
    36 import mockit.MockUp;
    3719import org.junit.jupiter.api.AfterEach;
    3820import org.junit.jupiter.api.BeforeEach;
    … …  
    5032import org.openstreetmap.josm.tools.Logging;
    5133
     34import com.github.tomakehurst.wiremock.client.WireMock;
     35import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
     36import com.github.tomakehurst.wiremock.extension.ResponseTransformerV2;
     37import com.github.tomakehurst.wiremock.http.FixedDelayDistribution;
     38import com.github.tomakehurst.wiremock.http.HttpHeader;
     39import com.github.tomakehurst.wiremock.http.HttpHeaders;
     40import com.github.tomakehurst.wiremock.http.QueryParameter;
     41import com.github.tomakehurst.wiremock.http.Request;
     42import com.github.tomakehurst.wiremock.http.Response;
     43import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
     44import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
     45import com.github.tomakehurst.wiremock.matching.AnythingPattern;
     46import com.github.tomakehurst.wiremock.matching.EqualToPattern;
     47import com.github.tomakehurst.wiremock.matching.StringValuePattern;
     48import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
     49import mockit.Mock;
     50import mockit.MockUp;
     51
    5252@BasicPreferences
    5353@HTTP
    … …  
    7070    }
    7171
    72     private static class OAuthServerWireMock extends ResponseTransformer {
     72    private static final class OAuthServerWireMock implements ResponseTransformerV2 {
    7373        String stateToReturn;
    7474        ConnectionProblems connectionProblems = ConnectionProblems.NONE;
     75
    7576        @Override
    76         public Response transform(Request request, Response response, FileSource files, Parameters parameters) {
     77        public Response transform(Response response, ServeEvent serveEvent) {
     78            final var request = serveEvent.getRequest();
    7779            try {
    7880                if (request.getUrl().startsWith("/oauth2/authorize")) {
    … …  
    158160    /**
    159161     * Set up the default wiremock information
    160      * @param wireMockRuntimeInfo The info to set up
    161162     */
    162163    @BeforeEach
    163     void setupWireMock(WireMockRuntimeInfo wireMockRuntimeInfo) {
     164    void setupWireMock() {
     165        final WireMockRuntimeInfo wireMockRuntimeInfo = wml.getRuntimeInfo();
    164166        Config.getPref().put("osm-server.url", wireMockRuntimeInfo.getHttpBaseUrl() + "/api/");
    165167        new MockUp<JosmUrls>() {
    … …  
    195197
    196198    @Test
    197     void testAuthorize(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
     199    void testAuthorize() throws IOException {
    198200        final AtomicReference<Optional<IOAuthToken>> consumer = new AtomicReference<>();
    199         final HttpClient client = generateClient(wireMockRuntimeInfo, consumer);
     201        final HttpClient client = generateClient(wml.getRuntimeInfo(), consumer);
    200202        try {
    201203            HttpClient.Response response = client.connect();
    … …  
    212214
    213215    @Test
    214     void testAuthorizeBadState(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
     216    void testAuthorizeBadState() throws IOException {
    215217        oauthServer.stateToReturn = "Bad_State";
    216218        final AtomicReference<Optional<IOAuthToken>> consumer = new AtomicReference<>();
    217         final HttpClient client = generateClient(wireMockRuntimeInfo, consumer);
     219        final HttpClient client = generateClient(wml.getRuntimeInfo(), consumer);
    218220        try {
    219221            HttpClient.Response response = client.connect();
    … …  
    228230
    229231    @Test
    230     void testSocketTimeout(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
     232    void testSocketTimeout() throws Exception {
    231233        // 1s before timeout
    232234        Config.getPref().putInt("socket.timeout.connect", 1);
    … …  
    235237
    236238        final AtomicReference<Optional<IOAuthToken>> consumer = new AtomicReference<>();
    237         final HttpClient client = generateClient(wireMockRuntimeInfo, consumer)
     239        final HttpClient client = generateClient(wml.getRuntimeInfo(), consumer)
    238240                .setConnectTimeout(15_000).setReadTimeout(30_000);
    239241        try {

  • trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

    r18870 r19050  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.projection;
     3
     4import static org.junit.jupiter.api.Assertions.fail;
    35
    46import java.io.BufferedReader;
    … …  
    4547    private static final String PROJECTION_DATA_FILE = "nodist/data/projection/projection-regression-test-data";
    4648
    47     private static class TestData {
     49    private static final class TestData {
    4850        public String code;
    4951        public LatLon ll;
    … …  
    185187        if (fail.length() > 0) {
    186188            System.err.println(fail);
    187             throw new AssertionError(fail.toString());
     189            fail(fail.toString());
    188190        }
    189191    }

  • trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java

    r18866 r19050  
    324324    }
    325325
    326     private static class PasteMembersActionMock extends MockUp<PasteMembersAction> {
     326    private static final class PasteMembersActionMock extends MockUp<PasteMembersAction> {
    327327        @Mock
    328         protected void updateEnabledState() {
     328        public void updateEnabledState() {
    329329            // Do nothing
    330330        }

  • trunk/test/unit/org/openstreetmap/josm/gui/io/SaveLayersDialogTest.java

    r19011 r19050  
    162162    }
    163163
    164     private static class GraphicsEnvironmentMock extends MockUp<GraphicsEnvironment> {
     164    private static final class GraphicsEnvironmentMock extends MockUp<GraphicsEnvironment> {
    165165        @Mock
    166166        public static boolean isHeadless(Invocation invocation) {
    … …  
    169169    }
    170170
    171     private static class SaveLayersDialogMock extends MockUp<SaveLayersDialog> {
     171    private static final class SaveLayersDialogMock extends MockUp<SaveLayersDialog> {
    172172        private final SaveLayersModel model = new SaveLayersModel();
    173173        private int getUserActionCalled = 0;

  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java

    r18694 r19050  
    1919import javax.swing.JOptionPane;
    2020
    21 import com.github.tomakehurst.wiremock.client.WireMock;
    22 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
    23 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
    24 import mockit.MockUp;
    2521import org.awaitility.Awaitility;
    2622import org.junit.jupiter.api.AfterEach;
    … …  
    4440import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
    4541
     42import com.github.tomakehurst.wiremock.client.WireMock;
     43import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
     44import mockit.MockUp;
     45
    4646/**
    4747 * Higher level tests of {@link PluginPreference} class.
    … …  
    132132     */
    133133    @Test
    134     void testInstallWithoutUpdate(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
     134    void testInstallWithoutUpdate() throws Exception {
    135135        final PluginServer pluginServer = new PluginServer(
    136136            new PluginServer.RemotePlugin(this.referenceDummyJarNew),
    … …  
    138138            new PluginServer.RemotePlugin(null, Collections.singletonMap("Plugin-Version", "2"), "irrelevant_plugin")
    139139        );
    140         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     140        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    141141        Config.getPref().putList("plugins", Collections.singletonList("dummy_plugin"));
    142142
    … …  
    238238     */
    239239    @Test
    240     void testDisablePluginWithUpdatesAvailable(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
     240    void testDisablePluginWithUpdatesAvailable() throws Exception {
    241241        final PluginServer pluginServer = new PluginServer(
    242242            new PluginServer.RemotePlugin(this.referenceDummyJarNew),
    … …  
    244244            new PluginServer.RemotePlugin(null, null, "irrelevant_plugin")
    245245        );
    246         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     246        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    247247        Config.getPref().putList("plugins", Arrays.asList("baz_plugin", "dummy_plugin"));
    248248
    … …  
    346346     */
    347347    @Test
    348     void testUpdateOnlySelectedPlugin(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
     348    void testUpdateOnlySelectedPlugin() throws Exception {
    349349        TestUtils.assumeWorkingJMockit();
    350350        final PluginServer pluginServer = new PluginServer(
    … …  
    352352            new PluginServer.RemotePlugin(this.referenceBazJarNew)
    353353        );
    354         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     354        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    355355        Config.getPref().putList("plugins", Arrays.asList("baz_plugin", "dummy_plugin"));
    356356
    … …  
    516516     */
    517517    @Test
    518     void testUpdateWithNoAvailableUpdates(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
     518    void testUpdateWithNoAvailableUpdates() throws Exception {
    519519        TestUtils.assumeWorkingJMockit();
    520520        final PluginServer pluginServer = new PluginServer(
    … …  
    523523            new PluginServer.RemotePlugin(null, Collections.singletonMap("Plugin-Version", "123"), "irrelevant_plugin")
    524524        );
    525         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     525        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    526526        Config.getPref().putList("plugins", Arrays.asList("baz_plugin", "dummy_plugin"));
    527527
    … …  
    644644     */
    645645    @Test
    646     void testInstallWithoutRestartRequired(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
     646    void testInstallWithoutRestartRequired() throws Exception {
    647647        TestUtils.assumeWorkingJMockit();
    648648        final boolean[] loadPluginsCalled = new boolean[] {false};
    … …  
    665665            new PluginServer.RemotePlugin(this.referenceBazJarNew)
    666666        );
    667         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     667        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    668668        Config.getPref().putList("plugins", Collections.emptyList());
    669669
    … …  
    756756    @AssumeRevision("Revision: 7000\n")
    757757    @Test
    758     void testInstallMultiVersion(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
     758    void testInstallMultiVersion() throws Exception {
    759759        TestUtils.assumeWorkingJMockit();
    760760
    … …  
    766766            ))
    767767        );
    768         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     768        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    769769        // need to actually serve this older jar from somewhere
    770770        pluginServerRule.stubFor(

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

    r18650 r19050  
    2020 */
    2121class AuthorizationHandlerTest {
    22     private static class TestAuthorizationConsumer implements AuthorizationHandler.AuthorizationConsumer {
     22    private static final class TestAuthorizationConsumer implements AuthorizationHandler.AuthorizationConsumer {
    2323        boolean validated;
    2424        boolean handled;

  • trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerJOSMTooOldTest.java

    r18870 r19050  
    3434import com.github.tomakehurst.wiremock.client.WireMock;
    3535import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
    36 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
    3736
    3837/**
    … …  
    110109     */
    111110    @Test
    112     void testUpdatePluginsDownloadBoth(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
     111    void testUpdatePluginsDownloadBoth() throws IOException {
    113112        TestUtils.assumeWorkingJMockit();
    114113        final PluginServer pluginServer = new PluginServer(
    … …  
    116115            new PluginServer.RemotePlugin(this.referenceBazJarNew)
    117116        );
    118         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     117        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    119118        Config.getPref().putList("plugins", Arrays.asList("dummy_plugin", "baz_plugin"));
    120119
    … …  
    172171     */
    173172    @Test
    174     void testUpdatePluginsSkipOne(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
     173    void testUpdatePluginsSkipOne() throws IOException {
    175174        TestUtils.assumeWorkingJMockit();
    176175        final PluginServer pluginServer = new PluginServer(
    … …  
    178177            new PluginServer.RemotePlugin(this.referenceBazJarNew)
    179178        );
    180         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     179        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    181180        Config.getPref().putList("plugins", Arrays.asList("dummy_plugin", "baz_plugin"));
    182181
    … …  
    244243     */
    245244    @Test
    246     void testUpdatePluginsUnexpectedlyJOSMTooOld(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
     245    void testUpdatePluginsUnexpectedlyJOSMTooOld() throws IOException {
    247246        TestUtils.assumeWorkingJMockit();
    248247        final PluginServer pluginServer = new PluginServer(
    … …  
    250249            new PluginServer.RemotePlugin(this.referenceBazJarNew, Collections.singletonMap("Plugin-Mainversion", "5500"))
    251250        );
    252         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     251        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    253252        Config.getPref().putList("plugins", Collections.singletonList("baz_plugin"));
    254253
    … …  
    299298    @Test
    300299    @AssumeRevision("Revision: 7200\n")
    301     void testUpdatePluginsMultiVersionInsufficient(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
     300    void testUpdatePluginsMultiVersionInsufficient() throws IOException {
    302301        TestUtils.assumeWorkingJMockit();
    303302
    … …  
    308307            ))
    309308        );
    310         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     309        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    311310        Config.getPref().putList("plugins", Arrays.asList("qux_plugin", "baz_plugin"));
    312311

  • trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerMultiVersionTest.java

    r18870 r19050  
    9191    @AssumeRevision("Revision: 7501\n")
    9292    @Test
    93     void testUpdatePluginsOneMultiVersion(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
     93    void testUpdatePluginsOneMultiVersion() throws Exception {
    9494        TestUtils.assumeWorkingJMockit();
    9595
    9696        final String quxNewerServePath = "/qux/newer.jar";
    97         final Map<String, String> attrOverrides = new HashMap<String, String>() {{
     97        final Map<String, String> attrOverrides = new HashMap<>() {{
    9898            put("7500_Plugin-Url", "432;" + pluginServerRule.url(quxNewerServePath));
    9999            put("7499_Plugin-Url", "346;" + pluginServerRule.url("/not/served.jar"));
    … …  
    104104            new PluginServer.RemotePlugin(this.referenceQuxJarNewest, attrOverrides)
    105105        );
     106        final WireMockRuntimeInfo wireMockRuntimeInfo = pluginServerRule.getRuntimeInfo();
    106107        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
    107108        // need to actually serve this older jar from somewhere
    … …  
    158159    @AssumeRevision("Revision: 7000\n")
    159160    @Test
    160     void testUpdatePluginsExistingVersionLatestPossible(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
     161    void testUpdatePluginsExistingVersionLatestPossible() throws Exception {
    161162        TestUtils.assumeWorkingJMockit();
    162163
    163         final Map<String, String> attrOverrides = new HashMap<String, String>() {{
     164        final Map<String, String> attrOverrides = new HashMap<>() {{
    164165            put("7500_Plugin-Url", "432;" + pluginServerRule.url("/dont.jar"));
    165166            put("7499_Plugin-Url", "346;" + pluginServerRule.url("/even.jar"));
    … …  
    170171            new PluginServer.RemotePlugin(this.referenceQuxJarNewest, attrOverrides)
    171172        );
    172         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
     173        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
    173174        Config.getPref().putList("plugins", Arrays.asList("qux_plugin", "baz_plugin"));
    174175

  • trunk/test/unit/org/openstreetmap/josm/spi/lifecycle/LifecycleTest.java

    r18893 r19050  
    1919@Projection
    2020class LifecycleTest {
    21     private static class InitStatusListenerStub implements InitStatusListener {
     21    private static final class InitStatusListenerStub implements InitStatusListener {
    2222
    2323        boolean updated;

  • trunk/test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java

    r18870 r19050  
    4646    }
    4747
    48     private static void testGetWikiLanguagePrefixes(LanguageInfo.LocaleType type, String...expected) {
     48    private static void testGetWikiLanguagePrefixes(LanguageInfo.LocaleType type, String... expected) {
    4949        final List<String> actual = Stream.of(EN_NZ, DE_DE, PT_BR, CA_ES_VALENCIA, ZN_CN, ZN_TW, AST, EN_GB, RU, NB)
    5050                .map(locale -> LanguageInfo.getWikiLanguagePrefix(locale, type))
Note: See TracChangeset for help on using the changeset viewer.