From 1bd47434442b769e4b05531b65253cb60f38a05b Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 7 Dec 2014 18:28:24 +0100
Subject: [PATCH] added unit test for plugin updates

---
 .../sonia/scm/plugin/PluginProcessor.java     |  21 ++++++++++++-
 .../sonia/scm/plugin/PluginProcessorTest.java |  29 ++++++++++++++++++
 .../sonia/scm/plugin/scm-f-plugin-1.0.0.smp   | Bin 0 -> 4822 bytes
 .../sonia/scm/plugin/scm-f-plugin-1.0.1.smp   | Bin 0 -> 4826 bytes
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 scm-webapp/src/test/resources/sonia/scm/plugin/scm-f-plugin-1.0.0.smp
 create mode 100644 scm-webapp/src/test/resources/sonia/scm/plugin/scm-f-plugin-1.0.1.smp

diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
index 7acf7b0546..2de00a0f58 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
@@ -77,6 +77,9 @@ import javax.xml.bind.JAXBException;
 public final class PluginProcessor
 {
 
+  /** Field description */
+  private static final String INSTALLEDNAME_FORMAT = "%s.%03d";
+
   /** Field description */
   private static final String DIRECTORY_CLASSES = "classes";
 
@@ -640,7 +643,23 @@ public final class PluginProcessor
       Files.createDirectories(installedDirectory);
     }
 
-    Files.move(archive, installedDirectory.resolve(archive.getFileName()));
+    Path installed = null;
+
+    for (int i = 0; i < 1000; i++)
+    {
+      String name = String.format(INSTALLEDNAME_FORMAT, archive.getFileName(), i);
+
+      installed = installedDirectory.resolve(name);
+
+      if (!Files.exists(installed))
+      {
+        break;
+      }
+    }
+    
+    logger.debug("move installed archive to {}", installed);
+
+    Files.move(archive, installed);
   }
 
   //~--- inner classes --------------------------------------------------------
diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java
index eaf6963e9c..694b07e54f 100644
--- a/scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java
@@ -92,6 +92,16 @@ public class PluginProcessorTest
     new PluginResource("sonia/scm/plugin/scm-e-plugin.smp", "scm-e-plugin.smp",
       "sonia.scm.plugins:scm-e-plugin:1.0.0-SNAPSHOT");
 
+  /** Field description */
+  private static final PluginResource PLUGIN_F_1_0_0 =
+    new PluginResource("sonia/scm/plugin/scm-f-plugin-1.0.0.smp",
+      "scm-f-plugin.smp", "sonia.scm.plugins:scm-f-plugin:1.0.0");
+
+  /** Field description */
+  private static final PluginResource PLUGIN_F_1_0_1 =
+    new PluginResource("sonia/scm/plugin/scm-f-plugin-1.0.1.smp",
+      "scm-f-plugin.smp", "sonia.scm.plugins:scm-f-plugin:1.0.1");
+
   //~--- methods --------------------------------------------------------------
 
   /**
@@ -247,6 +257,25 @@ public class PluginProcessorTest
     assertThat(Resources.toString(url, Charsets.UTF_8), is("hello"));
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @throws IOException
+   */
+  @Test
+  public void testUpdate() throws IOException
+  {
+    copySmp(PLUGIN_F_1_0_0);
+
+    PluginWrapper plugin = collectAndGetFirst();
+
+    assertThat(plugin.getId(), is(PLUGIN_F_1_0_0.id));
+    copySmp(PLUGIN_F_1_0_1);
+    plugin = collectAndGetFirst();
+    assertThat(plugin.getId(), is(PLUGIN_F_1_0_1.id));
+  }
+
   //~--- set methods ----------------------------------------------------------
 
   /**
diff --git a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-f-plugin-1.0.0.smp b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-f-plugin-1.0.0.smp
new file mode 100644
index 0000000000000000000000000000000000000000..cfcaae8427b446944574f877a2904199c48a28ed
GIT binary patch
literal 4822
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

literal 0
HcmV?d00001

diff --git a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-f-plugin-1.0.1.smp b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-f-plugin-1.0.1.smp
new file mode 100644
index 0000000000000000000000000000000000000000..7132f78277d05f60b443801fff08a54870015893
GIT binary patch
literal 4826
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
F{tLz+R0;q9

literal 0
HcmV?d00001