Changeset 16438 in josm for trunk/test/unit/org/openstreetmap/josm/gui
- Timestamp:
- 2020-05-17T14:18:22+02:00 (4 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
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.