SONAR-9996 Finalize uninstall at startup

diff --git a/server/sonar-server/src/main/java/org/sonar/server/edition/CommitPendingEditionOnStartup.java b/server/sonar-server/src/main/java/org/sonar/server/edition/CommitPendingEditionOnStartup.java
index 98abad4ed78960eb6ab39fa08d44ad13db87ba20..2459645c7159f062497d598264069132a1d15671 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/edition/CommitPendingEditionOnStartup.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/edition/CommitPendingEditionOnStartup.java
@@ -57,11 +57,21 @@ public class CommitPendingEditionOnStartup implements Startable {
         editionManagementState.automaticInstallReady();
         finalizeInstall(status);
         break;
+      case UNINSTALL_IN_PROGRESS:
+        failIfLicenseCommitIsPresent();
+        editionManagementState.finalizeInstallation();
+        break;
       default:
         throw new IllegalStateException("Unsupported status " + status);
     }
   }
 
+  private void failIfLicenseCommitIsPresent() {
+    if (licenseCommit != null) {
+      throw new IllegalStateException("License Manager plugin is still present after uninstallation of the edition. Please remove it.");
+    }
+  }
+
   private void finalizeInstall(EditionManagementState.PendingStatus status) {
     // license manager is not installed, can't finalize
     if (licenseCommit == null) {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/edition/CommitPendingEditionOnStartupTest.java b/server/sonar-server/src/test/java/org/sonar/server/edition/CommitPendingEditionOnStartupTest.java
new file mode 100644 (file)
index 0000000..24cda0b
--- /dev/null
+++ b/server/sonar-server/src/test/java/org/sonar/server/edition/CommitPendingEditionOnStartupTest.java
@@ -0,0 +1,62 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.server.edition;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.sonar.server.edition.EditionManagementState.PendingStatus;
+import org.sonar.server.license.LicenseCommit;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+public class CommitPendingEditionOnStartupTest {
+  @Rule
+  public ExpectedException exception = ExpectedException.none();
+
+  private MutableEditionManagementState mutableEditionManagementState = mock(MutableEditionManagementState.class);
+
+  @Test
+  public void should_commit_uninstall() {
+    CommitPendingEditionOnStartup underTest = new CommitPendingEditionOnStartup(mutableEditionManagementState);
+    when(mutableEditionManagementState.getPendingInstallationStatus()).thenReturn(PendingStatus.UNINSTALL_IN_PROGRESS);
+
+    underTest.start();
+
+    verify(mutableEditionManagementState).getPendingInstallationStatus();
+    verify(mutableEditionManagementState).finalizeInstallation();
+    verifyNoMoreInteractions(mutableEditionManagementState);
+  }
+
+  @Test
+  public void should_fail_uninstall_if_license_commit_is_present() {
+    when(mutableEditionManagementState.getPendingInstallationStatus()).thenReturn(PendingStatus.UNINSTALL_IN_PROGRESS);
+    CommitPendingEditionOnStartup underTest = new CommitPendingEditionOnStartup(mutableEditionManagementState,
+      mock(LicenseCommit.class));
+
+    exception.expect(IllegalStateException.class);
+    exception.expectMessage("License Manager plugin is still present");
+    underTest.start();
+  }
+
+}