MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

unignore MavenArchetypeTest

Browse Source 
GitOrigin-RevId: c7c23ddee70e760dd0b41281b6e65d63ef504afd
This commit is contained in:
Alexander Bubenchikov
2023-11-28 14:21:44 +00:00
committed by intellij-monorepo-bot
parent 72275a3fbe
commit 634f6fb5ca
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenArchetypeTest.java
+2 -2
View File
@@ -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);
}
}
plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenMultiVersionImportingTestCase.java
+5 -5
View File
@@ -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