Ignore:
Timestamp:
2021-07-16T09:16:33+02:00 (4 years ago)
Author:
Don-vip
Message:

fix #21064 - Add JUnit 5 extension for preferences (patch by taylor.smock)

Location:
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair
Files:
11 edited

Legend:

Unmodified
Added
Removed

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

    r17275 r18037  
    77import java.util.NoSuchElementException;
    88
    9 import org.junit.jupiter.api.Test;
    10 import org.junit.jupiter.api.extension.RegisterExtension;
    119import org.openstreetmap.josm.command.SequenceCommand;
    1210import org.openstreetmap.josm.data.conflict.Conflict;
    … …  
    1614import org.openstreetmap.josm.data.osm.Relation;
    1715import org.openstreetmap.josm.data.osm.Way;
    18 import org.openstreetmap.josm.testutils.JOSMTestRules;
     16import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1917
    20 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     18import org.junit.jupiter.api.Test;
    2119
    2220/**
    2321 * Unit tests of {@link ConflictResolver} class.
    2422 */
     23@BasicPreferences
    2524class ConflictResolverTest {
    26 
    27     /**
    28      * Setup test.
    29      */
    30     @RegisterExtension
    31     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    32     public JOSMTestRules test = new JOSMTestRules().preferences();
    33 
    3425    /**
    3526     * Unit test of {@link ConflictResolver#buildResolveCommand} - empty case.

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

    r17374 r18037  
    22package org.openstreetmap.josm.gui.conflict.pair.nodes;
    33
    4 import static org.junit.jupiter.api.Assertions.fail;
    54import static org.junit.jupiter.api.Assertions.assertEquals;
    65import static org.junit.jupiter.api.Assertions.assertFalse;
    76import static org.junit.jupiter.api.Assertions.assertTrue;
     7import static org.junit.jupiter.api.Assertions.fail;
    88
    99import java.beans.PropertyChangeEvent;
    … …  
    1919import javax.swing.DefaultListSelectionModel;
    2020
    21 import org.junit.jupiter.api.Test;
    22 import org.junit.jupiter.api.extension.RegisterExtension;
    2321import org.openstreetmap.josm.TestUtils;
    2422import org.openstreetmap.josm.data.osm.Node;
    … …  
    2624import org.openstreetmap.josm.gui.conflict.pair.AbstractListMergeModel;
    2725import org.openstreetmap.josm.testutils.DatasetFactory;
    28 import org.openstreetmap.josm.testutils.JOSMTestRules;
     26import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    2927import org.openstreetmap.josm.tools.Logging;
    3028
    31 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     29import org.junit.jupiter.api.Test;
    3230
    3331/**
    3432 * Unit tests of {@link NodeListMergeModel}.
    3533 */
     34// Needed to due to OSM primitive dependencies
     35@BasicPreferences
    3636class NodeListMergeModelTest {
    37 
    3837    private final DatasetFactory my = new DatasetFactory();
    3938    private final DatasetFactory their = new DatasetFactory();
    40 
    41     /**
    42      * Setup test.
    43      */
    44     @RegisterExtension
    45     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    46     public JOSMTestRules test = new JOSMTestRules();
    4739
    4840    @SuppressWarnings("unchecked")

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

    r17275 r18037  
    44import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.jupiter.api.extension.RegisterExtension;
     6import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     7
    78import org.junit.jupiter.api.Test;
    8 import org.openstreetmap.josm.testutils.JOSMTestRules;
    9 
    10 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    119
    1210/**
    1311 * Unit tests of {@link NodeListMerger} class.
    1412 */
     13@BasicPreferences
    1514class NodeListMergerTest {
    16 
    17     /**
    18      * Setup test.
    19      */
    20     @RegisterExtension
    21     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    22     public JOSMTestRules test = new JOSMTestRules().preferences();
    23 
    2415    /**
    2516     * Unit test of {@link NodeListMerger#NodeListMerger}.

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

    r17275 r18037  
    99import javax.swing.event.ChangeListener;
    1010
    11 import org.junit.jupiter.api.BeforeEach;
    12 import org.junit.jupiter.api.Test;
    13 import org.junit.jupiter.api.extension.RegisterExtension;
    1411import org.openstreetmap.josm.data.conflict.Conflict;
    1512import org.openstreetmap.josm.data.coor.LatLon;
    … …  
    2017import org.openstreetmap.josm.data.osm.Way;
    2118import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    22 import org.openstreetmap.josm.testutils.JOSMTestRules;
     19import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    2320
    24 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     21import org.junit.jupiter.api.BeforeEach;
     22import org.junit.jupiter.api.Test;
    2523
    2624/**
    2725 * Unit tests of {@link PropertiesMergeModel}.
    2826 */
     27// Needed to due to OSM primitive dependencies
     28@BasicPreferences
    2929class PropertiesMergeModelTest {
    3030
    … …  
    5050     * Setup test.
    5151     */
    52     @RegisterExtension
    53     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    54     public JOSMTestRules test = new JOSMTestRules();
    55 
    56     /**
    57      * Setup test.
    58      */
    5952    @BeforeEach
    60     public void setUp() {
     53    void setUp() {
    6154        model = new PropertiesMergeModel();
    6255    }

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

    r17275 r18037  
    44import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.jupiter.api.extension.RegisterExtension;
     6import org.openstreetmap.josm.TestUtils;
     7import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     8
    79import org.junit.jupiter.api.Test;
    8 import org.openstreetmap.josm.TestUtils;
    9 import org.openstreetmap.josm.testutils.JOSMTestRules;
    10 
    11 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1210
    1311/**
    1412 * Unit tests of {@link PropertiesMerger} class.
    1513 */
     14@BasicPreferences
    1615class PropertiesMergerTest {
    17 
    18     /**
    19      * Setup test.
    20      */
    21     @RegisterExtension
    22     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    23     public JOSMTestRules test = new JOSMTestRules().preferences();
    24 
    2516    /**
    2617     * Unit test of {@link PropertiesMerger#PropertiesMerger}.

  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java

    r17275 r18037  
    44import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.jupiter.api.extension.RegisterExtension;
     6import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     7
    78import org.junit.jupiter.api.Test;
    8 import org.openstreetmap.josm.testutils.JOSMTestRules;
    9 
    10 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    119
    1210/**
    1311 * Unit tests of {@link RelationMemberMerger} class.
    1412 */
     13@BasicPreferences
    1514class RelationMemberMergerTest {
    16 
    17     /**
    18      * Setup test.
    19      */
    20     @RegisterExtension
    21     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    22     public JOSMTestRules test = new JOSMTestRules().preferences();
    23 
    2415    /**
    2516     * Unit test of {@link RelationMemberMerger#RelationMemberMerger}.

  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditorTest.java

    r17275 r18037  
    88import java.awt.Component;
    99
    10 import org.junit.jupiter.api.extension.RegisterExtension;
    11 import org.junit.jupiter.api.Test;
    1210import org.openstreetmap.josm.data.osm.Node;
    1311import org.openstreetmap.josm.data.osm.RelationMember;
    14 import org.openstreetmap.josm.testutils.JOSMTestRules;
     12import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1513
    16 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     14import org.junit.jupiter.api.Test;
    1715
    1816/**
    1917 * Unit tests of {@link RelationMemberTableCellEditor} class.
    2018 */
     19@BasicPreferences
    2120class RelationMemberTableCellEditorTest {
    22 
    23     /**
    24      * Setup test.
    25      */
    26     @RegisterExtension
    27     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    28     public JOSMTestRules test = new JOSMTestRules().preferences();
    29 
    3021    /**
    3122     * Unit test of {@link RelationMemberTableCellEditor#RelationMemberTableCellEditor}.

  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRendererTest.java

    r17275 r18037  
    66import javax.swing.JTable;
    77
    8 import org.junit.jupiter.api.extension.RegisterExtension;
    9 import org.junit.jupiter.api.Test;
    108import org.openstreetmap.josm.data.osm.Node;
    119import org.openstreetmap.josm.data.osm.RelationMember;
    1210import org.openstreetmap.josm.gui.conflict.pair.ListRole;
    1311import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMergeModel;
    14 import org.openstreetmap.josm.testutils.JOSMTestRules;
     12import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1513
    16 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     14import org.junit.jupiter.api.Test;
    1715
    1816/**
    1917 * Unit tests of {@link RelationMemberTableCellRenderer} class.
    2018 */
     19@BasicPreferences
    2120class RelationMemberTableCellRendererTest {
    22 
    23     /**
    24      * Setup test.
    25      */
    26     @RegisterExtension
    27     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    28     public JOSMTestRules test = new JOSMTestRules().preferences();
    29 
    3021    /**
    3122     * Unit test of {@link RelationMemberTableCellRenderer#RelationMemberTableCellRenderer}.

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

    r17275 r18037  
    66import static org.junit.jupiter.api.Assertions.fail;
    77
    8 import org.junit.jupiter.api.extension.RegisterExtension;
    9 import org.junit.jupiter.api.Test;
    108import org.openstreetmap.josm.data.osm.Node;
    119import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    12 import org.openstreetmap.josm.testutils.JOSMTestRules;
     10import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1311import org.openstreetmap.josm.tools.Logging;
    1412
    15 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     13import org.junit.jupiter.api.Test;
    1614
    1715/**
    1816 * Unit tests of {@link TagMergeItem} class.
    1917 */
     18// Needed to due to OSM primitive dependencies
     19@BasicPreferences
    2020class TagMergeItemTest {
    21 
    22     /**
    23      * Setup test.
    24      */
    25     @RegisterExtension
    26     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    27     public JOSMTestRules test = new JOSMTestRules();
    28 
    2921    @Test
    3022    void testTagMergeItem() {

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

    r17275 r18037  
    99import java.util.Set;
    1010
    11 import org.junit.jupiter.api.extension.RegisterExtension;
    12 import org.junit.jupiter.api.Test;
    1311import org.openstreetmap.josm.TestUtils;
    1412import org.openstreetmap.josm.data.osm.Node;
    1513import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    16 import org.openstreetmap.josm.testutils.JOSMTestRules;
    17 
    18 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     14import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     15
     16import org.junit.jupiter.api.Test;
    1917
    2018/**
    … …  
    2220 */
    2321@SuppressWarnings("unchecked")
     22// Needed to due to OSM primitive dependencies
     23@BasicPreferences
    2424class TagMergeModelTest {
    25 
    26     /**
    27      * Setup test.
    28      */
    29     @RegisterExtension
    30     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    31     public JOSMTestRules test = new JOSMTestRules();
    32 
    3325    protected Set<PropertyChangeListener> getListeners(TagMergeModel model) throws ReflectiveOperationException {
    3426        return (Set<PropertyChangeListener>) TestUtils.getPrivateField(model, "listeners");

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

    r17275 r18037  
    44import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.jupiter.api.extension.RegisterExtension;
     6import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     7
    78import org.junit.jupiter.api.Test;
    8 import org.openstreetmap.josm.testutils.JOSMTestRules;
    9 
    10 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    119
    1210/**
    1311 * Unit tests of {@link TagMerger} class.
    1412 */
     13@BasicPreferences
    1514class TagMergerTest {
    16 
    17     /**
    18      * Setup test.
    19      */
    20     @RegisterExtension
    21     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    22     public JOSMTestRules test = new JOSMTestRules().preferences();
    23 
    2415    /**
    2516     * Unit test of {@link TagMerger#TagMerger}.
Note: See TracChangeset for help on using the changeset viewer.