Changeset 13079 in josm for trunk/test


Ignore:
Timestamp:
2017-11-04T20:27:56+01:00 (6 years ago)
Author:
Don-vip
Message:

see #15560 - EqualsVerifier does not work with newer Java versions -> disable tests automatically in this case
Workaround to ​https://github.com/jqno/equalsverifier/issues/177 / ​https://github.com/raphw/byte-buddy/issues/370
Inspired by ​https://issues.apache.org/jira/browse/SOLR-11606

Location:
trunk/test/unit/org/openstreetmap/josm
Files:
56 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/TestUtils.java

    r13078 r13079  
    2121import java.util.stream.Stream;
    2222
     23import org.junit.Assume;
    2324import org.openstreetmap.josm.command.Command;
    2425import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    329330        }
    330331    }
     332
     333    /**
     334     * Use to assume that EqualsVerifier is working with the current JVM.
     335     */
     336    public static void assumeWorkingEqualsVerifier() {
     337        try {
     338            // Workaround to https://github.com/jqno/equalsverifier/issues/177
     339            // Inspired by https://issues.apache.org/jira/browse/SOLR-11606
     340            nl.jqno.equalsverifier.internal.lib.bytebuddy.ClassFileVersion.ofThisVm();
     341        } catch (IllegalArgumentException e) {
     342            Assume.assumeNoException(e);
     343        }
     344    }
    331345}

  • trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java

    r12463 r13079  
    6464    @Test
    6565    public void testEqualsContract() {
     66        TestUtils.assumeWorkingEqualsVerifier();
    6667        EqualsVerifier.forClass(NodePair.class).usingGetClass()
    6768            .suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/152 is fixed

  • trunk/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java

    r11978 r13079  
    4545    @Test
    4646    public void testEqualsContract() {
     47        TestUtils.assumeWorkingEqualsVerifier();
    4748        EqualsVerifier.forClass(ExtensionFileFilter.class).usingGetClass()
    4849            .suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/152 is fixed

  • trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java

    r12726 r13079  
    99import org.junit.Rule;
    1010import org.junit.Test;
     11import org.openstreetmap.josm.TestUtils;
    1112import org.openstreetmap.josm.data.coor.LatLon;
    1213import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    131132    @Test
    132133    public void testEqualsContract() {
     134        TestUtils.assumeWorkingEqualsVerifier();
    133135        EqualsVerifier.forClass(AddCommand.class).usingGetClass()
    134136            .withPrefabValues(OsmPrimitive.class,

  • trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java

    r12726 r13079  
    1414import org.junit.Rule;
    1515import org.junit.Test;
     16import org.openstreetmap.josm.TestUtils;
    1617import org.openstreetmap.josm.data.coor.LatLon;
    1718import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    285286    @Test
    286287    public void testEqualsContract() {
     288        TestUtils.assumeWorkingEqualsVerifier();
    287289        EqualsVerifier.forClass(AddPrimitivesCommand.class).usingGetClass()
    288290            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java

    r12726 r13079  
    1414import org.junit.Rule;
    1515import org.junit.Test;
     16import org.openstreetmap.josm.TestUtils;
    1617import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    1718import org.openstreetmap.josm.data.coor.LatLon;
    … …  
    154155    @Test
    155156    public void testEqualsContract() {
     157        TestUtils.assumeWorkingEqualsVerifier();
    156158        EqualsVerifier.forClass(ChangeCommand.class).usingGetClass()
    157159            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java

    r12726 r13079  
    1515import org.junit.Rule;
    1616import org.junit.Test;
     17import org.openstreetmap.josm.TestUtils;
    1718import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    1819import org.openstreetmap.josm.data.coor.LatLon;
    … …  
    125126    @Test
    126127    public void testEqualsContract() {
     128        TestUtils.assumeWorkingEqualsVerifier();
    127129        EqualsVerifier.forClass(ChangeNodesCommand.class).usingGetClass()
    128130            .withPrefabValues(Way.class,

  • trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java

    r12726 r13079  
    1717import org.junit.Rule;
    1818import org.junit.Test;
     19import org.openstreetmap.josm.TestUtils;
    1920import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    2021import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    278279    @Test
    279280    public void testEqualsContract() {
     281        TestUtils.assumeWorkingEqualsVerifier();
    280282        EqualsVerifier.forClass(ChangePropertyCommand.class).usingGetClass()
    281283            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java

    r10758 r13079  
    1414import org.junit.Rule;
    1515import org.junit.Test;
     16import org.openstreetmap.josm.TestUtils;
    1617import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    1718import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    149150    @Test
    150151    public void testEqualsContract() {
     152        TestUtils.assumeWorkingEqualsVerifier();
    151153        EqualsVerifier.forClass(ChangePropertyKeyCommand.class).usingGetClass()
    152154            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java

    r10758 r13079  
    1313import org.junit.Rule;
    1414import org.junit.Test;
     15import org.openstreetmap.josm.TestUtils;
    1516import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
    1617import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    146147    @Test
    147148    public void testEqualsContract() {
     149        TestUtils.assumeWorkingEqualsVerifier();
    148150        EqualsVerifier.forClass(ChangeRelationMemberRoleCommand.class).usingGetClass()
    149151            .withPrefabValues(Relation.class,

  • trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java

    r12726 r13079  
    66import org.junit.Rule;
    77import org.junit.Test;
     8import org.openstreetmap.josm.TestUtils;
    89import org.openstreetmap.josm.data.coor.LatLon;
    910import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    3839    @Test
    3940    public void testEqualsContract() {
     41        TestUtils.assumeWorkingEqualsVerifier();
    4042        EqualsVerifier.forClass(Command.class).usingGetClass()
    4143            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java

    r12727 r13079  
    1616import org.junit.Rule;
    1717import org.junit.Test;
     18import org.openstreetmap.josm.TestUtils;
    1819import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
    1920import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    378379    @Test
    379380    public void testEqualsContract() {
     381        TestUtils.assumeWorkingEqualsVerifier();
    380382        EqualsVerifier.forClass(DeleteCommand.class).usingGetClass()
    381383            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java

    r12726 r13079  
    1616import org.junit.Test;
    1717import org.openstreetmap.josm.Main;
     18import org.openstreetmap.josm.TestUtils;
    1819import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
    1920import org.openstreetmap.josm.data.coor.EastNorth;
    … …  
    260261    @Test
    261262    public void testEqualsContract() {
     263        TestUtils.assumeWorkingEqualsVerifier();
    262264        EqualsVerifier.forClass(MoveCommand.class).usingGetClass()
    263265            .withPrefabValues(LatLon.class,

  • trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java

    r12727 r13079  
    1616import org.junit.Rule;
    1717import org.junit.Test;
     18import org.openstreetmap.josm.TestUtils;
    1819import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
    1920import org.openstreetmap.josm.data.conflict.Conflict;
    … …  
    145146    @Test
    146147    public void testEqualsContract() {
     148        TestUtils.assumeWorkingEqualsVerifier();
    147149        EqualsVerifier.forClass(PurgeCommand.class).usingGetClass()
    148150            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java

    r10758 r13079  
    1212import org.junit.Rule;
    1313import org.junit.Test;
     14import org.openstreetmap.josm.TestUtils;
    1415import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
    1516import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    123124    @Test
    124125    public void testEqualsContract() {
     126        TestUtils.assumeWorkingEqualsVerifier();
    125127        EqualsVerifier.forClass(RemoveNodesCommand.class).usingGetClass()
    126128            .withPrefabValues(Way.class,

  • trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java

    r12726 r13079  
    1111import org.junit.Rule;
    1212import org.junit.Test;
     13import org.openstreetmap.josm.TestUtils;
    1314import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    1415import org.openstreetmap.josm.data.coor.EastNorth;
    … …  
    136137    @Test
    137138    public void testEqualsContract() {
     139        TestUtils.assumeWorkingEqualsVerifier();
    138140        EqualsVerifier.forClass(RotateCommand.class).usingGetClass()
    139141                .withPrefabValues(LatLon.class, LatLon.ZERO, new LatLon(45, 45))

  • trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java

    r12726 r13079  
    1111import org.junit.Rule;
    1212import org.junit.Test;
     13import org.openstreetmap.josm.TestUtils;
    1314import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    1415import org.openstreetmap.josm.data.coor.EastNorth;
    … …  
    136137    @Test
    137138    public void testEqualsContract() {
     139        TestUtils.assumeWorkingEqualsVerifier();
    138140        EqualsVerifier.forClass(ScaleCommand.class).usingGetClass()
    139141            .withPrefabValues(LatLon.class,

  • trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java

    r12726 r13079  
    1313import org.junit.Rule;
    1414import org.junit.Test;
     15import org.openstreetmap.josm.TestUtils;
    1516import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
    1617import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    149150    @Test
    150151    public void testEqualsContract() {
     152        TestUtils.assumeWorkingEqualsVerifier();
    151153        EqualsVerifier.forClass(SelectCommand.class).usingGetClass()
    152154            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java

    r12726 r13079  
    1717import org.junit.Rule;
    1818import org.junit.Test;
     19import org.openstreetmap.josm.TestUtils;
    1920import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
    2021import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    214215    public void testEqualsContract() {
    215216        DataSet ds = new DataSet();
     217        TestUtils.assumeWorkingEqualsVerifier();
    216218        EqualsVerifier.forClass(SequenceCommand.class).usingGetClass()
    217219            .withPrefabValues(Command.class,

  • trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java

    r10945 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.coor.LatLon;
    78import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    3132    @Test
    3233    public void testEqualsContract() {
     34        TestUtils.assumeWorkingEqualsVerifier();
    3335        EqualsVerifier.forClass(TransformNodesCommand.class).usingGetClass()
    3436            .withPrefabValues(LatLon.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java

    r12726 r13079  
    99import org.junit.Rule;
    1010import org.junit.Test;
     11import org.openstreetmap.josm.TestUtils;
    1112import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    1213import org.openstreetmap.josm.data.conflict.Conflict;
    … …  
    7374    @Test
    7475    public void testEqualsContract() {
     76        TestUtils.assumeWorkingEqualsVerifier();
    7577        EqualsVerifier.forClass(ConflictAddCommand.class).usingGetClass()
    7678            .withPrefabValues(DataSet.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java

    r10945 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.conflict.Conflict;
    78import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    3233    @Test
    3334    public void testEqualsContract() {
     35        TestUtils.assumeWorkingEqualsVerifier();
    3436        EqualsVerifier.forClass(ConflictResolveCommand.class).usingGetClass()
    3537            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java

    r12726 r13079  
    99import org.junit.Rule;
    1010import org.junit.Test;
     11import org.openstreetmap.josm.TestUtils;
    1112import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    1213import org.openstreetmap.josm.data.conflict.Conflict;
    … …  
    9091    @Test
    9192    public void testEqualsContract() {
     93        TestUtils.assumeWorkingEqualsVerifier();
    9294        EqualsVerifier.forClass(CoordinateConflictResolveCommand.class).usingGetClass()
    9395            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java

    r10945 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.conflict.Conflict;
    78import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    3334    @Test
    3435    public void testEqualsContract() {
     36        TestUtils.assumeWorkingEqualsVerifier();
    3537        EqualsVerifier.forClass(DeletedStateConflictResolveCommand.class).usingGetClass()
    3638            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java

    r10945 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.conflict.Conflict;
    78import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    3334    @Test
    3435    public void testEqualsContract() {
     36        TestUtils.assumeWorkingEqualsVerifier();
    3537        EqualsVerifier.forClass(ModifiedConflictResolveCommand.class).usingGetClass()
    3638            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java

    r10945 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.conflict.Conflict;
    78import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    3334    @Test
    3435    public void testEqualsContract() {
     36        TestUtils.assumeWorkingEqualsVerifier();
    3537        EqualsVerifier.forClass(RelationMemberConflictResolverCommand.class).usingGetClass()
    3638            .withPrefabValues(Relation.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java

    r10945 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.conflict.Conflict;
    78import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    3334    @Test
    3435    public void testEqualsContract() {
     36        TestUtils.assumeWorkingEqualsVerifier();
    3537        EqualsVerifier.forClass(TagConflictResolveCommand.class).usingGetClass()
    3638            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java

    r10945 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.conflict.Conflict;
    78import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    3334    @Test
    3435    public void testEqualsContract() {
     36        TestUtils.assumeWorkingEqualsVerifier();
    3537        EqualsVerifier.forClass(VersionConflictResolveCommand.class).usingGetClass()
    3638            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java

    r10945 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.conflict.Conflict;
    78import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    3334    @Test
    3435    public void testEqualsContract() {
     36        TestUtils.assumeWorkingEqualsVerifier();
    3537        EqualsVerifier.forClass(WayNodesConflictResolverCommand.class).usingGetClass()
    3638            .withPrefabValues(Conflict.class,

  • trunk/test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java

    r10945 r13079  
    66import org.junit.Rule;
    77import org.junit.Test;
     8import org.openstreetmap.josm.TestUtils;
    89import org.openstreetmap.josm.testutils.JOSMTestRules;
    910
    … …  
    2930    @Test
    3031    public void testEqualsContract() {
     32        TestUtils.assumeWorkingEqualsVerifier();
    3133        EqualsVerifier.forClass(CachedLatLon.class).usingGetClass()
    3234            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java

    r12795 r13079  
    1010import org.junit.Rule;
    1111import org.junit.Test;
     12import org.openstreetmap.josm.TestUtils;
    1213import org.openstreetmap.josm.data.Bounds;
    1314import org.openstreetmap.josm.testutils.JOSMTestRules;
    … …  
    146147    @Test
    147148    public void testEqualsContract() {
     149        TestUtils.assumeWorkingEqualsVerifier();
    148150        EqualsVerifier.forClass(LatLon.class).usingGetClass()
    149151            .withPrefabValues(DecimalFormat.class, new DecimalFormat("00.0"), new DecimalFormat("00.000"))

  • trunk/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java

    r11085 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.testutils.JOSMTestRules;
    78
    … …  
    2627    @Test
    2728    public void testEqualsContract() {
     29        TestUtils.assumeWorkingEqualsVerifier();
    2830        EqualsVerifier.forClass(TagCorrection.class).usingGetClass().verify();
    2931    }

  • trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java

    r12729 r13079  
    2020import org.junit.Test;
    2121import org.openstreetmap.josm.Main;
     22import org.openstreetmap.josm.TestUtils;
    2223import org.openstreetmap.josm.data.Bounds;
    2324import org.openstreetmap.josm.data.DataSource;
    … …  
    445446    @Test
    446447    public void testEqualsContract() {
     448        TestUtils.assumeWorkingEqualsVerifier();
    447449        EqualsVerifier.forClass(GpxData.class).usingGetClass()
    448450            .withIgnoredFields("attr", "creator", "fromServer", "storageFile", "listeners", "tracks", "routes", "waypoints", "proxy")

  • trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java

    r10906 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.coor.LatLon;
    78import org.openstreetmap.josm.testutils.JOSMTestRules;
    … …  
    2829    @Test
    2930    public void testEqualsContract() {
     31        TestUtils.assumeWorkingEqualsVerifier();
    3032        EqualsVerifier.forClass(GpxRoute.class).usingGetClass()
    3133            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegmentTest.java

    r10906 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.data.coor.LatLon;
    78import org.openstreetmap.josm.testutils.JOSMTestRules;
    … …  
    2728    @Test
    2829    public void testEqualsContract() {
     30        TestUtils.assumeWorkingEqualsVerifier();
    2931        EqualsVerifier.forClass(ImmutableGpxTrackSegment.class).usingGetClass()
    3032            .withIgnoredFields("bounds", "length")

  • trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackTest.java

    r10906 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.testutils.JOSMTestRules;
    78
    … …  
    2728    @Test
    2829    public void testEqualsContract() {
     30        TestUtils.assumeWorkingEqualsVerifier();
    2931        EqualsVerifier.forClass(ImmutableGpxTrack.class).usingGetClass()
    3032            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java

    r12197 r13079  
    66import org.junit.Rule;
    77import org.junit.Test;
     8import org.openstreetmap.josm.TestUtils;
    89import org.openstreetmap.josm.testutils.JOSMTestRules;
    910
    … …  
    2930    @Test
    3031    public void testEqualsContract() {
     32        TestUtils.assumeWorkingEqualsVerifier();
    3133        EqualsVerifier.forClass(WayPoint.class).usingGetClass()
    3234            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java

    r10906 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.testutils.JOSMTestRules;
    78
    … …  
    2728    @Test
    2829    public void testEqualsContract() {
     30        TestUtils.assumeWorkingEqualsVerifier();
    2931        EqualsVerifier.forClass(WithAttributes.class).usingGetClass()
    3032            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java

    r10945 r13079  
    99import org.junit.Rule;
    1010import org.junit.Test;
     11import org.openstreetmap.josm.TestUtils;
    1112import org.openstreetmap.josm.data.coor.LatLon;
    1213import org.openstreetmap.josm.testutils.JOSMTestRules;
    … …  
    5859    @Test
    5960    public void testEqualsContract() {
     61        TestUtils.assumeWorkingEqualsVerifier();
    6062        EqualsVerifier.forClass(Note.class).usingGetClass()
    6163            .withIgnoredFields("latLon", "createdAt", "closedAt", "state", "comments")

  • trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java

    r12935 r13079  
    99import org.junit.Test;
    1010import org.openstreetmap.josm.Main;
     11import org.openstreetmap.josm.TestUtils;
    1112import org.openstreetmap.josm.io.OsmApi;
    1213import org.openstreetmap.josm.testutils.JOSMTestRules;
    … …  
    6162    @Test
    6263    public void testEqualsContract() {
     64        TestUtils.assumeWorkingEqualsVerifier();
    6365        EqualsVerifier.forClass(OAuthParameters.class).usingGetClass().verify();
    6466    }

  • trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthTokenTest.java

    r10758 r13079  
    66
    77import org.junit.Test;
     8import org.openstreetmap.josm.TestUtils;
    89
    910import nl.jqno.equalsverifier.EqualsVerifier;
    … …  
    3435    @Test
    3536    public void testEqualsContract() {
     37        TestUtils.assumeWorkingEqualsVerifier();
    3638        EqualsVerifier.forClass(OAuthToken.class).usingGetClass().verify();
    3739    }

  • trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java

    r12029 r13079  
    88import org.junit.Rule;
    99import org.junit.Test;
     10import org.openstreetmap.josm.TestUtils;
    1011import org.openstreetmap.josm.data.coor.LatLon;
    1112import org.openstreetmap.josm.testutils.JOSMTestRules;
    … …  
    3233    @Test
    3334    public void testEqualsContract() {
     35        TestUtils.assumeWorkingEqualsVerifier();
    3436        EqualsVerifier.forClass(BBox.class).usingGetClass()
    3537            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java

    r12659 r13079  
    1616import org.junit.Rule;
    1717import org.junit.Test;
     18import org.openstreetmap.josm.TestUtils;
    1819import org.openstreetmap.josm.data.coor.LatLon;
    1920import org.openstreetmap.josm.data.osm.Filter.FilterPreferenceEntry;
    … …  
    242243    @Test
    243244    public void testEqualsContract() {
     245        TestUtils.assumeWorkingEqualsVerifier();
    244246        EqualsVerifier.forClass(FilterPreferenceEntry.class).usingGetClass()
    245247            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java

    r11392 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.testutils.JOSMTestRules;
    78
    … …  
    2728    @Test
    2829    public void testEqualsContract() {
     30        TestUtils.assumeWorkingEqualsVerifier();
    2931        EqualsVerifier.forClass(Storage.class).usingGetClass()
    3032            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/data/tagging/ac/AutoCompletionPriorityTest.java

    r12859 r13079  
    1414import org.junit.Rule;
    1515import org.junit.Test;
     16import org.openstreetmap.josm.TestUtils;
    1617import org.openstreetmap.josm.testutils.JOSMTestRules;
    1718
    … …  
    9697    @Test
    9798    public void testEqualsContract() {
     99        TestUtils.assumeWorkingEqualsVerifier();
    98100        EqualsVerifier.forClass(AutoCompletionPriority.class).usingGetClass()
    99101            .verify();

  • trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java

    r11085 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.testutils.JOSMTestRules;
    78
    … …  
    2627    @Test
    2728    public void testEqualsContract() {
     29        TestUtils.assumeWorkingEqualsVerifier();
    2830        EqualsVerifier.forClass(MapStatus.StatusTextHistory.class).withIgnoredFields("text").verify();
    2931    }

  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java

    r12884 r13079  
    99import org.junit.Test;
    1010import org.openstreetmap.josm.JOSMFixture;
     11import org.openstreetmap.josm.TestUtils;
    1112import org.openstreetmap.josm.spi.preferences.StringSetting;
    1213
    … …  
    5556    @Test
    5657    public void testEqualsContract() {
     58        TestUtils.assumeWorkingEqualsVerifier();
    5759        EqualsVerifier.forClass(PrefEntry.class).usingGetClass()
    5860            .withIgnoredFields("value", "defaultValue", "isDefault", "changed")

  • trunk/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java

    r11974 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager.UserInputTag;
    78import org.openstreetmap.josm.testutils.JOSMTestRules;
    … …  
    2728    @Test
    2829    public void testEqualsContract() {
     30        TestUtils.assumeWorkingEqualsVerifier();
    2931        EqualsVerifier.forClass(UserInputTag.class).usingGetClass()
    3032            .verify();

  • trunk/test/unit/org/openstreetmap/josm/gui/util/WindowGeometryTest.java

    r12849 r13079  
    1616import org.junit.Rule;
    1717import org.junit.Test;
     18import org.openstreetmap.josm.TestUtils;
    1819import org.openstreetmap.josm.gui.util.WindowGeometry.WindowGeometryException;
    1920import org.openstreetmap.josm.spi.preferences.Config;
    … …  
    147148    @Test
    148149    public void testEqualsContract() {
     150        TestUtils.assumeWorkingEqualsVerifier();
    149151        EqualsVerifier.forClass(WindowGeometry.class).usingGetClass()
    150152            .suppress(Warning.NONFINAL_FIELDS)

  • trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java

    r12754 r13079  
    1414import org.junit.Test;
    1515import org.openstreetmap.josm.Main;
     16import org.openstreetmap.josm.TestUtils;
    1617import org.openstreetmap.josm.gui.preferences.plugin.PluginPreferenceTest;
    1718import org.openstreetmap.josm.plugins.PluginHandler.DeprecatedPlugin;
    … …  
    4041    @Test
    4142    public void testEqualsContract() {
     43        TestUtils.assumeWorkingEqualsVerifier();
    4244        EqualsVerifier.forClass(DeprecatedPlugin.class).usingGetClass().verify();
    4345    }

  • trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListListSettingTest.java

    r12884 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.testutils.JOSMTestRules;
    78
    … …  
    2526    @Test
    2627    public void testEqualsContract() {
     28        TestUtils.assumeWorkingEqualsVerifier();
    2729        EqualsVerifier.forClass(ListListSetting.class).usingGetClass()
    2830            .withIgnoredFields("isNew", "time")

  • trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListSettingTest.java

    r12884 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.testutils.JOSMTestRules;
    78
    … …  
    2526    @Test
    2627    public void testEqualsContract() {
     28        TestUtils.assumeWorkingEqualsVerifier();
    2729        EqualsVerifier.forClass(ListSetting.class).usingGetClass()
    2830            .withIgnoredFields("isNew", "time")

  • trunk/test/unit/org/openstreetmap/josm/spi/preferences/MapListSettingTest.java

    r12884 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.testutils.JOSMTestRules;
    78
    … …  
    2526    @Test
    2627    public void testEqualsContract() {
     28        TestUtils.assumeWorkingEqualsVerifier();
    2729        EqualsVerifier.forClass(MapListSetting.class).usingGetClass()
    2830            .withIgnoredFields("isNew", "time")

  • trunk/test/unit/org/openstreetmap/josm/spi/preferences/StringSettingTest.java

    r12884 r13079  
    44import org.junit.Rule;
    55import org.junit.Test;
     6import org.openstreetmap.josm.TestUtils;
    67import org.openstreetmap.josm.testutils.JOSMTestRules;
    78
    … …  
    2526    @Test
    2627    public void testEqualsContract() {
     28        TestUtils.assumeWorkingEqualsVerifier();
    2729        EqualsVerifier.forClass(StringSetting.class).usingGetClass()
    2830            .withIgnoredFields("isNew", "time")

  • trunk/test/unit/org/openstreetmap/josm/tools/MultiMapTest.java

    r10758 r13079  
    88import java.util.HashSet;
    99
     10import org.junit.Test;
     11import org.openstreetmap.josm.TestUtils;
     12
    1013import nl.jqno.equalsverifier.EqualsVerifier;
    11 import org.junit.Test;
    1214
    1315/**
    … …  
    2123    @Test
    2224    public void testEqualsContract() {
     25        TestUtils.assumeWorkingEqualsVerifier();
    2326        EqualsVerifier.forClass(MultiMap.class).usingGetClass().verify();
    2427    }

  • trunk/test/unit/org/openstreetmap/josm/tools/PairTest.java

    r10758 r13079  
    33
    44import org.junit.Test;
     5import org.openstreetmap.josm.TestUtils;
    56
    67import nl.jqno.equalsverifier.EqualsVerifier;
    … …  
    1718    @Test
    1819    public void testEqualsContract() {
     20        TestUtils.assumeWorkingEqualsVerifier();
    1921        EqualsVerifier.forClass(Pair.class).suppress(Warning.NONFINAL_FIELDS).verify();
    2022    }
Note: See TracChangeset for help on using the changeset viewer.