Changeset 34428 in osm for applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org

Timestamp:

2018-07-18T12:02:17+02:00 (7 years ago)

Author:

renerr18

Message:

Improvements and refactoring (logging, ImageInfo, CubemapBuilder) post release.

Location:

applications/editors/josm/plugins/MicrosoftStreetside

Files:

• . (modified) (1 prop)
• test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideAbstractImageTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideDataTest.java (modified) (6 diffs)
• test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideLayerTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/streetside/cubemap/GraphicsUtilsTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTaskTest.java (modified) (1 diff)

applications/editors/josm/plugins/MicrosoftStreetside

@@ -8 +8 @@
 .gitignore
 .gradle
+.settings
 checkstyle-josm-MicrosoftStreetside.xml
 spotbugs-josm-MicrosoftStreetside.xml

@@ -8 +8 @@
 .gitignore
 .gradle
+.settings
 checkstyle-josm-MicrosoftStreetside.xml
 spotbugs-josm-MicrosoftStreetside.xml

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideAbstractImageTest.java

@@ -13 +13 @@
 public class StreetsideAbstractImageTest {
 
-  @Rule
-  public JOSMTestRules rules = new StreetsideTestRules().platform();
+  /*@Rule
+  public JOSMTestRules rules = new StreetsideTestRules().platform();*/
 
   @Test

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideDataTest.java

@@ -25 +25 @@
 public class StreetsideDataTest {
 
-  @Rule
-  public JOSMTestRules rules = new StreetsideTestRules().platform();
+  /*@Rule
+  public JOSMTestRules rules = new StreetsideTestRules().platform();*/
 
   private StreetsideData data;
@@ -96 +96 @@
    * Tests the selection of images.
    */
-  @Ignore
   @Test
   public void selectTest() {
@@ -113 +112 @@
    * {@link StreetsideData#selectPrevious()} methods.
    */
-  @Ignore
   @Test
   public void nextAndPreviousTest() {
@@ -128 +126 @@
   }
 
-  @Ignore
   @Test(expected=IllegalStateException.class)
   public void nextOfNullImgTest() {
@@ -135 +132 @@
   }
 
-  @Ignore
   @Test(expected=IllegalStateException.class)
   public void previousOfNullImgTest() {
@@ -146 +142 @@
    * multiselected List should reset.
    */
-  @Ignore
   @Test
   public void multiSelectTest() {

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideLayerTest.java

@@ -73 +73 @@
   }
 
-  @Ignore
   @Test
   public void testClearInstance() {

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/cubemap/GraphicsUtilsTest.java

@@ -48 +48 @@
 
   /**
-   * Test method for {@link org.openstreetmap.josm.plugins.streetside.cubemap.GraphicsUtils#convertBufferedImage2JavaFXImage(java.awt.image.BufferedImage)}.
+   * Test method for {@link org.openstreetmap.josm.plugins.streetside.utils.GraphicsUtils#convertBufferedImage2JavaFXImage(java.awt.image.BufferedImage)}.
    */
   @Ignore
@@ -57 +57 @@
 
   /**
-   * Test method for {@link org.openstreetmap.josm.plugins.streetside.cubemap.GraphicsUtils#buildMultiTiledCubemapFaceImage(java.awt.image.BufferedImage[])}.
+   * Test method for {@link org.openstreetmap.josm.plugins.streetside.utils.GraphicsUtils#buildMultiTiledCubemapFaceImage(java.awt.image.BufferedImage[])}.
    */
   @Ignore
@@ -66 +66 @@
 
   /**
-   * Test method for {@link org.openstreetmap.josm.plugins.streetside.cubemap.GraphicsUtils#rotateImage(java.awt.image.BufferedImage)}.
+   * Test method for {@link org.openstreetmap.josm.plugins.streetside.utils.GraphicsUtils#rotateImage(java.awt.image.BufferedImage)}.
    */
   @Ignore

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTaskTest.java

@@ -21 +21 @@
   public final void testCall() {
     ExecutorService pool = Executors.newFixedThreadPool(1);
-    List<Callable<String>> tasks = new ArrayList<>(1);
+    List<Callable<List<String>>> tasks = new ArrayList<>(1);
       tasks.add(new TileDownloadingTask("2202112030033001233"));
       try {
-        List<Future<String>> results = pool.invokeAll(tasks);
+        List<Future<List<String>>> results = pool.invokeAll(tasks);
         assertEquals(results.get(0),"2202112030033001233");
       } catch (InterruptedException e) {

@@ -8 +8 @@
 .gitignore
 .gradle
+.settings
 checkstyle-josm-MicrosoftStreetside.xml
 spotbugs-josm-MicrosoftStreetside.xml