Changeset 17275 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict

Timestamp:

2020-10-28T20:41:00+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

Location:

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair

Files:

• nodes/NodeListMergerTestFT.java (modified) (2 diffs)
• properties/PropertiesMergerTestFT.java (modified) (2 diffs)
• relation/RelationMemberMergerTestFT.java (modified) (2 diffs)
• tags/TagMergerTestFT.java (modified) (2 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.Way;
 
-public class NodeListMergerTestFT extends JFrame {
+class NodeListMergerTestFT extends JFrame {
 
     private NodeListMerger nodeListMerger;
@@ -62 +62 @@
      * Constructs a new {@code NodeListMergerTest}.
      */
-    public NodeListMergerTestFT() {
+    NodeListMergerTestFT() {
         build();
         populate();

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTestFT.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.projection.Projections;
 
-public class PropertiesMergerTestFT extends JFrame {
+class PropertiesMergerTestFT extends JFrame {
 
     private PropertiesMerger merger;
@@ -38 +38 @@
      * Constructs a new {@code PropertiesMergerTest}.
      */
-    public PropertiesMergerTestFT() {
+    PropertiesMergerTestFT() {
         build();
         populate();

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTestFT.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.Way;
 
-public class RelationMemberMergerTestFT extends JFrame {
+class RelationMemberMergerTestFT extends JFrame {
 
     private RelationMemberMerger merger;
@@ -42 +42 @@
      * Constructs a new {@code RelationMemberMergerTest}.
      */
-    public RelationMemberMergerTestFT() {
+    RelationMemberMergerTestFT() {
         build();
         populate();

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTestFT.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
-public class TagMergerTestFT extends JFrame {
+class TagMergerTestFT extends JFrame {
 
     private TagMerger tagMerger;
@@ -19 +19 @@
      * Constructs a new {@code TagMergerTest}.
      */
-    public TagMergerTestFT() {
+    TagMergerTestFT() {
         build();
         tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue"));