From 634f6fb5caa770797f035b9c21f13ad657f8533e Mon Sep 17 00:00:00 2001
From: Alexander Bubenchikov <alexander.bubenchikov@jetbrains.com>
Date: Tue, 28 Nov 2023 13:18:26 +0100
Subject: [PATCH] unignore MavenArchetypeTest

GitOrigin-RevId: c7c23ddee70e760dd0b41281b6e65d63ef504afd
---
 .../idea/maven/project/MavenArchetypeTest.java         |  4 ++--
 .../MavenMultiVersionImportingTestCase.java            | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenArchetypeTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenArchetypeTest.java
index dfdd8508c57d..89af06666256 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenArchetypeTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenArchetypeTest.java
@@ -48,7 +48,7 @@ public class MavenArchetypeTest extends MavenMultiVersionImportingTestCase {
     assumeVersion("bundled");
 
     var embedder = myManager.getEmbedder(MavenEmbeddersManager.FOR_FOLDERS_RESOLVE, myDir.getPath());
-    var archetypes = embedder.getRemoteArchetypes("https://repo1.maven.org/maven2/");
+    var archetypes = embedder.getRemoteArchetypes("https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/");
     var filtered = archetypes.stream()
       .filter(archetype ->
                 "org.apache.maven.archetypes".equals(archetype.groupId) &&
@@ -68,7 +68,7 @@ public class MavenArchetypeTest extends MavenMultiVersionImportingTestCase {
       "maven-archetype-archetype",
       "1.0",
       List.of(),
-      "https://repo1.maven.org/maven2/");
+      "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/");
     assertNotNull(descriptorMap);
   }
 }
diff --git a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenMultiVersionImportingTestCase.java b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenMultiVersionImportingTestCase.java
index 991ed33a82ff..22b76b1dfe6f 100644
--- a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenMultiVersionImportingTestCase.java
+++ b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenMultiVersionImportingTestCase.java
@@ -40,25 +40,25 @@ public abstract class MavenMultiVersionImportingTestCase extends MavenImportingT
 
   protected void assumeVersionMoreThan(String version) {
     Assume.assumeTrue("Version should be more than " + version,
-                      VersionComparatorUtil.compare(getActualVersion(myMavenVersion), version) > 0);
+                      VersionComparatorUtil.compare(getActualVersion(myMavenVersion), getActualVersion(version)) > 0);
   }
 
   protected void assumeVersionAtLeast(String version) {
     Assume.assumeTrue("Version should be " + version + " or more",
-                      VersionComparatorUtil.compare(getActualVersion(myMavenVersion), version) >= 0);
+                      VersionComparatorUtil.compare(getActualVersion(myMavenVersion), getActualVersion(version)) >= 0);
   }
 
   protected void assumeVersionLessThan(String version) {
     Assume.assumeTrue("Version should be less than " + version,
-                      VersionComparatorUtil.compare(getActualVersion(myMavenVersion), version) < 0);
+                      VersionComparatorUtil.compare(getActualVersion(myMavenVersion), getActualVersion(version)) < 0);
   }
 
   protected void assumeVersionNot(String version) {
-    Assume.assumeTrue("Version " + version + " skipped", VersionComparatorUtil.compare(getActualVersion(myMavenVersion), version) != 0);
+    Assume.assumeTrue("Version " + version + " skipped", VersionComparatorUtil.compare(getActualVersion(myMavenVersion), getActualVersion(version)) != 0);
   }
 
   protected void assumeVersion(String version) {
-    Assume.assumeTrue("Version " + version + " skipped", VersionComparatorUtil.compare(getActualVersion(myMavenVersion), version) == 0);
+    Assume.assumeTrue("Version " + myMavenVersion + " is not " + version + ", therefore skipped", VersionComparatorUtil.compare(getActualVersion(myMavenVersion), getActualVersion(version)) == 0);
   }
 
   @Before