From 4f64320c98733379798226bb7d94742bb67a5726 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Thu, 7 Jul 2022 10:24:03 +0200
Subject: [PATCH] XWIKI-19826: Move the old event store to legacy
---
.../java/org/xwiki/test/ui/UpgradeTest.java | 59 -------------------
1 file changed, 59 deletions(-)
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/src/main/java/org/xwiki/test/ui/UpgradeTest.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/src/main/java/org/xwiki/test/ui/UpgradeTest.java
index b14172327e6..9b6f11152c3 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/src/main/java/org/xwiki/test/ui/UpgradeTest.java
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/src/main/java/org/xwiki/test/ui/UpgradeTest.java
@@ -118,10 +118,6 @@ public class UpgradeTest extends AbstractTest
private static final int STEP_EXTENSIONS_ID = 3;
- private static final String STEP_EVENTSMIGRATION_NAME = "Events migration";
-
- private static final int STEP_EVENTSMIGRATION_ID = 4;
-
/**
* Automatically register as Admin user.
*/
@@ -229,11 +225,6 @@ public void upgrade() throws Exception
extensionsStep();
- ////////////////////
- // Validate Events Migration step
-
- eventsMigrationStep();
-
////////////////////
// Validate Report step
@@ -296,9 +287,6 @@ private void welcomeStep()
assertEquals(4, icons.get(STEP_EXTENSIONS_ID).getNumber());
assertEquals(STEP_EXTENSIONS_ID + 1, icons.get(STEP_EXTENSIONS_ID).getNumber());
assertEquals(STEP_EXTENSIONS_NAME, icons.get(STEP_EXTENSIONS_ID).getName());
- assertEquals(5, icons.get(STEP_EVENTSMIGRATION_ID).getNumber());
- assertEquals(STEP_EVENTSMIGRATION_ID + 1, icons.get(STEP_EVENTSMIGRATION_ID).getNumber());
- assertEquals(STEP_EVENTSMIGRATION_NAME, icons.get(STEP_EVENTSMIGRATION_ID).getName());
// Go to next step
step.clickCompleteStep();
@@ -323,9 +311,6 @@ private void flavorStep() throws Exception
assertFalse(icons.get(STEP_EXTENSIONS_ID).isDone());
assertFalse(icons.get(STEP_EXTENSIONS_ID).isActive());
assertEquals(STEP_EXTENSIONS_NAME, icons.get(STEP_EXTENSIONS_ID).getName());
- assertFalse(icons.get(STEP_EVENTSMIGRATION_ID).isDone());
- assertFalse(icons.get(STEP_EVENTSMIGRATION_ID).isActive());
- assertEquals(STEP_EVENTSMIGRATION_NAME, icons.get(STEP_EVENTSMIGRATION_ID).getName());
// Make sure complete step is disabled
assertFalse(step.isCompleteStepDisabled());
@@ -467,9 +452,6 @@ private void orphanedDependenciesStep()
assertFalse(icons.get(STEP_EXTENSIONS_ID).isDone());
assertFalse(icons.get(STEP_EXTENSIONS_ID).isActive());
assertEquals(STEP_EXTENSIONS_NAME, icons.get(STEP_EXTENSIONS_ID).getName());
- assertFalse(icons.get(STEP_EVENTSMIGRATION_ID).isDone());
- assertFalse(icons.get(STEP_EVENTSMIGRATION_ID).isActive());
- assertEquals(STEP_EVENTSMIGRATION_NAME, icons.get(STEP_EVENTSMIGRATION_ID).getName());
// Confirm the extension to uninstall/make top level
CleanApplyDistributionStep cleanApply = step.clickContinue();
@@ -512,9 +494,6 @@ private void extensionsStep()
assertFalse(icons.get(STEP_EXTENSIONS_ID).isDone());
assertTrue(icons.get(STEP_EXTENSIONS_ID).isActive());
assertEquals(STEP_EXTENSIONS_NAME, icons.get(STEP_EXTENSIONS_ID).getName());
- assertFalse(icons.get(STEP_EVENTSMIGRATION_ID).isDone());
- assertFalse(icons.get(STEP_EVENTSMIGRATION_ID).isActive());
- assertEquals(STEP_EVENTSMIGRATION_NAME, icons.get(STEP_EVENTSMIGRATION_ID).getName());
// Search for extension update
step.checkForUpdates();
@@ -525,41 +504,6 @@ private void extensionsStep()
step.clickCompleteStep();
}
- private void eventsMigrationStep()
- {
- CleanDistributionStep step = new CleanDistributionStep();
-
- // Steps
-
- List<DistributionStepIcon> icons = step.getIcons();
-
- // Make sure the events migration step is active
- if (!icons.get(STEP_EVENTSMIGRATION_ID).isActive()) {
- return;
- }
-
- assertTrue(icons.get(STEP_ADMIN_ID).isDone());
- assertFalse(icons.get(STEP_ADMIN_ID).isActive());
- assertEquals(STEP_ADMIN_NAME, icons.get(STEP_ADMIN_ID).getName());
- assertTrue(icons.get(STEP_FLAVOR_ID).isDone());
- assertFalse(icons.get(STEP_FLAVOR_ID).isActive());
- assertEquals(STEP_FLAVOR_NAME, icons.get(STEP_FLAVOR_ID).getName());
- assertTrue(icons.get(STEP_ORPHANED_ID).isDone());
- assertFalse(icons.get(STEP_ORPHANED_ID).isActive());
- assertEquals(STEP_ORPHANED_NAME, icons.get(STEP_ORPHANED_ID).getName());
- assertTrue(icons.get(STEP_EXTENSIONS_ID).isDone());
- assertFalse(icons.get(STEP_EXTENSIONS_ID).isActive());
- assertEquals(STEP_EXTENSIONS_NAME, icons.get(STEP_EXTENSIONS_ID).getName());
- assertFalse(icons.get(STEP_EVENTSMIGRATION_ID).isDone());
- assertTrue(icons.get(STEP_EVENTSMIGRATION_ID).isActive());
- assertEquals(STEP_EVENTSMIGRATION_NAME, icons.get(STEP_EVENTSMIGRATION_ID).getName());
-
- // TODO: check some stuff
-
- // Go to next step
- step.clickCompleteStep();
- }
-
private void reportStep()
{
ReportDistributionStep step = new ReportDistributionStep();
@@ -579,9 +523,6 @@ private void reportStep()
assertTrue(icons.get(STEP_EXTENSIONS_ID).isDone());
assertFalse(icons.get(STEP_EXTENSIONS_ID).isActive());
assertEquals(STEP_EXTENSIONS_NAME, icons.get(STEP_EXTENSIONS_ID).getName());
- assertTrue(icons.get(STEP_EVENTSMIGRATION_ID).isDone());
- assertFalse(icons.get(STEP_EVENTSMIGRATION_ID).isActive());
- assertEquals(STEP_EVENTSMIGRATION_NAME, icons.get(STEP_EVENTSMIGRATION_ID).getName());
// Finish
step.clickCompleteStep();
--
GitLab