Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/tools/ImageResizeModeTest.java

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

File:

• trunk/test/unit/org/openstreetmap/josm/tools/ImageResizeModeTest.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/ImageResizeModeTest.java

@@ -8 +8 @@
 import java.awt.Dimension;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -17 +17 @@
  * Unit tests of {@link ImageResizeMode} class.
  */
-public class ImageResizeModeTest {
+class ImageResizeModeTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -33 +33 @@
      */
     @Test
-    public void testComputeDimensionAuto() {
+    void testComputeDimensionAuto() {
         assertThrows(IllegalArgumentException.class, () -> ImageResizeMode.AUTO.computeDimension(new Dimension(0, 0), image));
         assertEquals(new Dimension(64, 48), ImageResizeMode.AUTO.computeDimension(ImageResource.DEFAULT_DIMENSION, image));
@@ -47 +47 @@
      */
     @Test
-    public void testComputeDimensionBounded() {
+    void testComputeDimensionBounded() {
         assertEquals(new Dimension(64, 48), ImageResizeMode.BOUNDED.computeDimension(ImageResource.DEFAULT_DIMENSION, image));
         assertEquals(new Dimension(64, 48), ImageResizeMode.BOUNDED.computeDimension(new Dimension(-1, -1), image));
@@ -68 +68 @@
      */
     @Test
-    public void testComputeDimensionPadded() {
+    void testComputeDimensionPadded() {
         assertThrows(IllegalArgumentException.class, () -> ImageResizeMode.PADDED.computeDimension(new Dimension(0, 0), image));
         assertThrows(IllegalArgumentException.class, () -> ImageResizeMode.PADDED.computeDimension(ImageResource.DEFAULT_DIMENSION, image));
@@ -82 +82 @@
      */
     @Test
-    public void testCacheKey() {
+    void testCacheKey() {
         assertEquals(0x00180018, ImageResizeMode.AUTO.cacheKey(ImageProvider.ImageSizes.LARGEICON.getImageDimension()));
         assertEquals(0x10180018, ImageResizeMode.BOUNDED.cacheKey(ImageProvider.ImageSizes.LARGEICON.getImageDimension()));