Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessorTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (3 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

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessorTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessorTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.imagery;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.awt.Color;
@@ -11 +11 @@
 import java.awt.image.IndexColorModel;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -21 +21 @@
  * @author Michael Zangl
  */
-public class ColorfulImageProcessorTest {
+class ColorfulImageProcessorTest {
 
     private static final int TEST_IMAGE_SIZE = 5;
@@ -44 +44 @@
      * No special rules
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -52 +52 @@
      */
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         ColorfulImageProcessor processor = new ColorfulImageProcessor();
 
@@ -80 +80 @@
      */
     @Test
-    public void testProcessing() {
+    void testProcessing() {
         for (ConversionData data : new ConversionData[] {
                 new ConversionData(Color.BLACK, 1.5, Color.BLACK),
@@ -114 +114 @@
             for (int y = 0; y < TEST_IMAGE_SIZE; y++) {
                 Color color = new Color(image.getRGB(x, y));
-                assertEquals(data + ":" + type + ": red", data.getExpectedColor().getRed(), color.getRed(), 1.05);
-                assertEquals(data + ":" + type + ": green", data.getExpectedColor().getGreen(), color.getGreen(), 1.05);
-                assertEquals(data + ":" + type + ": blue", data.getExpectedColor().getBlue(), color.getBlue(), 1.05);
+                assertEquals(data.getExpectedColor().getRed(), color.getRed(), 1.05, data + ":" + type + ": red");
+                assertEquals(data.getExpectedColor().getGreen(), color.getGreen(), 1.05, data + ":" + type + ": green");
+                assertEquals(data.getExpectedColor().getBlue(), color.getBlue(), 1.05, data + ":" + type + ": blue");
             }
         }
@@ -171 +171 @@
      */
     @Test
-    public void testToString() {
+    void testToString() {
         ColorfulImageProcessor processor = new ColorfulImageProcessor();
         assertEquals("ColorfulImageProcessor [colorfulness=1.0]", processor.toString());