Changeset 12001 in josm


Ignore:
Timestamp:
2017-04-25T11:14:08+02:00 (21 months ago)
Author:
bastiK
Message:

see #13387 - simpler logic

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

    r11999 r12001  
    189189            EastNorth en = proj.latlon2eastNorth(data.ll);
    190190            LatLon ll2 = proj.eastNorth2latlon(data.en);
    191             boolean eqJava8 = !java9 && en.equals(data.en);
    192             boolean eqJava9 = java9 && equalsJava9(en, data.en);
    193             if (!eqJava8 && !eqJava9) {
     191            if (!(java9 ? equalsJava9(en, data.en) : en.equals(data.en))) {
    194192                String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
    195193                        "        expected: eastnorth(%s,%s),%n" +
     
    198196                fail.append(error);
    199197            }
    200             eqJava8 = !java9 && ll2.equals(data.ll2);
    201             eqJava9 = java9 && equalsJava9(ll2, data.ll2);
    202             if (!eqJava8 && !eqJava9) {
     198            if (!(java9 ? equalsJava9(ll2, data.ll2) : ll2.equals(data.ll2))) {
    203199                String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
    204200                        "        expected: latlon(%s,%s),%n" +
Note: See TracChangeset for help on using the changeset viewer.