Changeset 10977 in josm


Ignore:
Timestamp:
2016-09-08T23:15:39+02:00 (9 years ago)
Author:
Don-vip
Message:

add/update unit tests, fix indentation

Location:
trunk
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java

    r10878 r10977  
    9494                        // Find the non-blank value in the map
    9595                        v.entrySet().stream().filter(entry -> !Objects.equals(entry.getKey(), ""))
    96                                 /* I18n: properties display partial string joined with comma, first is count, second is value */
     96                            /* I18n: properties display partial string joined with comma, first is count, second is value */
    9797                            .findAny().ifPresent(entry -> sb.append(tr("{0} ''{1}''", entry.getValue().toString(), entry.getKey())));
    9898                    } else {

  • trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

    r10971 r10977  
    16801680            ts = dts.getTileSet(displayZoomLevel);
    16811681            if (!dts.getTileSetInfo(displayZoomLevel).hasAllLoadedTiles && displayZoomLevel < zoom) {
    1682                  // if we are showing tiles from lower zoom level, ensure that all tiles are loaded as they are few,
    1683                  // and should not trash the tile cache
    1684                  // This is especially needed when dts.getTileSet(zoom).tooLarge() is true and we are not loading tiles
     1682                // if we are showing tiles from lower zoom level, ensure that all tiles are loaded as they are few,
     1683                // and should not trash the tile cache
     1684                // This is especially needed when dts.getTileSet(zoom).tooLarge() is true and we are not loading tiles
    16851685                ts.loadAllTiles(false);
    16861686            }

  • trunk/test/config/unit-josm.home

    • Property svn:ignore

      •  

        old new  
        99ebdirigo
        1010autosave
         11styles

  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java

    r10378 r10977  
    44import static org.junit.Assert.assertNotNull;
    55
    6 import org.junit.BeforeClass;
     6import org.junit.Rule;
    77import org.junit.Test;
    8 import org.openstreetmap.josm.JOSMFixture;
    98import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
     9import org.openstreetmap.josm.testutils.JOSMTestRules;
     10
     11import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1012
    1113/**
    … …  
    1517
    1618    /**
    17      * Setup test.
     19     * Setup tests
    1820     */
    19     @BeforeClass
    20     public static void setUpBeforeClass() {
    21         JOSMFixture.createUnitTestFixture().init();
    22     }
     21    @Rule
     22    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     23    public JOSMTestRules test = new JOSMTestRules().platform().commands();
    2324
    2425    /**
Note: See TracChangeset for help on using the changeset viewer.