Changeset 10758 in josm for trunk


Ignore:
Timestamp:
2016-08-07T17:39:42+02:00 (8 years ago)
Author:
Don-vip
Message:

sonar - squid:S3578 - Test methods should comply with a naming convention

Location:
trunk/test
Files:
80 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java

    r9669 r10758  
    4545     */
    4646    @Test
    47     public void checkPopularTags() throws SAXException, IOException, ParseException {
     47    public void testCheckPopularTags() throws SAXException, IOException, ParseException {
    4848        TaggingPresets.readFromPreferences();
    4949        new TagChecker().initialize();

  • trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

    r10222 r10758  
    271271
    272272    @Test
    273     public void multiGetWithNonExistingNode() throws OsmTransferException {
     273    public void testMultiGetWithNonExistingNode() throws OsmTransferException {
    274274        MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
    275275        ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());

  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r10378 r10758  
    273273
    274274    @Test
    275     public void testBackreferenceForNode_Full() throws OsmTransferException {
     275    public void testBackreferenceForNodeFull() throws OsmTransferException {
    276276        Node n = lookupNode(ds, 0);
    277277        assertNotNull(n);
    … …  
    357357
    358358    @Test
    359     public void testBackreferenceForWay_Full() throws OsmTransferException {
     359    public void testBackreferenceForWayFull() throws OsmTransferException {
    360360        Way w = lookupWay(ds, 1);
    361361        assertNotNull(w);
    … …  
    506506
    507507    @Test
    508     public void testBackreferenceForRelation_Full() throws OsmTransferException {
     508    public void testBackreferenceForRelationFull() throws OsmTransferException {
    509509        Relation r = lookupRelation(ds, 1);
    510510        assertNotNull(r);

  • trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java

    r10733 r10758  
    147147
    148148    @Test
    149     public void test418() throws IOException {
     149    public void testHttp418() throws IOException {
    150150        // https://tools.ietf.org/html/rfc2324
    151151        final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/status/418")).connect(progress);

  • trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java

    r10222 r10758  
    5656    @Test
    5757    @SuppressFBWarnings(value = "DM_STRING_CTOR", justification = "test Strings that are interned and those that are not")
    58     public void measureStringEqualsIntern() {
     58    public void testMeasureStringEqualsIntern() {
    5959        String str1Interned = "string1";
    6060        String str1InternedB = "string1";

  • trunk/test/performance/org/openstreetmap/josm/data/osm/RoundingPerformanceTest.java

    r10222 r10758  
    2525    @Test
    2626    @SuppressFBWarnings(value = "RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT")
    27     public void test() {
     27    public void testRounding() {
    2828        final int n = 1000000;
    2929        long start = System.nanoTime();

  • trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java

    r10222 r10758  
    6262     */
    6363    @Test
    64     public void test() throws Exception {
     64    public void testPlain() throws Exception {
    6565        runTest(".osm-file", true);
    6666    }

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

    r10436 r10758  
    4545     */
    4646    @Test
    47     public void nodesOpenWay() {
     47    public void testNodesOpenWay() {
    4848        DataSet dataSet = new DataSet();
    4949        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
    … …  
    8484     */
    8585    @Test
    86     public void nodesClosedWay() {
     86    public void testNodesClosedWay() {
    8787        DataSet dataSet = new DataSet();
    8888        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
    … …  
    124124     */
    125125    @Test
    126     public void nodesOpenWays() {
     126    public void testNodesOpenWays() {
    127127        DataSet dataSet = new DataSet();
    128128        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);

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

    r9669 r10758  
    6262     */
    6363    @Test
    64     public void equalsContract() {
     64    public void testEqualsContract() {
    6565        EqualsVerifier.forClass(NodePair.class).usingGetClass()
    6666            .withPrefabValues(Node.class, new Node(1), new Node(2))

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

    r10436 r10758  
    7474     */
    7575    @Test
    76     public void test7421_0() {
     76    public void testTicket7421case0() {
    7777        DataSet dataSet = new DataSet();
    7878        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
    … …  
    139139     */
    140140    @Test
    141     public void test7421_1() {
     141    public void testTicket7421case1() {
    142142        DataSet dataSet = new DataSet();
    143143        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);

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

    r10299 r10758  
    4141     */
    4242    @Test
    43     public void equalsContract() {
     43    public void testEqualsContract() {
    4444        EqualsVerifier.forClass(ExtensionFileFilter.class).usingGetClass()
    4545            .verify();

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

    r10436 r10758  
    5050     */
    5151    @Test
    52     public void test10396() {
     52    public void testTicket10396() {
    5353        DataSet dataSet = new DataSet();
    5454        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);

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

    r10436 r10758  
    8686    @Test
    8787    @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
    88     public void test10748() {
     88    public void testTicket10748() {
    8989        DataSet dataSet = new DataSet();
    9090        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);

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

    r10663 r10758  
    136136     */
    137137    @Test
    138     public void equalsContract() {
     138    public void testEqualsContract() {
    139139        EqualsVerifier.forClass(AddCommand.class).usingGetClass()
    140140            .withPrefabValues(OsmPrimitive.class,

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

    r10663 r10758  
    257257     */
    258258    @Test
    259     public void equalsContract() {
     259    public void testEqualsContract() {
    260260        EqualsVerifier.forClass(AddPrimitivesCommand.class).usingGetClass()
    261261            .withPrefabValues(DataSet.class,

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

    r10663 r10758  
    152152     */
    153153    @Test
    154     public void equalsContract() {
     154    public void testEqualsContract() {
    155155        EqualsVerifier.forClass(ChangeCommand.class).usingGetClass()
    156156            .withPrefabValues(DataSet.class,

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

    r10663 r10758  
    124124     */
    125125    @Test
    126     public void equalsContract() {
     126    public void testEqualsContract() {
    127127        EqualsVerifier.forClass(ChangeNodesCommand.class).usingGetClass()
    128128            .withPrefabValues(Way.class,

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

    r10663 r10758  
    278278     */
    279279    @Test
    280     public void equalsContract() {
     280    public void testEqualsContract() {
    281281        EqualsVerifier.forClass(ChangePropertyCommand.class).usingGetClass()
    282282            .withPrefabValues(DataSet.class,

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

    r10663 r10758  
    148148     */
    149149    @Test
    150     public void equalsContract() {
     150    public void testEqualsContract() {
    151151        EqualsVerifier.forClass(ChangePropertyKeyCommand.class).usingGetClass()
    152152            .withPrefabValues(DataSet.class,

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

    r10663 r10758  
    145145     */
    146146    @Test
    147     public void equalsContract() {
     147    public void testEqualsContract() {
    148148        EqualsVerifier.forClass(ChangeRelationMemberRoleCommand.class).usingGetClass()
    149149            .withPrefabValues(Relation.class,

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

    r10663 r10758  
    8181     */
    8282    @Test
    83     public void equalsContract() {
     83    public void testEqualsContract() {
    8484        EqualsVerifier.forClass(Command.class).usingGetClass()
    8585            .withPrefabValues(DataSet.class,

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

    r10663 r10758  
    376376     */
    377377    @Test
    378     public void equalsContract() {
     378    public void testEqualsContract() {
    379379        EqualsVerifier.forClass(DeleteCommand.class).usingGetClass()
    380380            .withPrefabValues(DataSet.class,

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

    r10663 r10758  
    259259     */
    260260    @Test
    261     public void equalsContract() {
     261    public void testEqualsContract() {
    262262        EqualsVerifier.forClass(MoveCommand.class).usingGetClass()
    263263            .withPrefabValues(LatLon.class,

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

    r10663 r10758  
    144144     */
    145145    @Test
    146     public void equalsContract() {
     146    public void testEqualsContract() {
    147147        EqualsVerifier.forClass(PurgeCommand.class).usingGetClass()
    148148            .withPrefabValues(DataSet.class,

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

    r10663 r10758  
    122122     */
    123123    @Test
    124     public void equalsContract() {
     124    public void testEqualsContract() {
    125125        EqualsVerifier.forClass(RemoveNodesCommand.class).usingGetClass()
    126126            .withPrefabValues(Way.class,

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

    r10663 r10758  
    133133     */
    134134    @Test
    135     public void equalsContract() {
     135    public void testEqualsContract() {
    136136        EqualsVerifier.forClass(RotateCommand.class).usingGetClass()
    137137                .withPrefabValues(LatLon.class, LatLon.ZERO, new LatLon(45, 45))

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

    r10663 r10758  
    133133     */
    134134    @Test
    135     public void equalsContract() {
     135    public void testEqualsContract() {
    136136        EqualsVerifier.forClass(ScaleCommand.class).usingGetClass()
    137137            .withPrefabValues(LatLon.class,

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

    r10663 r10758  
    147147     */
    148148    @Test
    149     public void equalsContract() {
     149    public void testEqualsContract() {
    150150        EqualsVerifier.forClass(SelectCommand.class).usingGetClass()
    151151            .withPrefabValues(DataSet.class,

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

    r10663 r10758  
    170170     */
    171171    @Test
    172     public void equalsContract() {
     172    public void testEqualsContract() {
    173173        EqualsVerifier.forClass(SequenceCommand.class).usingGetClass()
    174174            .withPrefabValues(Command.class,

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

    r9943 r10758  
    3030     */
    3131    @Test
    32     public void equalsContract() {
     32    public void testEqualsContract() {
    3333        EqualsVerifier.forClass(TransformNodesCommand.class).usingGetClass()
    3434            .withPrefabValues(LatLon.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java

    r10436 r10758  
    7676     */
    7777    @Test
    78     public void equalsContract() {
     78    public void testEqualsContract() {
    7979        EqualsVerifier.forClass(ConflictAddCommand.class).usingGetClass()
    8080            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java

    r9943 r10758  
    3131     */
    3232    @Test
    33     public void equalsContract() {
     33    public void testEqualsContract() {
    3434        EqualsVerifier.forClass(ConflictResolveCommand.class).usingGetClass()
    3535            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java

    r10436 r10758  
    9191     */
    9292    @Test
    93     public void equalsContract() {
     93    public void testEqualsContract() {
    9494        EqualsVerifier.forClass(CoordinateConflictResolveCommand.class).usingGetClass()
    9595            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java

    r9943 r10758  
    3232     */
    3333    @Test
    34     public void equalsContract() {
     34    public void testEqualsContract() {
    3535        EqualsVerifier.forClass(DeletedStateConflictResolveCommand.class).usingGetClass()
    3636            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java

    r9943 r10758  
    3232     */
    3333    @Test
    34     public void equalsContract() {
     34    public void testEqualsContract() {
    3535        EqualsVerifier.forClass(ModifiedConflictResolveCommand.class).usingGetClass()
    3636            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java

    r9943 r10758  
    3232     */
    3333    @Test
    34     public void equalsContract() {
     34    public void testEqualsContract() {
    3535        EqualsVerifier.forClass(RelationMemberConflictResolverCommand.class).usingGetClass()
    3636            .withPrefabValues(Relation.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java

    r9943 r10758  
    3232     */
    3333    @Test
    34     public void equalsContract() {
     34    public void testEqualsContract() {
    3535        EqualsVerifier.forClass(TagConflictResolveCommand.class).usingGetClass()
    3636            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java

    r9943 r10758  
    3232     */
    3333    @Test
    34     public void equalsContract() {
     34    public void testEqualsContract() {
    3535        EqualsVerifier.forClass(VersionConflictResolveCommand.class).usingGetClass()
    3636            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java

    r9943 r10758  
    3232     */
    3333    @Test
    34     public void equalsContract() {
     34    public void testEqualsContract() {
    3535        EqualsVerifier.forClass(WayNodesConflictResolverCommand.class).usingGetClass()
    3636            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/data/BoundsTest.java

    r9498 r10758  
    1515
    1616    @Test
    17     public void crossingTests() {
     17    public void testCrossing() {
    1818        Bounds b1 = new Bounds(0, 170, 50, -170);
    1919        assertTrue(b1.crosses180thMeridian());

  • trunk/test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java

    r10334 r10758  
    2828     */
    2929    @Test
    30     public void equalsContract() {
     30    public void testEqualsContract() {
    3131        EqualsVerifier.forClass(CachedLatLon.class).usingGetClass()
    3232            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java

    r10378 r10758  
    130130     */
    131131    @Test
    132     public void equalsContract() {
     132    public void testEqualsContract() {
    133133        EqualsVerifier.forClass(LatLon.class).usingGetClass()
    134134            .withPrefabValues(DecimalFormat.class, new DecimalFormat("00.0"), new DecimalFormat("00.000"))

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

    r10378 r10758  
    7777     */
    7878    @Test
    79     public void testEPSG4326_widebounds() {
     79    public void testEPSG4326widebounds() {
    8080        Main.setProjection(new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=-180,53,180,54"));
    8181        TemplatedWMSTileSource source = getSource();
    … …  
    8989     */
    9090    @Test
    91     public void testEPSG4326_narrowbounds() {
     91    public void testEPSG4326narrowbounds() {
    9292        Main.setProjection(new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=18,-90,20,90"));
    9393        TemplatedWMSTileSource source = getSource();
    … …  
    117117     */
    118118    @Test
    119     public void testEPSG3006_withbounds() {
     119    public void testEPSG3006withbounds() {
    120120        Main.setProjection(
    121121                new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 "
    … …  
    132132     */
    133133    @Test
    134     public void testEPSG3006_withoutbounds() {
     134    public void testEPSG3006withoutbounds() {
    135135        Main.setProjection(
    136136                new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 "

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

    r10378 r10758  
    215215
    216216    @Test
    217     public void test12168() throws IOException {
     217    public void testTicket12168() throws IOException {
    218218        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
    219219        WMTSTileSource testSource = new WMTSTileSource(testImagery12168);

  • trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java

    r10098 r10758  
    5757     */
    5858    @Test
    59     public void equalsContract() {
     59    public void testEqualsContract() {
    6060        EqualsVerifier.forClass(Note.class).usingGetClass()
    6161            .withIgnoredFields("latLon", "createdAt", "closedAt", "state", "comments")

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

    r10222 r10758  
    5858     */
    5959    @Test
    60     public void equalsContract() {
     60    public void testEqualsContract() {
    6161        EqualsVerifier.forClass(OAuthParameters.class).usingGetClass().verify();
    6262    }

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

    r10201 r10758  
    3333     */
    3434    @Test
    35     public void equalsContract() {
     35    public void testEqualsContract() {
    3636        EqualsVerifier.forClass(OAuthToken.class).usingGetClass().verify();
    3737    }

  • trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java

    r8857 r10758  
    2828
    2929    @Test
    30     public void oneNewRelationOnly() {
     30    public void testOneNewRelationOnly() {
    3131        Relation r = new Relation();
    3232        r.put("name", "r1");
    … …  
    4848
    4949    @Test
    50     public void newParentChildPair() {
     50    public void testNewParentChildPair() {
    5151        DataSet ds = new DataSet();
    5252        Relation r1 = new Relation();
    … …  
    7575
    7676    @Test
    77     public void oneExistingAndThreNewInAChain() {
     77    public void testOneExistingAndThreNewInAChain() {
    7878        DataSet ds = new DataSet();
    7979
    … …  
    118118
    119119    @Test
    120     public void oneParentTwoNewChildren() {
     120    public void testOneParentTwoNewChildren() {
    121121        DataSet ds = new DataSet();
    122122        Relation r1 = new Relation();
    … …  
    151151
    152152    @Test // for ticket #9624
    153     public void deleteOneParentTwoNewChildren() {
     153    public void testDeleteOneParentTwoNewChildren() {
    154154        DataSet ds = new DataSet();
    155155        Relation r1 = new Relation(1);
    … …  
    198198
    199199    @Test // for ticket #9656
    200     public void deleteWay() {
     200    public void testDeleteWay() {
    201201        DataSet ds = new DataSet();
    202202        final Way way = new Way(1, 2);
    … …  
    239239
    240240    @Test
    241     public void oneCycle() {
     241    public void testOneCycle() {
    242242        DataSet ds = new DataSet();
    243243        Relation r1 = new Relation();

  • trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java

    r10336 r10758  
    2626     */
    2727    @Test
    28     public void equalsContract() {
     28    public void testEqualsContract() {
    2929        EqualsVerifier.forClass(BBox.class).usingGetClass()
    3030            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

    r10378 r10758  
    8181     */
    8282    @Test
    83     public void nodeSimple_IdenticalNoConflict() {
     83    public void testNodeSimpleIdenticalNoConflict() {
    8484        Node n = new Node(LatLon.ZERO);
    8585        n.setOsmId(1, 1);
    … …  
    113113     * two  nodes, my is unmodified, their is updated and has a higher version
    114114     * => their version is going to be the merged version
    115      *
    116      */
    117     @Test
    118     public void nodeSimple_locallyUnmodifiedNoConflict() {
     115     */
     116    @Test
     117    public void testNodeSimpleLocallyUnmodifiedNoConflict() {
    119118        Node n = new Node(LatLon.ZERO);
    120119        n.setOsmId(1, 1);
    … …  
    156155     */
    157156    @Test
    158     public void nodeSimple_TagConflict() {
     157    public void testNodeSimpleTagConflict() {
    159158        Node n = new Node(LatLon.ZERO);
    160159        n.setOsmId(1, 1);
    … …  
    190189     */
    191190    @Test
    192     public void nodeSimple_DeleteConflict() {
     191    public void testNodeSimpleDeleteConflict() {
    193192        Node n = new Node(1, 1);
    194193        n.setCoor(LatLon.ZERO);
    … …  
    218217     * My node is deleted, their node has the same id and version and is not deleted.
    219218     * => mine has precedence
    220      *
    221      */
    222     @Test
    223     public void nodeSimple_DeleteConflict_2() {
     219     */
     220    @Test
     221    public void testNodeSimpleDeleteConflict2() {
    224222        Node n = new Node(LatLon.ZERO);
    225223        n.setOsmId(1, 1);
    … …  
    249247     */
    250248    @Test
    251     public void nodeSimple_DeleteConflict_3() {
     249    public void testNodeSimpleDeleteConflict3() {
    252250        Node n = new Node(new LatLon(1, 1));
    253251        n.setDeleted(true);
    … …  
    270268     *
    271269     * => take mine
    272      *
    273      */
    274     @Test
    275     public void nodeSimple_DeleteConflict_4() {
     270     */
     271    @Test
     272    public void testNodeSimpleDeleteConflict4() {
    276273        Node n = new Node(new LatLon(1, 1));
    277274        n.setDeleted(true);
    … …  
    282279        their.addPrimitive(n1);
    283280
    284 
    285281        DataSetMerger visitor = new DataSetMerger(my, their);
    286282        visitor.merge();
    … …  
    297293     *
    298294     * => merge it onto my node.
    299      *
    300      */
    301     @Test
    302     public void nodeSimple_NoIdSemanticallyEqual() {
     295     */
     296    @Test
     297    public void testNodeSimpleNoIdSemanticallyEqual() {
    303298
    304299        Calendar cal = GregorianCalendar.getInstance();
    … …  
    341336     *
    342337     * => merge it onto my node. My node becomes complete
    343      *
    344      */
    345     @Test
    346     public void nodeSimple_IncompleteNode() {
     338     */
     339    @Test
     340    public void testNodeSimpleIncompleteNode() {
    347341
    348342        Node n = new Node(1);
    … …  
    373367     *
    374368     * => merge it onto my way.
    375      *
    376      */
    377     @Test
    378     public void waySimple_IdenicalNodesDifferentTags() {
     369     */
     370    @Test
     371    public void testWaySimpleIdenticalNodesDifferentTags() {
    379372
    380373        // -- the target dataset
    … …  
    446439     *
    447440     * => merge it onto my way, no conflict
    448      *
    449      */
    450     @Test
    451     public void waySimple_AdditionalNodesAndChangedNodes() {
     441     */
     442    @Test
     443    public void testWaySimpleAdditionalNodesAndChangedNodes() {
    452444
    453445        // -- my data set
    … …  
    516508     *
    517509     * => merge onto my way not possible, create a conflict
    518      *
    519      */
    520     @Test
    521     public void waySimple_DifferentNodesAndMyIsModified() {
     510     */
     511    @Test
     512    public void testWaySimpleDifferentNodesAndMyIsModified() {
    522513
    523514        // -- the target dataset
    … …  
    581572     *
    582573     * => conflict
    583      *
    584      */
    585     @Test
    586     public void waySimple_TheirVersionNotVisibleMyIsModified() {
     574     */
     575    @Test
     576    public void testWaySimpleTheirVersionNotVisibleMyIsModified() {
    587577
    588578        Node mn1 = new Node(LatLon.ZERO);
    … …  
    624614     * my and  their way are semantically equal. so technical attributes of
    625615     * their way can be merged on my way. No conflict.
    626      *
    627      */
    628     @Test
    629     public void waySimple_twoWaysWithNoId_NodesWithId() {
     616     */
     617    @Test
     618    public void testWaySimpleTwoWaysWithNoIdNodesWithId() {
    630619
    631620        // -- my data set
    … …  
    682671     * my and  their way are semantically equal. so technical attributes of
    683672     * their way can be merged on my way. No conflict.
    684      *
    685      */
    686     @Test
    687     public void waySimple_twoWaysWithNoId_NodesWithoutId() {
     673     */
     674    @Test
     675    public void testWaySimpleTwoWaysWithNoIdNodesWithoutId() {
    688676
    689677        // -- my data set
    … …  
    738726     * => the merged way should include all three nodes. Deleted node should have deleted=false and
    739727     * special conflict with isDeleted should exist
    740      *
    741      */
    742     @Test
    743     public void wayComplex_mergingADeletedNode() {
     728     */
     729    @Test
     730    public void testWayComplexMergingADeletedNode() {
    744731
    745732        // -- my dataset
    … …  
    793780     * => the merged relation should include all three nodes. There should be conflict for deleted
    794781     * node with isMyDeleted set
    795      *
    796      */
    797     @Test
    798     public void relationComplex_mergingADeletedNode() {
     782     */
     783    @Test
     784    public void testRelationComplexMergingADeletedNode() {
    799785
    800786        Node mn1 = new Node(LatLon.ZERO);
    … …  
    803789        my.addPrimitive(mn1);
    804790
    805 
    806791        Node tn1 = new Node(LatLon.ZERO);
    807792        tn1.setOsmId(1, 1);
    … …  
    815800        tn3.setOsmId(3, 1);
    816801        their.addPrimitive(tn3);
    817 
    818802
    819803        Relation theirRelation = new Relation();
    … …  
    847831     */
    848832    @Test
    849     public void newIncompleteWay() {
     833    public void testNewIncompleteWay() {
    850834
    851835        Node n1 = new Node(1);
    … …  
    889873     */
    890874    @Test
    891     public void incompleteWayOntoCompleteWay() {
     875    public void testIncompleteWayOntoCompleteWay() {
    892876
    893877        // an incomplete node
    … …  
    944928     */
    945929    @Test
    946     public void twoCompleteNodesOntoAnIncompleteWay() {
     930    public void testTwoCompleteNodesOntoAnIncompleteWay() {
    947931
    948932        // -- source dataset

  • trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java

    r10222 r10758  
    66
    77import java.io.FileInputStream;
    8 import java.io.IOException;
    98import java.io.InputStream;
    109import java.util.Arrays;
    … …  
    2120import org.openstreetmap.josm.data.coor.LatLon;
    2221import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    23 import org.openstreetmap.josm.io.IllegalDataException;
    2422import org.openstreetmap.josm.io.OsmReader;
    2523
    … …  
    3836
    3937    @Test
    40     public void basic() throws ParseError {
     38    public void testBasic() throws ParseError {
    4139        DataSet ds = new DataSet();
    4240        Node n1 = new Node(LatLon.ZERO);
    … …  
    6664
    6765    @Test
    68     public void filter() throws ParseError, IllegalDataException, IOException {
     66    public void testFilter() throws Exception {
    6967        for (int i : new int[] {1, 2, 3, 11, 12, 13, 14, 15}) {
    7068            DataSet ds;

  • trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java

    r10222 r10758  
    3131     */
    3232    @Test
    33     public void emptyNode() {
     33    public void testEmptyNode() {
    3434        Node n = new Node();
    3535        testKeysSize(n, 0);
    … …  
    4545     */
    4646    @Test
    47     public void put() {
     47    public void testPut() {
    4848        Node n = new Node();
    4949        n.put("akey", "avalue");
    … …  
    5757     */
    5858    @Test
    59     public void put2() {
     59    public void testPut2() {
    6060        Node n = new Node();
    6161        n.put("key.1", "value.1");
    … …  
    7575    @Test
    7676    @SuppressFBWarnings(value = "DM_STRING_CTOR", justification = "test that equals is used and not ==")
    77     public void remove() {
     77    public void testRemove() {
    7878        Node n = new Node();
    7979        n.put("key.1", "value.1");
    … …  
    107107     */
    108108    @Test
    109     public void removeAll() {
     109    public void testRemoveAll() {
    110110        Node n = new Node();
    111111
    … …  
    122122     */
    123123    @Test
    124     public void hasEqualSemanticAttributes() {
     124    public void testHasEqualSemanticAttributes() {
    125125        Node n1 = new Node(1);
    126126        n1.setCoor(LatLon.ZERO);
    … …  
    140140     */
    141141    @Test
    142     public void hasEqualSemanticAttributes_2() {
     142    public void testHasEqualSemanticAttributes_2() {
    143143        Node n1 = new Node(1);
    144144        n1.setCoor(LatLon.ZERO);

  • trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java

    r9489 r10758  
    4242
    4343    @Test
    44     public void simpleReferrersTest() {
     44    public void testSimpleReferrersTest() {
    4545        Node n1 = new Node(LatLon.ZERO);
    4646        Way w1 = new Way();
    … …  
    5252
    5353    @Test
    54     public void addAndRemoveReferrer() {
     54    public void testAddAndRemoveReferrer() {
    5555        Node n1 = new Node(LatLon.ZERO);
    5656        Node n2 = new Node(LatLon.ZERO);
    … …  
    6868
    6969    @Test
    70     public void multipleReferrers() {
     70    public void testMultipleReferrers() {
    7171        Node n1 = new Node(LatLon.ZERO);
    7272        Way w1 = new Way();
    … …  
    8484
    8585    @Test
    86     public void removeMemberFromRelationReferrerTest() {
     86    public void testRemoveMemberFromRelationReferrerTest() {
    8787        Node n1 = new Node(LatLon.ZERO);
    8888        Relation r1 = new Relation();
    … …  
    9696
    9797    @Test
    98     public void setRelationMemberReferrerTest() {
     98    public void testSetRelationMemberReferrerTest() {
    9999        Node n1 = new Node(LatLon.ZERO);
    100100        Node n2 = new Node(LatLon.ZERO);
    … …  
    113113
    114114    @Test
    115     public void removePrimitiveReferrerTest() {
     115    public void testRemovePrimitiveReferrerTest() {
    116116        Node n1 = new Node(LatLon.ZERO);
    117117        Way w1 = new Way();
    … …  
    135135
    136136    @Test
    137     public void nodeFromMultipleDatasets() {
     137    public void testNodeFromMultipleDatasets() {
    138138        // n has two referrers - w1 and w2. But only w1 is returned because it is in the same dataset as n
    139139        Node n = new Node(LatLon.ZERO);
    … …  
    150150
    151151    @Test(expected = DataIntegrityProblemException.class)
    152     public void checkMustBeInDatasate() {
     152    public void testCheckMustBeInDatasate() {
    153153        Node n = new Node();
    154154        n.getReferrers();

  • trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java

    r10222 r10758  
    2323
    2424    @Test(expected = NullPointerException.class)
    25     public void createNewRelation() {
     25    public void testCreateNewRelation() {
    2626        new Relation(null);
    2727    }
    2828
    2929    @Test
    30     public void equalSemenaticsToNull() {
     30    public void testEqualSemanticsToNull() {
    3131        Relation relation = new Relation();
    3232        assertFalse(relation.hasEqualTechnicalAttributes(null));

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

    r9498 r10758  
    1919     */
    2020    @Test
    21     public void latLon2Cart2LatLon() {
     21    public void testLatLon2Cart2LatLon() {
    2222        Random r = new Random(System.currentTimeMillis());
    2323        double maxErrLat = 0, maxErrLon = 0;

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

    r10222 r10758  
    278278
    279279    @Test
    280     public void test() throws IOException {
     280    public void testProjections() throws IOException {
    281281        StringBuilder fail = new StringBuilder();
    282282        Set<String> allCodes = new HashSet<>(Projections.getAllProjectionCodes());

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

    r10065 r10758  
    164164     */
    165165    @Test
    166     public void regressionTest() throws IOException {
     166    public void testNonRegression() throws IOException {
    167167        List<TestData> allData = readData();
    168168        Set<String> dataCodes = new HashSet<>();

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

    r9950 r10758  
    2424
    2525    @Test
    26     public void projections() {
     26    public void testProjections() {
    2727        error = false;
    2828        text = "";
    … …  
    104104
    105105    @Test
    106     public void projs() {
     106    public void testProjs() {
    107107        error2 = false;
    108108        text2 = "";

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

    r10378 r10758  
    1313
    1414public class SwissGridTest {
    15     public static final String SWISS_EPSG_CODE = "EPSG:21781";
     15    private static final String SWISS_EPSG_CODE = "EPSG:21781";
    1616    private boolean debug = false;
    1717
    … …  
    5656    }
    5757
    58     public static final double EPSILON_APPROX = 1.5;
    59     public static final double EPSILON_ACCURATE = 0.05;
    60 
    61     public void projReferenceTest(final double epsilon) {
     58    private static final double EPSILON_APPROX = 1.5;
     59    private static final double EPSILON_ACCURATE = 0.05;
     60
     61    private void projReferenceTest(final double epsilon) {
    6262        Projection swiss = Projections.getProjectionByCode("EPSG:21781"); // Swiss grid
    6363        StringBuilder errs = new StringBuilder();
    … …  
    7272
    7373    @Test
    74     public void projReferenceTestApprox() {
     74    public void testProjReferenceTestApprox() {
    7575        projReferenceTest(EPSILON_APPROX);
    7676    }
    … …  
    7878    @Test
    7979    @Ignore("high accuracy of epsilon=" + EPSILON_ACCURATE + " is not met")
    80     public void projReferenceTestAccurate() {
     80    public void testProjReferenceTestAccurate() {
    8181        // TODO make this test pass
    8282        projReferenceTest(EPSILON_ACCURATE);
    … …  
    8484
    8585    @Test
    86     public void a_latlon2eastNorth_test() {
     86    public void testAlatlon2eastNorth() {
    8787        LatLon ll = new LatLon(46.518, 6.567);
    8888        EastNorth en = Main.getProjection().latlon2eastNorth(ll);
    … …  
    127127
    128128    @Test
    129     public void b_eastNorth2latlon_test() {
     129    public void testBeastNorth2latlon() {
    130130        EastNorth en = new EastNorth(533111.69, 152227.85);
    131131        LatLon ll = Main.getProjection().eastNorth2latlon(en);
    … …  
    173173     */
    174174    @Test
    175     public void c_sendandreturn_test() {
     175    public void testCsendandreturn() {
    176176        EastNorth en = new EastNorth(533111.69, 152227.85);
    177177        LatLon ll = Main.getProjection().eastNorth2latlon(en);

  • trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java

    r7937 r10758  
    2929     */
    3030    @Test
    31     public void test() {
     31    public void testDuplicateNode() {
    3232        DataSet ds = new DataSet();
    3333

  • trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

    r10710 r10758  
    8686
    8787    @Test
    88     public void test10913() throws Exception {
     88    public void testTicket10913() throws Exception {
    8989        final OsmPrimitive p = OsmUtils.createPrimitive("way highway=tertiary construction=yes");
    9090        final TagCheck check = TagCheck.readMapCSS(new StringReader("way {" +
    … …  
    101101
    102102    @Test
    103     public void test9782() throws Exception {
     103    public void testTicket9782() throws Exception {
    104104        final MapCSSTagChecker test = buildTagChecker("*[/.+_name/][!name] {" +
    105105                "throwWarning: tr(\"has {0} but not {1}\", \"{0.key}\", \"{1.key}\");}");
    … …  
    112112
    113113    @Test
    114     public void test10859() throws Exception {
     114    public void testTicket10859() throws Exception {
    115115        final MapCSSTagChecker test = buildTagChecker("way[highway=footway][foot?!] {\n" +
    116116                "  throwWarning: tr(\"{0} used with {1}\", \"{0.value}\", \"{1.tag}\");}");

  • trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java

    r10218 r10758  
    3535     */
    3636    @Test
    37     public void test0() {
     37    public void testCase0() {
    3838        final List<TestError> errors = test("node name:de=Europa");
    3939        assertEquals(1, errors.size());
    … …  
    4545     */
    4646    @Test
    47     public void test1() {
     47    public void testCase1() {
    4848        final List<TestError> errors = test("node name=Europe name:de=Europa");
    4949        assertEquals(1, errors.size());
    … …  
    5555     */
    5656    @Test
    57     public void test2() {
     57    public void testCase2() {
    5858        final List<TestError> errors = test("node name=Europe name:de=Europa name:en=Europe");
    5959        assertEquals(0, errors.size());
    … …  
    6464     */
    6565    @Test
    66     public void test3() {
     66    public void testCase3() {
    6767        List<TestError> errors;
    6868        errors = test("node \"name\"=\"Italia - Italien - Italy\"");

  • trunk/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java

    r10141 r10758  
    3535     */
    3636    @Test
    37     public void test() {
     37    public void testVarious() {
    3838        final List<Node> nodes = Arrays.asList(new Node(), new Node(), new Node(), new Node(), new Node(), new Node());
    3939        final Way w1 = TestUtils.newWay("", nodes.get(0), nodes.get(1));

  • trunk/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java

    r10225 r10758  
    5555     */
    5656    @Test
    57     public void tableCellRendererTest() {
     57    public void testTableCellRenderer() {
    5858        Reflections reflections = new Reflections("org.openstreetmap.josm");
    5959        Set<Class<? extends TableCellRenderer>> renderers = reflections.getSubTypesOf(TableCellRenderer.class);

  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

    r10626 r10758  
    7979
    8080    @Test
    81     public void test_copyMyNodesToTop_1() {
     81    public void testCopyMyNodesToTop1() {
    8282        NodeListMergeModel model = new NodeListMergeModel();
    8383
    … …  
    101101
    102102    @Test
    103     public void test_copyMyNodesToTop_2() {
     103    public void testCopyMyNodesToTop2() {
    104104        NodeListMergeModel model = new NodeListMergeModel();
    105105
    … …  
    127127
    128128    @Test
    129     public void test_copyMyNodesToTop_3() {
     129    public void testCopyMyNodesToTop3() {
    130130        NodeListMergeModel model = new NodeListMergeModel();
    131131
    … …  
    153153
    154154    @Test
    155     public void test_copyMyNodesToTop_4() {
     155    public void testCopyMyNodesToTop4() {
    156156        NodeListMergeModel model = new NodeListMergeModel();
    157157
    … …  
    180180
    181181    @Test
    182     public void test_copyMyNodesToEnd_1() {
     182    public void testCopyMyNodesToEnd1() {
    183183        NodeListMergeModel model = new NodeListMergeModel();
    184184
    … …  
    201201
    202202    @Test
    203     public void test_copyMyNodesToEnd_2() {
     203    public void testCopyMyNodesToEnd2() {
    204204        NodeListMergeModel model = new NodeListMergeModel();
    205205
    … …  
    226226
    227227    @Test
    228     public void test_copyMyNodesToEnd_3() {
     228    public void testCopyMyNodesToEnd3() {
    229229        NodeListMergeModel model = new NodeListMergeModel();
    230230
    … …  
    253253
    254254    @Test
    255     public void test_copyMyNodesToEnd_4() {
     255    public void testCopyMyNodesToEnd4() {
    256256        NodeListMergeModel model = new NodeListMergeModel();
    257257
    … …  
    286286
    287287    @Test
    288     public void test_copyMyNodesBeforeCurrent_1() {
     288    public void testCopyMyNodesBeforeCurrent1() {
    289289        NodeListMergeModel model = new NodeListMergeModel();
    290290
    … …  
    313313
    314314    @Test
    315     public void test_copyMyNodesBeforeCurrent_2() {
     315    public void testCopyMyNodesBeforeCurrent2() {
    316316        NodeListMergeModel model = new NodeListMergeModel();
    317317
    … …  
    341341
    342342    @Test
    343     public void test_copyMyNodesBeforeCurrent_3() {
     343    public void testCopyMyNodesBeforeCurrent3() {
    344344        NodeListMergeModel model = new NodeListMergeModel();
    345345
    … …  
    376376    /* ----------------------------------------------------------------------------- */
    377377    @Test
    378     public void test_copyMyNodesAfterCurrent_1() {
     378    public void testCopyMyNodesAfterCurrent1() {
    379379        NodeListMergeModel model = new NodeListMergeModel();
    380380
    … …  
    403403
    404404    @Test
    405     public void test_copyMyNodesAfterCurrent_2() {
     405    public void testCopyMyNodesAfterCurrent2() {
    406406        NodeListMergeModel model = new NodeListMergeModel();
    407407
    … …  
    432432
    433433    @Test
    434     public void test_copyMyNodesAfterCurrent_3() {
     434    public void testCopyMyNodesAfterCurrent3() {
    435435        NodeListMergeModel model = new NodeListMergeModel();
    436436
    … …  
    465465    /* ----------------------------------------------------------------------------- */
    466466    @Test
    467     public void test_moveUpMergedNodes_1() {
     467    public void testMoveUpMergedNodes1() {
    468468        NodeListMergeModel model = new NodeListMergeModel();
    469469
    … …  
    491491
    492492    @Test
    493     public void test_moveUpMergedNodes_2() {
     493    public void testMoveUpMergedNodes2() {
    494494        NodeListMergeModel model = new NodeListMergeModel();
    495495
    … …  
    521521
    522522    @Test
    523     public void test_moveUpMergedNodes_3() {
     523    public void testMoveUpMergedNodes3() {
    524524        NodeListMergeModel model = new NodeListMergeModel();
    525525
    … …  
    554554    /* ----------------------------------------------------------------------------- */
    555555    @Test
    556     public void test_moveDownMergedNodes_1() {
     556    public void testMoveDownMergedNodes1() {
    557557        NodeListMergeModel model = new NodeListMergeModel();
    558558
    … …  
    580580
    581581    @Test
    582     public void test_moveDownMergedNodes_2() {
     582    public void testMoveDownMergedNodes2() {
    583583        NodeListMergeModel model = new NodeListMergeModel();
    584584
    … …  
    610610
    611611    @Test
    612     public void test_moveDownMergedNodes_3() {
     612    public void testMoveDownMergedNodes3() {
    613613        NodeListMergeModel model = new NodeListMergeModel();
    614614
    … …  
    644644    @SuppressWarnings("unchecked")
    645645    @Test
    646     public void addPropertyChangeListener() {
     646    public void testAddPropertyChangeListener() {
    647647        NodeListMergeModel model = new NodeListMergeModel();
    648648
    … …  
    666666    @SuppressWarnings("unchecked")
    667667    @Test
    668     public void removePropertyChangeListener() {
     668    public void testRemovePropertyChangeListener() {
    669669        NodeListMergeModel model = new NodeListMergeModel();
    670670
    … …  
    690690    /* ----------------------------------------------------------------------------- */
    691691    @Test
    692     public void setFrozen() {
     692    public void testSetFrozen() {
    693693        NodeListMergeModel model = new NodeListMergeModel();
    694694        model.setFrozen(true);
    … …  
    700700
    701701    @Test
    702     public void setFrozenWithPropertyChangeNotification() {
     702    public void testSetFrozenWithPropertyChangeNotification() {
    703703        NodeListMergeModel model = new NodeListMergeModel();
    704704

  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java

    r10210 r10758  
    6363
    6464    @Test
    65     public void populate() {
     65    public void testPopulate() {
    6666        DataSet d1 = new DataSet();
    6767        DataSet d2 = new DataSet();
    … …  
    8686
    8787    @Test
    88     public void decidingAboutCoords() {
     88    public void testDecidingAboutCoords() {
    8989        DataSet d1 = new DataSet();
    9090        DataSet d2 = new DataSet();

  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java

    r10626 r10758  
    2727
    2828    @Test
    29     public void test_TagMergeItem() {
     29    public void testTagMergeItem() {
    3030        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    3131        assertEquals("key", item.getKey());
    … …  
    3636
    3737    @Test
    38     public void test_TagMergeItem_2() {
     38    public void testTagMergeItem2() {
    3939        Node n1 = new Node(1);
    4040        Node n2 = new Node(1);
    … …  
    5050
    5151    @Test
    52     public void test_TagMergeItem_3() {
     52    public void testTagMergeItem3() {
    5353        Node n1 = new Node(1);
    5454        Node n2 = new Node(1);
    … …  
    6464
    6565    @Test
    66     public void test_TagMergeItem_4() {
     66    public void testTagMergeItem4() {
    6767        Node n1 = new Node(1);
    6868        Node n2 = new Node(1);
    … …  
    7979
    8080    @Test
    81     public void test_decide() {
     81    public void testDecide() {
    8282        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    8383        item.decide(MergeDecisionType.KEEP_MINE);
    … …  
    8686
    8787    @Test
    88     public void test_decide_1() {
     88    public void testDecide1() {
    8989        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    9090        try {
    … …  
    9898
    9999    @Test
    100     public void test_applyToMyPrimitive() {
     100    public void testApplyToMyPrimitive() {
    101101        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    102102        item.decide(MergeDecisionType.KEEP_MINE);
    … …  
    113113
    114114    @Test
    115     public void test_applyToMyPrimitive_2() {
     115    public void testApplyToMyPrimitive2() {
    116116        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    117117        item.decide(MergeDecisionType.KEEP_THEIR);
    … …  
    128128
    129129    @Test
    130     public void test_applyToMyPrimitive_3() {
     130    public void testApplyToMyPrimitive3() {
    131131        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    132132        // item is undecided
    … …  
    145145
    146146    @Test
    147     public void test_applyToMyPrimitive_4() {
     147    public void testApplyToMyPrimitive4() {
    148148        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    149149

  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java

    r9547 r10758  
    3232
    3333    @Test
    34     public void addPropertyChangeListener() {
     34    public void testAddPropertyChangeListener() {
    3535        TagMergeModel model = new TagMergeModel();
    3636        PropertyChangeListener listener = new PropertyChangeListener() {
    … …  
    5050
    5151    @Test
    52     public void removePropertyChangeListener() {
     52    public void testRemovePropertyChangeListener() {
    5353        TagMergeModel model = new TagMergeModel();
    5454        PropertyChangeListener listener = new PropertyChangeListener() {
    … …  
    6969
    7070    @Test
    71     public void populateNoConflichts() {
     71    public void testPopulateNoConflichts() {
    7272        Node my = new Node(1);
    7373        Node their = new Node(1);
    … …  
    8484
    8585    @Test
    86     public void populateNoConflicts1() {
     86    public void testPopulateNoConflicts1() {
    8787        Node my = new Node(1);
    8888        my.put("key", "value");
    … …  
    101101
    102102    @Test
    103     public void populateMissingKeyMine() {
     103    public void testPopulateMissingKeyMine() {
    104104        Node my = new Node(1);
    105105        Node their = new Node(1);
    … …  
    122122
    123123    @Test
    124     public void populateMissingKeyTheir() {
     124    public void testPopulateMissingKeyTheir() {
    125125        Node my = new Node(1);
    126126        my.put("key", "value");
    … …  
    143143
    144144    @Test
    145     public void populateConflictingValues() {
     145    public void testPopulateConflictingValues() {
    146146        Node my = new Node(1);
    147147        my.put("key", "myvalue");
    … …  
    165165
    166166    @Test
    167     public void addItem() {
     167    public void testAddItem() {
    168168        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    169169        TagMergeModel model = new TagMergeModel();
    … …  
    184184
    185185    @Test
    186     public void decide() {
     186    public void testDecide() {
    187187        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    188188        TagMergeModel model = new TagMergeModel();
    … …  
    211211
    212212    @Test
    213     public void decideMultiple() {
     213    public void testDecideMultiple() {
    214214
    215215        TagMergeModel model = new TagMergeModel();

  • trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollectionTest.java

    r9958 r10758  
    3636     */
    3737    @Test
    38     public void test() throws SearchCompiler.ParseError {
     38    public void testVarious() throws SearchCompiler.ParseError {
    3939        final RecentTagCollection recentTags = new RecentTagCollection(2);
    4040        assertTrue(recentTags.isEmpty());
    … …  
    7676        recentTags.ignoreTag(new Tag("name", /*all values */""), searchSetting);
    7777        assertEquals(Collections.emptyList(), recentTags.toList());
    78 
    7978    }
    8079}

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

    r9231 r10758  
    5858
    5959    @Test
    60     public void test1() {
     60    public void testCase1() {
    6161        Map<String, Action> actions = new HashMap<>();
    6262        actions.put("action", new TestAction());

  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java

    r10378 r10758  
    5454     */
    5555    @Test
    56     public void equalsContract() {
     56    public void testEqualsContract() {
    5757        EqualsVerifier.forClass(PrefEntry.class).usingGetClass()
    5858            .withIgnoredFields("value", "defaultValue", "isDefault", "changed")

  • trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java

    r10638 r10758  
    4040     */
    4141    @Test
    42     public void test8954() throws SAXException, IOException {
     42    public void testTicket8954() throws SAXException, IOException {
    4343        String presetfile = TestUtils.getRegressionDataFile(8954, "preset.xml");
    4444        final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, false);
    … …  
    7272     */
    7373    @Test
    74     public void readDefaulPresets() throws SAXException, IOException {
     74    public void testReadDefaulPresets() throws SAXException, IOException {
    7575        String presetfile = "resource://data/defaultpresets.xml";
    7676        final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, true);

  • trunk/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java

    r10475 r10758  
    3636     */
    3737    @Test
    38     public void equalsContract() {
     38    public void testEqualsContract() {
    3939        EqualsVerifier.forClass(NMEA_TYPE.class).verify();
    4040    }

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

    r9958 r10758  
    3939     */
    4040    @Test
    41     public void equalsContract() {
     41    public void testEqualsContract() {
    4242        EqualsVerifier.forClass(DNSName.class).suppress(Warning.NULL_FIELDS).verify();
    4343    }

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

    r10093 r10758  
    3737     */
    3838    @Test
    39     public void equalsContract() {
     39    public void testEqualsContract() {
    4040        EqualsVerifier.forClass(DeprecatedPlugin.class).usingGetClass().verify();
    4141    }

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

    r9764 r10758  
    2020     */
    2121    @Test
    22     public void equalsContract() {
     22    public void testEqualsContract() {
    2323        EqualsVerifier.forClass(MultiMap.class).usingGetClass().verify();
    2424    }

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

    r9669 r10758  
    1616     */
    1717    @Test
    18     public void equalsContract() {
     18    public void testEqualsContract() {
    1919        EqualsVerifier.forClass(Pair.class).suppress(Warning.NONFINAL_FIELDS).verify();
    2020    }

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

    r10553 r10758  
    114114     */
    115115    @Test
    116     public void errorDetect() {
     116    public void testErrorDetect() {
    117117        String txt = "a=2 b=3 4";
    118118        Map<String, String> tags = TextTagParser.readTagsFromText(txt);

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

    r10752 r10758  
    155155     */
    156156    @Test
    157     public void joinAsHtmlUnorderedList() {
     157    public void testJoinAsHtmlUnorderedList() {
    158158        List<? extends Object> items = Arrays.asList("1", Integer.valueOf(2));
    159159        assertEquals("<ul><li>1</li><li>2</li></ul>", Utils.joinAsHtmlUnorderedList(items));

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

    r10553 r10758  
    146146     */
    147147    @Test
    148     public void equalsContract() {
     148    public void testEqualsContract() {
    149149        EqualsVerifier.forClass(WindowGeometry.class).usingGetClass()
    150150            .suppress(Warning.NONFINAL_FIELDS)
Note: See TracChangeset for help on using the changeset viewer.