Fixed bug related to progress numbers during upload and added unit test for PluginState class

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins/mapillary@31482 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4

Author: nokutu

build.xml

@@ -4,7 +4,7 @@
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="8433"/>
     <property name="plugin.canloadatruntime" value="true"/>
-    <property name="plugin.version" value="0.9.1"/>
+    <property name="plugin.version" value="0.9.2"/>
     <property name="plugin.author" value="nokutu &lt;nokutu@openmailbox.org&gt;"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin"/>
     <property name="plugin.description" value="Allows the user to work with pictures hosted at mapillary.com"/>

src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java

@@ -175,7 +175,6 @@ public void run() {
           }
       }
       this.ex.shutdown();
-      PluginState.finishUpload();
     }
   }
 

src/org/openstreetmap/josm/plugins/mapillary/utils/PluginState.java

@@ -17,7 +17,7 @@ public class PluginState {
 
   private static int runningDownloads = 0;
   /** Images that have to be uploaded. */
-  public static int imagesToUpload = 0;
+  protected static int imagesToUpload = 0;
   /** Images that have been uploaded. */
   public static int imagesUploaded = 0;
 
@@ -32,6 +32,9 @@ public static void startDownload() {
    * Called when a download is finished.
    */
   public static void finishDownload() {
+    if (runningDownloads == 0)
+      throw new IllegalStateException(
+          "The amount of running downlaods is less or equals to 0");
     runningDownloads--;
   }
 
@@ -44,16 +47,6 @@ public static boolean isDownloading() {
     return runningDownloads > 0;
   }
 
-  /**
-   * Called when an upload is finished.
-   */
-  public static void finishUpload() {
-    if (imagesUploaded >= imagesToUpload) {
-      imagesUploaded = 0;
-      imagesToUpload = 0;
-    }
-  }
-
   /**
    * Checks if there is any running upload.
    *
@@ -70,6 +63,10 @@ public static boolean isUploading() {
    *          The amount of images that are going to be uploaded.
    */
   public static void imagesToUpload(int amount) {
+    if (imagesToUpload <= imagesUploaded) {
+      imagesToUpload = 0;
+      imagesUploaded = 0;
+    }
     imagesToUpload += amount;
   }
 
@@ -79,7 +76,8 @@ public static void imagesToUpload(int amount) {
   public static void imageUploaded() {
     imagesUploaded++;
     if (imagesToUpload == imagesUploaded) {
-      finishedUploadDialog();
+      if (Main.main != null)
+        finishedUploadDialog();
     }
   }
 

test/unit/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecordTest.java

@@ -40,20 +40,23 @@ public void setUp() {
    */
   @Test
   public void commandTest() {
-    MapillaryCommand cmd1 = new CommandMoveImage(
+    MapillaryCommand cmd12 = new CommandMoveImage(
         Arrays.asList(new MapillaryAbstractImage[] { this.img1, this.img2 }),
         0.1, 0.1);
-    MapillaryCommand cmd2 = new CommandMoveImage(
+    MapillaryCommand cmd23 = new CommandMoveImage(
         Arrays.asList(new MapillaryAbstractImage[] { this.img2, this.img3 }),
         0.1, 0.1);
-    MapillaryCommand cmd3 = new CommandMoveImage(
+    MapillaryCommand cmd13 = new CommandMoveImage(
         Arrays.asList(new MapillaryAbstractImage[] { this.img1, this.img3 }),
         0.1, 0.1);
+    MapillaryCommand cmd1 = new CommandMoveImage(
+        Arrays.asList(new MapillaryAbstractImage[] { this.img1 }),
+        0.1, 0.1);
     MapillaryCommand cmd31 = new CommandMoveImage(
         Arrays.asList(new MapillaryAbstractImage[] { this.img3, this.img1 }),
         0.2, 0.2);
-    this.record.addCommand(cmd1);
-    this.record.addCommand(cmd2);
+    this.record.addCommand(cmd12);
+    this.record.addCommand(cmd23);
 
     assertEquals(1, this.record.position);
     assertEquals(2, this.record.commandList.size());
@@ -63,21 +66,30 @@ public void commandTest() {
     assertEquals(0, this.record.position);
     assertEquals(2, this.record.commandList.size());
 
-    this.record.addCommand(cmd3);
+    this.record.addCommand(cmd1);
 
     assertEquals(1, this.record.position);
-    assertEquals(2, this.record.commandList.size());
+
+    this.record.addCommand(cmd13);
+
+    assertEquals(2, this.record.position);
+    assertEquals(3, this.record.commandList.size());
 
     this.record.undo();
     this.record.redo();
 
-    assertEquals(1, this.record.position);
-    assertEquals(2, this.record.commandList.size());
+    assertEquals(2, this.record.position);
+    assertEquals(3, this.record.commandList.size());
 
     this.record.addCommand(cmd31);
 
-    assertEquals(1, this.record.position);
-    assertEquals(2, this.record.commandList.size());
+    assertEquals(2, this.record.position);
+    assertEquals(3, this.record.commandList.size());
+
+    this.record.addCommand(cmd1);
+
+    assertEquals(3, this.record.position);
+    assertEquals(4, this.record.commandList.size());
   }
 
   /**

test/unit/org/openstreetmap/josm/plugins/mapillary/utils/PluginStateTest.java

@@ -0,0 +1,49 @@
+package org.openstreetmap.josm.plugins.mapillary.utils;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Tests {@link PluginState} class.
+ *
+ * @author nokutu
+ * @see PluginState
+ */
+public class PluginStateTest {
+
+  /**
+   * Test the methods related to the download.
+   */
+  @Test
+  public void downloadTest() {
+    assertEquals(false, PluginState.isDownloading());
+    PluginState.startDownload();
+    assertEquals(true, PluginState.isDownloading());
+    PluginState.startDownload();
+    assertEquals(true, PluginState.isDownloading());
+    PluginState.finishDownload();
+    assertEquals(true, PluginState.isDownloading());
+    PluginState.finishDownload();
+    assertEquals(false, PluginState.isDownloading());
+  }
+
+  /**
+   * Tests the methods related to the upload.
+   */
+  @Test
+  public void uploadTest() {
+    assertEquals(false, PluginState.isUploading());
+    PluginState.imagesToUpload(2);
+    assertEquals(2, PluginState.imagesToUpload);
+    assertEquals(0, PluginState.imagesUploaded);
+    assertEquals(true, PluginState.isUploading());
+    PluginState.imageUploaded();
+    assertEquals(1, PluginState.imagesUploaded);
+    assertEquals(true, PluginState.isUploading());
+    PluginState.imageUploaded();
+    assertEquals(false, PluginState.isUploading());
+    assertEquals(0, PluginState.imagesToUpload);
+    assertEquals(0, PluginState.imagesUploaded);
+  }
+}