Changeset 10547 in josm for trunk/test/unit

Timestamp:

2016-07-17T13:07:14+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13159 - Move image processors out of imagery layer (patch by michael2402) - gsoc-core + fix checkstyle violations

Location:

trunk/test/unit/org/openstreetmap/josm/gui/layer

Files:

• ImageryLayerTest.java (modified) (2 diffs)
• imagery (added)
• imagery/ColorfulImageProcessorTest.java (added)
• imagery/GammaImageProcessorTest.java (added)
• imagery/SharpenImageProcessorTest.java (added)

trunk/test/unit/org/openstreetmap/josm/gui/layer/ImageryLayerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -14 +18 @@
 
     /**
-     * Setup tests
+     * For creating layers
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init(true);
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
 
     /**
-     * Unit test of {@link ImageryLayer.ColorfulImageProcessor#toString}
-     *          and {@link ImageryLayer.GammaImageProcessor#toString()}.
-     *          and {@link ImageryLayer.SharpenImageProcessor#toString()}.
+     * Unit test of {@link ImageryLayer#getFilterSettings()}
      */
     @Test
-    public void testToString() {
+    public void testHasSettings() {
         ImageryLayer layer = TMSLayerTest.createTmsLayer();
-        assertEquals("ColorfulImageProcessor [colorfulness=1.0]", layer.collorfulnessImageProcessor.toString());
-        assertEquals("GammaImageProcessor [gamma=1.0]", layer.gammaImageProcessor.toString());
-        assertEquals("SharpenImageProcessor [sharpenLevel=1.0]", layer.sharpenImageProcessor.toString());
+        ImageryFilterSettings settings = layer.getFilterSettings();
+        assertNotNull(settings);
+        assertSame(settings, layer.getFilterSettings());
     }
 }