Changeset 14603 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2018-12-27T16:38:36+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17145 - fix java warnings in tests (patch by francois2)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/ImageDataTest.java (modified) (18 diffs)
• gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java

@@ -52 +52 @@
     @Test
     public void testmageEntryWithImages() {
-        assertEquals(1, new ImageData(this.getOneImage()).getImages().size());
+        assertEquals(1, new ImageData(getOneImage()).getImages().size());
     }
 
     @Test
     public void testSortData() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         new Expectations(Collections.class) {{
@@ -68 +68 @@
     @Test
     public void testIsModifiedFalse() {
-        assertFalse(new ImageData(this.getOneImage()).isModified());
+        assertFalse(new ImageData(getOneImage()).isModified());
     }
 
     @Test
     public void testIsModifiedTrue() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         new Expectations(list.get(0)) {{
@@ -84 +84 @@
     @Test
     public void testSelectFirstImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         ImageData data = new ImageData(list);
@@ -93 +93 @@
     @Test
     public void testSelectLastImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         list.add(new ImageEntry());
 
@@ -103 +103 @@
     @Test
     public void testSelectNextImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         ImageData data = new ImageData(list);
@@ -116 +116 @@
     @Test
     public void testSelectPreviousImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         list.add(new ImageEntry());
 
@@ -131 +131 @@
     @Test
     public void testSetSelectedImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         ImageData data = new ImageData(list);
@@ -140 +140 @@
     @Test
     public void testClearSelectedImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         ImageData data = new ImageData(list);
@@ -150 +150 @@
     @Test
     public void testSelectionListener() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
         ImageDataUpdateListener listener = new ImageDataUpdateListener() {
@@ -169 +169 @@
     @Test
     public void testRemoveSelectedImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
         data.selectFirstImage();
@@ -179 +179 @@
     @Test
     public void testRemoveSelectedWithImageTriggerListener() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         list.add(new ImageEntry());
         ImageData data = new ImageData(list);
@@ -199 +199 @@
     @Test
     public void testRemoveImageAndTriggerListener() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
         ImageDataUpdateListener listener = new ImageDataUpdateListener() {
@@ -219 +219 @@
     public void testMergeFrom() {
         ImageEntry image = new ImageEntry(new File("test2"));
-        List<ImageEntry> list1 = this.getOneImage();
+        List<ImageEntry> list1 = getOneImage();
         list1.add(image);
-        List<ImageEntry> list2 = this.getOneImage();
+        List<ImageEntry> list2 = getOneImage();
         list2.add(new ImageEntry(new File("test3")));
 
@@ -244 +244 @@
     public void testMergeFromSelectedImage() {
         ImageEntry image = new ImageEntry(new File("test2"));
-        List<ImageEntry> list1 = this.getOneImage();
+        List<ImageEntry> list1 = getOneImage();
         list1.add(image);
-        List<ImageEntry> list2 = this.getOneImage();
+        List<ImageEntry> list2 = getOneImage();
 
         ImageData data = new ImageData(list1);
@@ -259 +259 @@
     @Test
     public void testUpdatePosition() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
 
@@ -271 +271 @@
     @Test
     public void testUpdateDirection() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
 
@@ -283 +283 @@
     @Test
     public void testTriggerListenerOnUpdate() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
 
@@ -303 +303 @@
     @Test
     public void testManuallyTriggerUpdateListener() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
 

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -296 +296 @@
     }
 
+    @SuppressWarnings("fallthrough")
     private static AbstractTileSource getTileSource(ImageryInfo info)
             throws IOException, WMTSGetCapabilitiesException, WMSGetCapabilitiesException {