Changeset 14604 in josm for trunk/test/unit/org

Timestamp:

2018-12-27T17:45:37+01:00 (6 years ago)

Author:

Don-vip

Message:

tools update: awaitility 3.1.5, equalsverifier 3.1.2, jmockit 1.44, system-rules 1.19, wiremock 2.20, groovy 2.5.5, checkstyle 8.15, pmd 6.10, spotbugs 3.1.10

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/CombineWayActionTest.java (modified) (2 diffs)
• gui/MapStatusTest.java (modified) (2 diffs)
• testutils/mockers/ExtendedDialogMocker.java (modified) (2 diffs)

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

@@ -23 +23 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -66 +65 @@
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(NodePair.class).usingGetClass()
-            .suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/197 is fixed
             .withPrefabValues(Node.class, new Node(1), new Node(2))
             .verify();

trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java

@@ -9 +9 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -30 +29 @@
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(MapStatus.StatusTextHistory.class)
-            .suppress(Warning.ANNOTATION) // FIXME: To remove once https://github.com/jqno/equalsverifier/issues/197 is fixed
             .withIgnoredFields("text").verify();
     }

trunk/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java

@@ -18 +18 @@
 import mockit.Invocation;
 import mockit.Mock;
+import mockit.internal.reflection.FieldReflection;
 
 /**
@@ -157 +158 @@
                 final int mockResult = this.getMockResult(instance);
                 // TODO check validity of mockResult?
-                Deencapsulation.setField(instance, "result", mockResult);
+                FieldReflection.setField(instance.getClass(), instance, "result", mockResult);
                 Logging.info(
                     "{0} answering {1} to ExtendedDialog with content {2}",