Changeset 16438 in josm for trunk/test/unit/org
- Timestamp:
- 2020-05-17T14:18:22+02:00 (4 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
r15576 r16438 183 183 184 184 private static double getOriginalLength(Collection<Way> ways) { 185 double len = 0; 186 for (Way w : ways) { 187 len += w.getLength(); 188 } 189 return len; 185 return ways.stream().mapToDouble(Way::getLength).sum(); 190 186 } 191 187 -
trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
r16371 r16438 234 234 Set<RelationMember> matchCandidates = new HashSet<>(r2.getMembers()); 235 235 for (RelationMember rm : r1.getMembers()) { 236 RelationMember matched = null; 237 for (RelationMember cand : matchCandidates) { 238 if (!rm.getRole().equals(cand.getRole())) continue; 239 if (!isSemanticallyEqual(rm.getMember(), cand.getMember())) continue; 240 matched = cand; 241 break; 242 } 236 RelationMember matched = matchCandidates.stream() 237 .filter(m -> rm.getRole().equals(m.getRole())) 238 .filter(m -> isSemanticallyEqual(rm.getMember(), m.getMember())) 239 .findFirst().orElse(null); 243 240 if (matched == null) return false; 244 241 matchCandidates.remove(matched); -
trunk/test/unit/org/openstreetmap/josm/data/coor/conversion/ICoordinateFormatTest.java
r12746 r16438 8 8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.data.coor.ILatLon; 10 11 import org.openstreetmap.josm.data.coor.LatLon; 11 12 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 25 26 * Tests {@link ICoordinateFormat#latToString(org.openstreetmap.josm.data.coor.ILatLon)} 26 27 * and {@link ICoordinateFormat#lonToString(org.openstreetmap.josm.data.coor.ILatLon)} 28 * and {@link ICoordinateFormat#toString(ILatLon, String)} 27 29 * for various implementations. 28 30 */ … … 32 34 assertEquals("47.0", DecimalDegreesCoordinateFormat.INSTANCE.latToString(c)); 33 35 assertEquals("19.0", DecimalDegreesCoordinateFormat.INSTANCE.lonToString(c)); 36 assertEquals("47.0 19.0", DecimalDegreesCoordinateFormat.INSTANCE.toString(c, " ")); 34 37 assertEquals("47°00'00.0\"N", DMSCoordinateFormat.INSTANCE.latToString(c)); 35 38 assertEquals("19°00'00.0\"E", DMSCoordinateFormat.INSTANCE.lonToString(c)); 39 assertEquals("47°00'00.0\"N 19°00'00.0\"E", DMSCoordinateFormat.INSTANCE.toString(c, " ")); 36 40 assertEquals("47°00.000'N", NauticalCoordinateFormat.INSTANCE.latToString(c)); 37 41 assertEquals("19°00.000'E", NauticalCoordinateFormat.INSTANCE.lonToString(c)); -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
r16006 r16438 52 52 53 53 private Relation getRelation(String testType) { 54 for (Relation r: testDataset.getRelations()) { 55 if (testType.equals(r.get("test"))) 56 return r; 57 } 58 return null; 54 return testDataset.getRelations().stream().filter(r -> testType.equals(r.get("test"))).findFirst().orElse(null); 59 55 } 60 56 61 57 private String[] getNames(List<RelationMember> members) { 62 String[] result = new String[members.size()]; 63 for (int i = 0; i < result.length; i++) { 64 result[i] = members.get(i).getMember().get("name"); 65 } 66 return result; 58 return members.stream().map(member -> member.getMember().get("name")).toArray(String[]::new); 67 59 } 68 60 -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
r16006 r16438 59 59 60 60 private Relation getRelation(String testType) { 61 for (Relation r: testDataset.getRelations()) { 62 if (testType.equals(r.get("test"))) 63 return r; 64 } 65 return null; 61 return testDataset.getRelations().stream().filter(r -> testType.equals(r.get("test"))).findFirst().orElse(null); 66 62 } 67 63 -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java
r16398 r16438 20 20 import java.util.concurrent.TimeUnit; 21 21 import java.util.stream.Collectors; 22 import java.util.stream.Stream; 22 23 23 24 import javax.imageio.ImageIO; … … 280 281 // | 8 3 7 | 281 282 // +-----------+ 282 for (LatLon candidate : new LatLon[] {283 return Stream.of( 283 284 new LatLon(y1, x2), 284 285 new LatLon(y2, x3), … … 289 290 new LatLon(y3, x3), 290 291 new LatLon(y3, x1) 291 }) { 292 if (shape.contains(candidate)) { 293 return candidate; 294 } 295 } 296 return center; 292 ).filter(shape::contains).findFirst().orElse(center); 297 293 } 298 294
Note:
See TracChangeset
for help on using the changeset viewer.