Changeset 32065 in osm for applications/editors/josm


Ignore:
Timestamp:
2016-02-11T23:17:26+01:00 (8 years ago)
Author:
floscher
Message:

[mapillary] Fix the unit tests that were failing after last commit, because they used an invalid image-key

Location:
applications/editors/josm/plugins/mapillary
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/ValidationUtil.java

    r32064 r32065  
    4343  public static void throwExceptionForInvalidImgKey(String imgKey, boolean nullAllowed) {
    4444    if (!validateSequenceKey(imgKey)) {
    45       throw new IllegalArgumentException(I18n.tr("The image key ''{{0}}'' is invalid!", imgKey));
     45      throw new IllegalArgumentException(I18n.tr("The image key ''{0}'' is invalid!", imgKey));
    4646    }
    4747    if (!nullAllowed && imgKey == null) {
    … …  
    5959  public static void throwExceptionForInvalidSeqKey(String seqKey, boolean nullAllowed) {
    6060    if (!validateSequenceKey(seqKey)) {
    61       throw new IllegalArgumentException(I18n.tr("The sequence key ''{{0}}'' is invalid!", seqKey));
     61      throw new IllegalArgumentException(I18n.tr("The sequence key ''{0}'' is invalid!", seqKey));
    6262    }
    6363    if (!nullAllowed && seqKey == null) {

  • applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillaryDataTest.java

    r32033 r32065  
    1919public class MapillaryDataTest extends AbstractTest {
    2020
    21   MapillaryData data;
    22   MapillaryImage img1;
    23   MapillaryImage img2;
    24   MapillaryImage img3;
    25   MapillaryImage img4;
    26   MapillarySequence seq;
     21  private MapillaryData data;
     22  private MapillaryImage img1;
     23  private MapillaryImage img2;
     24  private MapillaryImage img3;
     25  private MapillaryImage img4;
     26  private MapillarySequence seq;
    2727
    2828  /**
    … …  
    3232  @Before
    3333  public void setUp() {
    34     this.img1 = new MapillaryImage("key1", new LatLon(0.1, 0.1), 90);
    35     this.img2 = new MapillaryImage("key2", new LatLon(0.2, 0.2), 90);
    36     this.img3 = new MapillaryImage("key3", new LatLon(0.3, 0.3), 90);
    37     this.img4 = new MapillaryImage("key4", new LatLon(0.4, 0.4), 90);
     34    this.img1 = new MapillaryImage("key1__________________", new LatLon(0.1, 0.1), 90);
     35    this.img2 = new MapillaryImage("key2__________________", new LatLon(0.2, 0.2), 90);
     36    this.img3 = new MapillaryImage("key3__________________", new LatLon(0.3, 0.3), 90);
     37    this.img4 = new MapillaryImage("key4__________________", new LatLon(0.4, 0.4), 90);
    3838    this.seq = new MapillarySequence();
    3939
    40     this.seq.add(Arrays.asList(new MapillaryAbstractImage[] { this.img1,
    41         this.img2, this.img3, this.img4 }));
     40    this.seq.add(Arrays.asList(new MapillaryAbstractImage[] { img1, img2, img3, img4 }));
    4241    this.img1.setSequence(this.seq);
    4342    this.img2.setSequence(this.seq);
    … …  
    6160    this.data.add(this.img1);
    6261    assertEquals(1, this.data.getImages().size());
    63     this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img2,
    64         this.img3 })));
     62    this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img2, this.img3 })));
    6563    assertEquals(3, this.data.getImages().size());
    66     this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img3,
    67         this.img4 })));
     64    this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img3, this.img4 })));
    6865    assertEquals(4, this.data.getImages().size());
    6966  }
    … …  
    7572  public void sizeTest() {
    7673    assertEquals(4, this.data.size());
    77     this.data.add(new MapillaryImage("key5", new LatLon(0.1, 0.1), 90));
     74    this.data.add(new MapillaryImage("key5__________________", new LatLon(0.1, 0.1), 90));
    7875    assertEquals(5, this.data.size());
    7976  }
    … …  
    112109   */
    113110  @Test
    114   public void NextAndPreviousTest() {
     111  public void nextAndPreviousTest() {
    115112    this.data.setSelectedImage(this.img1);
    116113
    … …  
    129126      fail();
    130127    } catch (IllegalStateException e) {
    131     } catch (Exception e) {
    132       fail();
    133128    }
    134129    // Test IllegalStateException thrown by selectPrevious() when the
    … …  
    138133      fail();
    139134    } catch (IllegalStateException e) {
    140     } catch (Exception e) {
    141       fail();
    142135    }
    143136  }

  • applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceTest.java

    r32033 r32065  
    1818public class MapillarySequenceTest {
    1919
    20   MapillaryImage img1;
    21   MapillaryImage img2;
    22   MapillaryImage img3;
    23   MapillaryImage img4;
    24   MapillarySequence seq;
     20  private MapillaryImage img1;
     21  private MapillaryImage img2;
     22  private MapillaryImage img3;
     23  private MapillaryImage img4;
     24  private MapillarySequence seq;
    2525
    2626  /**
    … …  
    3030  @Before
    3131  public void setUp() {
    32     this.img1 = new MapillaryImage("key1", new LatLon(0.1, 0.1), 90);
    33     this.img2 = new MapillaryImage("key2", new LatLon(0.2, 0.2), 90);
    34     this.img3 = new MapillaryImage("key3", new LatLon(0.3, 0.3), 90);
    35     this.img4 = new MapillaryImage("key4", new LatLon(0.4, 0.4), 90);
    36     this.seq = new MapillarySequence();
     32    img1 = new MapillaryImage("key1__________________", new LatLon(0.1, 0.1), 90);
     33    img2 = new MapillaryImage("key2__________________", new LatLon(0.2, 0.2), 90);
     34    img3 = new MapillaryImage("key3__________________", new LatLon(0.3, 0.3), 90);
     35    img4 = new MapillaryImage("key4__________________", new LatLon(0.4, 0.4), 90);
     36    seq = new MapillarySequence();
    3737
    38     this.seq.add(Arrays.asList(new MapillaryAbstractImage[] { this.img1,
    39         this.img2, this.img3, this.img4 }));
    40     this.img1.setSequence(this.seq);
    41     this.img2.setSequence(this.seq);
    42     this.img3.setSequence(this.seq);
    43     this.img4.setSequence(this.seq);
     38    seq.add(Arrays.asList(new MapillaryAbstractImage[] { img1, img2, img3, img4 }));
     39    img1.setSequence(seq);
     40    img2.setSequence(seq);
     41    img3.setSequence(seq);
     42    img4.setSequence(seq);
    4443  }
    4544
    … …  
    6463    // that is not in the sequence.
    6564    try {
    66       this.seq.next(new MapillaryImage("key5", new LatLon(0.5, 0.5), 90));
     65      this.seq.next(new MapillaryImage("key5__________________", new LatLon(0.5, 0.5), 90));
    6766      fail();
    6867    } catch (IllegalArgumentException e) {
    69     } catch (Exception e) {
    70       fail();
    7168    }
    7269    // Test IllegalArgumentException when asking for the previous image of an
    … …  
    7673      fail();
    7774    } catch (IllegalArgumentException e) {
    78     } catch (Exception e) {
    79       fail();
    8075    }
    8176  }

  • applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecordTest.java

    r32033 r32065  
    3232public class MapillaryRecordTest extends AbstractTest {
    3333
    34   MapillaryRecord record;
    35   MapillaryImage img1;
    36   MapillaryImage img2;
    37   MapillaryImage img3;
     34  private MapillaryRecord record;
     35  private MapillaryImage img1;
     36  private MapillaryImage img2;
     37  private MapillaryImage img3;
    3838
    3939  /**
    … …  
    4343  @Before
    4444  public void setUp() {
    45     this.record = new MapillaryRecord();
    46     this.img1 = new MapillaryImage("key1", new LatLon(0.1, 0.1), 0.1);
    47     this.img2 = new MapillaryImage("key2", new LatLon(0.2, 0.2), 0.2);
    48     this.img3 = new MapillaryImage("key3", new LatLon(0.3, 0.3), 0.3);
     45    record = new MapillaryRecord();
     46    img1 = new MapillaryImage("key1__________________", new LatLon(0.1, 0.1), 0.1);
     47    img2 = new MapillaryImage("key2__________________", new LatLon(0.2, 0.2), 0.2);
     48    img3 = new MapillaryImage("key3__________________", new LatLon(0.3, 0.3), 0.3);
    4949    MapillaryLayer.getInstance().getData().getImages().clear();
    5050  }
    … …  
    112112  public void commandMoveTest() {
    113113    CommandMove cmd1 = new CommandMove(
    114             new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
     114            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img1, img2})),
    115115            0.1, 0.1);
    116116    CommandMove cmd2 = new CommandMove(
    117             new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
     117            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img1, img2})),
    118118            0.1, 0.1);
    119119
    … …  
    176176  @Test
    177177  public void commandJoinClass() {
    178     CommandJoin cmd1 = new CommandJoin(
    179             Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2}));
    180     CommandJoin cmd2 = new CommandJoin(
    181             Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3}));
    182 
    183     this.record.addCommand(cmd1);
    184     assertEquals(2, this.img1.getSequence().getImages().size());
    185     assertEquals(this.img2, this.img1.next());
    186     this.record.undo();
    187     assertEquals(1, this.img1.getSequence().getImages().size());
    188     this.record.redo();
    189     this.record.addCommand(cmd2);
    190     assertEquals(3, this.img1.getSequence().getImages().size());
    191     assertEquals(this.img3, this.img1.next().next());
     178    CommandJoin cmd1 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2}));
     179    CommandJoin cmd2 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img2, img3}));
     180
     181    this.record.addCommand(cmd1);
     182    assertEquals(2, img1.getSequence().getImages().size());
     183    assertEquals(img2, img1.next());
     184    this.record.undo();
     185    assertEquals(1, img1.getSequence().getImages().size());
     186    this.record.redo();
     187    this.record.addCommand(cmd2);
     188    assertEquals(3, img1.getSequence().getImages().size());
     189    assertEquals(img3, img1.next().next());
    192190
    193191    try {
    194       this.record.addCommand(new CommandJoin(Arrays
    195               .asList(new MapillaryAbstractImage[]{this.img1, this.img2,
    196                       this.img3})));
     192      this.record.addCommand(new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2, img3})));
    197193      fail();
    198194    } catch (IllegalArgumentException e) {
    199195      // Expected output.
    200     } catch (Exception e) {
    201       fail();
    202196    }
    203197  }
    … …  
    231225
    232226    try {
    233       this.record.addCommand(new CommandUnjoin(Arrays
    234               .asList(new MapillaryAbstractImage[]{this.img1, this.img2,
    235                       this.img3})));
     227      this.record.addCommand(new CommandUnjoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2, img3})));
    236228      fail();
    237229    } catch (IllegalArgumentException e) {
    238230      // Expected output.
    239     } catch (Exception e) {
    240       fail();
    241231    }
    242232  }
    … …  
    247237  @Test
    248238  public void commandDeleteTest() {
    249     CommandJoin join1 = new CommandJoin(
    250             Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2}));
    251     CommandJoin join2 = new CommandJoin(
    252             Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3}));
     239    CommandJoin join1 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2}));
     240    CommandJoin join2 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img2, img3}));
    253241
    254242    CommandDelete cmd1 = new CommandDelete(
    255             new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1})));
     243            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img1})));
    256244    CommandDelete cmd2 = new CommandDelete(
    257             new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3})));
     245            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img2, img3})));
    258246
    259247    this.record.addCommand(join1);
    … …  
    261249
    262250    MapillaryLayer
    263             .getInstance()
    264             .getData()
    265             .add(
    266                     new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2,
    267                             this.img3})));
     251        .getInstance()
     252        .getData()
     253        .add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img1, img2, img3})));
    268254
    269255    this.record.addCommand(cmd1);
Note: See TracChangeset for help on using the changeset viewer.