PluginInstaller returns now PendingPluginInstallation, to abort the installation before restart

scm-webapp/src/test/java/sonia/scm/plugin/PendingPluginInstallationTest.java

@@ -0,0 +1,46 @@
+package sonia.scm.plugin;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
+@ExtendWith({MockitoExtension.class, TempDirectory.class})
+class PendingPluginInstallationTest {
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private AvailablePlugin plugin;
+
+  @Test
+  void shouldDeleteFileOnCancel(@TempDirectory.TempDir Path directory) throws IOException {
+    Path file = directory.resolve("file");
+    Files.write(file, "42".getBytes());
+
+    when(plugin.getDescriptor().getInformation().getName()).thenReturn("scm-awesome-plugin");
+
+    PendingPluginInstallation installation = new PendingPluginInstallation(plugin, file.toFile());
+    installation.cancel();
+
+    assertThat(file).doesNotExist();
+  }
+
+  @Test
+  void shouldThrowExceptionIfCancelFailed(@TempDirectory.TempDir Path directory) {
+    Path file = directory.resolve("file");
+    when(plugin.getDescriptor().getInformation().getName()).thenReturn("scm-awesome-plugin");
+
+    PendingPluginInstallation installation = new PendingPluginInstallation(plugin, file.toFile());
+    assertThrows(PluginFailedToCancelInstallationException.class, installation::cancel);
+  }
+
+}

scm-webapp/src/test/java/sonia/scm/plugin/PluginInstallerTest.java

@@ -51,6 +51,17 @@ class PluginInstallerTest {
     assertThat(directory.resolve("plugins").resolve("scm-git-plugin.smp")).hasContent("42");
   }
 
+  @Test
+  void shouldReturnPendingPluginInstallation() throws IOException {
+    mockContent("42");
+    AvailablePlugin gitPlugin = createGitPlugin();
+
+    PendingPluginInstallation pending = installer.install(gitPlugin);
+
+    assertThat(pending).isNotNull();
+    assertThat(pending.getPlugin()).isSameAs(gitPlugin);
+  }
+
   private void mockContent(String content) throws IOException {
     when(client.get("https://download.hitchhiker.com").request().contentAsStream())
       .thenReturn(new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)));