Changeset 14187 in josm for trunk/test


Ignore:
Timestamp:
2018-08-28T00:35:09+02:00 (16 months ago)
Author:
Don-vip
Message:

see #16010 - fix JMockit failure on Java 11+

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java

    r14084 r14187  
    5050    @Before
    5151    public void bootStrap() {
    52         new JOptionPaneSimpleMocker(ImmutableMap.of(
    53             "A background upload is already in progress. Kindly wait for it to finish before uploading new changes", JOptionPane.OK_OPTION
    54         ));
    55 
    5652        DataSet dataSet = new DataSet();
    5753        Node node1 = new Node();
     
    8278        strategy = null;
    8379        changeset = null;
    84         uploadPrimitivesTask.cancel();
     80        if (uploadPrimitivesTask != null) {
     81            uploadPrimitivesTask.cancel();
     82        }
    8583        uploadPrimitivesTask = null;
    8684    }
     
    9290    public void testSingleUploadInstance() {
    9391        TestUtils.assumeWorkingJMockit();
     92        new JOptionPaneSimpleMocker(ImmutableMap.of(
     93                "A background upload is already in progress. Kindly wait for it to finish before uploading new changes", JOptionPane.OK_OPTION
     94            ));
    9495        Optional<AsynchronousUploadPrimitivesTask> task = AsynchronousUploadPrimitivesTask.
    9596                createAsynchronousUploadTask(strategy, layer, toUpload, changeset);
Note: See TracChangeset for help on using the changeset viewer.