Changeset 18475 in josm for trunk/test


Ignore:
Timestamp:
2022-06-08T19:09:15+02:00 (3 years ago)
Author:
taylor.smock
Message:

Fix #21794: Allow for cases where tags can be URL or key values in Tag2Link

This also adds a Pattern cache (memory only) to avoid many allocations for
the same pattern in Tag2Link.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java

    r18037 r18475  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.tools;
     3
     4import static org.junit.jupiter.api.Assertions.assertEquals;
     5import static org.junit.jupiter.api.Assertions.assertTrue;
    36
    47import java.util.ArrayList;
     
    69import java.util.List;
    710
    8 import org.junit.Assert;
    911import org.junit.jupiter.api.Test;
     12import org.junit.jupiter.params.ParameterizedTest;
     13import org.junit.jupiter.params.provider.ValueSource;
    1014import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1115
     
    2327
    2428    void checkLinks(String... expected) {
    25         Assert.assertEquals(Arrays.asList(expected), links);
     29        assertEquals(Arrays.asList(expected), this.links);
    2630    }
    2731
     
    3236    void testInitialize() {
    3337        Tag2Link.initialize();
    34         Assert.assertTrue("obtains at least 40 rules", Tag2Link.wikidataRules.size() > 40);
     38        assertTrue(Tag2Link.wikidataRules.size() > 40, "obtains at least 40 rules");
     39    }
     40
     41    /**
     42     * Unit test for links that may come in multiple forms.
     43     * Example: <a href="https://wiki.osm.org/wiki/Key:contact:facebook">https://wiki.openstreetmap.org/wiki/Key:contact:facebook</a>
     44     *
     45     * See also JOSM #21794
     46     * @param value The tag value for "contact:facebook"
     47     */
     48    @ParameterizedTest
     49    @ValueSource(strings = {"https://www.facebook.com/FacebookUserName", "FacebookUserName"})
     50    void testUrlKeyMultipleForms(final String value) {
     51        // We need the wikidata rules Since testInitialize tests initialization, reuse it.
     52        if (!Tag2Link.wikidataRules.containsKey("contact:facebook")) {
     53            this.testInitialize();
     54        }
     55        Tag2Link.getLinksForTag("contact:facebook", value, this::addLink);
     56        this.checkLinks("Open unavatar.now.sh // https://unavatar.now.sh/facebook/FacebookUserName",
     57                "Open facebook.com // https://www.facebook.com/FacebookUserName",
     58                "Open messenger.com // https://www.messenger.com/t/FacebookUserName");
    3559    }
    3660
Note: See TracChangeset for help on using the changeset viewer.