Ignore:
Timestamp:
2021-07-16T09:16:33+02:00 (3 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/dialogs/relation
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r17275 r18037  
    44import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.jupiter.api.extension.RegisterExtension;
    7 import org.junit.jupiter.api.Test;
    86import org.openstreetmap.josm.data.osm.DataSet;
    97import org.openstreetmap.josm.data.osm.Relation;
    108import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    11 import org.openstreetmap.josm.testutils.JOSMTestRules;
     9import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1210
    13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     11import org.junit.jupiter.api.Test;
    1412
    1513/**
    1614 * Unit tests of {@link ChildRelationBrowser} class.
    1715 */
     16@BasicPreferences
    1817class ChildRelationBrowserTest {
    19 
    20     /**
    21      * Setup test.
    22      */
    23     @RegisterExtension
    24     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    25     public JOSMTestRules test = new JOSMTestRules().preferences();
    26 
    2718    /**
    2819     * Unit test of {@link ChildRelationBrowser#ChildRelationBrowser}.

  • trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRendererTest.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.TestUtils;
    119import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType;
    12 import org.openstreetmap.josm.testutils.JOSMTestRules;
     10import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1311
    14 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     12import org.junit.jupiter.api.Test;
    1513
    1614/**
    1715 * Unit tests of {@link MemberTableLinkedCellRenderer} class.
    1816 */
     17@BasicPreferences
    1918class MemberTableLinkedCellRendererTest {
    20 
    21     /**
    22      * Setup test.
    23      */
    24     @RegisterExtension
    25     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    26     public JOSMTestRules test = new JOSMTestRules().preferences();
    27 
    2819    /**
    2920     * Unit test of {@link MemberTableLinkedCellRenderer#MemberTableLinkedCellRenderer}.

  • trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRendererTest.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.DataSet;
    119import org.openstreetmap.josm.data.osm.Node;
    1210import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    13 import org.openstreetmap.josm.testutils.JOSMTestRules;
     11import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1412
    15 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     13import org.junit.jupiter.api.Test;
    1614
    1715/**
    1816 * Unit tests of {@link MemberTableMemberCellRenderer} class.
    1917 */
     18@BasicPreferences
    2019class MemberTableMemberCellRendererTest {
    21 
    22     /**
    23      * Setup test.
    24      */
    25     @RegisterExtension
    26     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    27     public JOSMTestRules test = new JOSMTestRules().preferences();
    28 
    2920    /**
    3021     * Unit test of {@link MemberTableMemberCellRenderer#MemberTableMemberCellRenderer}.

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

    r17275 r18037  
    88import java.util.List;
    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.OsmPrimitive;
    1412import org.openstreetmap.josm.data.osm.Tag;
    1513import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
    16 import org.openstreetmap.josm.testutils.JOSMTestRules;
     14import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1715
    18 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     16import org.junit.jupiter.api.Test;
    1917
    2018/**
    2119 * Unit tests of {@link MemberTableModel} class.
    2220 */
     21@BasicPreferences
    2322class MemberTableModelTest {
    24 
    25     /**
    26      * Setup test.
    27      */
    28     @RegisterExtension
    29     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    30     public JOSMTestRules test = new JOSMTestRules();
    31 
    3223    /**
    3324     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12443">#12443</a>.

  • trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/MemberTableRoleCellRendererTest.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.DataSet;
    119import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    12 import org.openstreetmap.josm.testutils.JOSMTestRules;
     10import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    1311
    14 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     12import org.junit.jupiter.api.Test;
    1513
    1614/**
    1715 * Unit tests of {@link MemberTableRoleCellRenderer} class.
    1816 */
     17@BasicPreferences
    1918class MemberTableRoleCellRendererTest {
    20 
    21     /**
    22      * Setup test.
    23      */
    24     @RegisterExtension
    25     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    26     public JOSMTestRules test = new JOSMTestRules();
    27 
    2819    /**
    2920     * Unit test of {@link MemberTableRoleCellRenderer#MemberTableRoleCellRenderer}.

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

    r17275 r18037  
    22package org.openstreetmap.josm.gui.dialogs.relation;
    33
    4 import org.junit.jupiter.api.extension.RegisterExtension;
    5 import org.junit.jupiter.api.Test;
    64import org.openstreetmap.josm.data.osm.DataSet;
    75import org.openstreetmap.josm.data.osm.Relation;
    86import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    9 import org.openstreetmap.josm.testutils.JOSMTestRules;
     7import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    108
    11 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     9import org.junit.jupiter.api.Test;
    1210
    1311/**
    1412 * Unit tests of {@link ReferringRelationsBrowser} class.
    1513 */
     14@BasicPreferences
    1615class ReferringRelationsBrowserTest {
    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 ReferringRelationsBrowser#ReferringRelationsBrowser}.

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

    r17275 r18037  
    66import javax.swing.JTree;
    77
    8 import org.junit.jupiter.api.extension.RegisterExtension;
     8import org.openstreetmap.josm.data.osm.Relation;
     9import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     10
    911import org.junit.jupiter.api.Test;
    10 import org.openstreetmap.josm.data.osm.Relation;
    11 import org.openstreetmap.josm.testutils.JOSMTestRules;
    12 
    13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1412
    1513/**
    1614 * Unit tests of {@link RelationTreeCellRenderer} class.
    1715 */
     16@BasicPreferences
    1817class RelationTreeCellRendererTest {
    19 
    20     /**
    21      * Setup test.
    22      */
    23     @RegisterExtension
    24     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    25     public JOSMTestRules test = new JOSMTestRules().preferences();
    26 
    2718    /**
    2819     * Unit test of {@link RelationTreeCellRenderer#RelationTreeCellRenderer}.

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

    r17275 r18037  
    66import javax.swing.JTable;
    77
    8 import org.junit.jupiter.api.extension.RegisterExtension;
     8import org.openstreetmap.josm.data.osm.Node;
     9import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     10
    911import org.junit.jupiter.api.Test;
    10 import org.openstreetmap.josm.data.osm.Node;
    11 import org.openstreetmap.josm.testutils.JOSMTestRules;
    12 
    13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1412
    1513/**
    1614 * Unit tests of {@link SelectionTableCellRenderer} class.
    1715 */
     16@BasicPreferences
    1817class SelectionTableCellRendererTest {
    19 
    20     /**
    21      * Setup test.
    22      */
    23     @RegisterExtension
    24     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    25     public JOSMTestRules test = new JOSMTestRules().preferences();
    26 
    2718    /**
    2819     * Unit test of {@link SelectionTableCellRenderer#SelectionTableCellRenderer}.
Note: See TracChangeset for help on using the changeset viewer.