Changeset 11114 in josm for trunk

Timestamp:

2016-10-09T23:50:56+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - minor fixes

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (1 diff)
• test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -77 +77 @@
                 .setIcon(JOptionPane.INFORMATION_MESSAGE)
                 .show();
-        return;
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
@@ -66 +67 @@
         for (int i = 0; i < STRING_INTERN_TESTS; i++) {
             // warm up
-            assertTrue(str1.equals(str1B));
+            assertEquals(str1, str1B);
         }
 
@@ -77 +78 @@
         timer = PerformanceTestUtils.startTimer("str1.equals(str2) succeeds (without intern)");
         for (int i = 0; i < STRING_INTERN_TESTS; i++) {
-            assertTrue(str1.equals(str1B));
+            assertEquals(str1, str1B);
         }
         timer.done();