Changeset 10222 in josm for trunk/test/performance/org/openstreetmap/josm/data

Timestamp:

2016-05-15T21:14:06+02:00 (9 years ago)

Author:

Don-vip

Message:

findbugs - fix/suppress most of warnings reported in unit tests + enable low confidence warnings for core

Location:

trunk/test/performance/org/openstreetmap/josm/data/osm

Files:

• KeyValuePerformanceTest.java (modified) (4 diffs)
• RoundingPerformanceTest.java (modified) (2 diffs)
• visitor/paint/AbstractMapRendererPerformanceTestParent.java (modified) (4 diffs)
• visitor/paint/StyledMapRendererPerformanceTest.java (modified) (2 diffs)

trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java

@@ -20 +20 @@
 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
 import org.openstreetmap.josm.data.osm.OsmDataGenerator.KeyValueDataGenerator;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -38 +40 @@
      */
     @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public Timeout globalTimeout = Timeout.seconds(15*60);
 
@@ -52 +55 @@
      */
     @Test
-    public void meassureStringEqualsIntern() {
+    @SuppressFBWarnings(value = "DM_STRING_CTOR", justification = "test Strings that are interned and those that are not")
+    public void measureStringEqualsIntern() {
         String str1Interned = "string1";
         String str1InternedB = "string1";
@@ -196 +200 @@
      */
     @Test
+    @SuppressFBWarnings(value = "RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT")
     public void testKeyValueGetKeysGet() {
         for (double tagNodeRatio : TAG_NODE_RATIOS) {

trunk/test/performance/org/openstreetmap/josm/data/osm/RoundingPerformanceTest.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.LatLonTest;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -22 +24 @@
      */
     @Test
+    @SuppressFBWarnings(value = "RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT")
     public void test() {
         final int n = 1000000;

trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java

@@ -24 +24 @@
 import org.openstreetmap.josm.io.OsmReader;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Abstract superclass of {@code StyledMapRendererPerformanceTest} and {@code WireframeMapRendererPerformanceTest}.
@@ -32 +34 @@
     private static final int IMG_HEIGHT = 1050;
 
+    @SuppressFBWarnings(value = "MS_PKGPROTECT")
     protected static Graphics2D g;
+    @SuppressFBWarnings(value = "MS_PKGPROTECT")
     protected static BufferedImage img;
+    @SuppressFBWarnings(value = "MS_PKGPROTECT")
     protected static NavigatableComponent nc;
     private static DataSet dsRestriction;
@@ -43 +48 @@
      */
     @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public Timeout globalTimeout = Timeout.seconds(15*60);
 
@@ -121 +127 @@
     }
 
-    /** run this manually to verify that the rendering is set up properly */
+    /**
+     * run this manually to verify that the rendering is set up properly
+     * @throws IOException if any I/O error occurs
+     */
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD")
     private void dumpRenderedImage() throws IOException {
-        File outputfile = new File("test-neubrandenburg.png");
-        ImageIO.write(img, "png", outputfile);
+        ImageIO.write(img, "png", new File("test-neubrandenburg.png"));
     }
 }

trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererPerformanceTest.java

@@ -9 +9 @@
 import org.junit.BeforeClass;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -27 +29 @@
     }
 
-    /** run this manually to verify that the rendering is set up properly */
+    /**
+     * run this manually to verify that the rendering is set up properly
+     * @throws IOException if any I/O error occurs
+     */
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD")
     private void dumpRenderedImage() throws IOException {
-        File outputfile = new File("test-neubrandenburg.png");
-        ImageIO.write(img, "png", outputfile);
+        ImageIO.write(img, "png", new File("test-neubrandenburg.png"));
     }
 }