MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] IDEA-379006 Bump Java language level to 25 for java plugin

Browse Source 
- fix gradle tests


(cherry picked from commit d6562a17adce5cc1fa970c0d78045bf569bc0d96)

IJ-CR-175144

GitOrigin-RevId: 343df16a3da920a811b11db6fd389a2fba01a100
This commit is contained in:
Mikhail Pyltsin
2025-09-10 11:04:38 +02:00
committed by intellij-monorepo-bot
parent ffab857b53
commit 1b38e674e8
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTest.kt
View File

@@ -59,8 +59,9 @@ class GradleDaemonJvmCriteriaViewFactoryTest : GradleDaemonJvmCriteriaViewFactor
@Test
fun `test Given created view Then dropdown items are the expected ones`() {
createDaemonJvmCriteriaView(GradleVersion.version("8.9")).run {
assertVersionDropdownItems()
val gradleVersion = GradleVersion.current()
createDaemonJvmCriteriaView(gradleVersion).run {
assertVersionDropdownItems(gradleVersion)
assertVendorDropdownItems()
}
}

18
plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTestCase.kt
View File

@@ -2,12 +2,12 @@
package org.jetbrains.plugins.gradle.service.settings
import com.intellij.openapi.Disposable
import com.intellij.pom.java.JavaRelease
import com.intellij.testFramework.junit5.TestApplication
import com.intellij.testFramework.junit5.TestDisposable
import com.intellij.ui.dsl.builder.impl.CollapsibleTitledSeparatorImpl
import com.intellij.util.ui.UIUtil
import org.gradle.util.GradleVersion
import org.jetbrains.plugins.gradle.jvmcompat.GradleJvmSupportMatrix
import org.jetbrains.plugins.gradle.service.settings.GradleDaemonJvmCriteriaView.VendorItem
import org.jetbrains.plugins.gradle.service.settings.GradleDaemonJvmCriteriaView.VersionItem
import org.junit.jupiter.api.Assertions.assertEquals
@@ -38,15 +38,15 @@ abstract class GradleDaemonJvmCriteriaViewFactoryTestCase {
assertEquals(isVisible, advancedSettingsComponent?.isVisible)
}
fun GradleDaemonJvmCriteriaView.assertVersionDropdownItems() {
val expectedVersionList = JavaRelease.getHighest().toJavaVersion().feature.downTo(8)
expectedVersionList.forEachIndexed { index, expectedVersion ->
val actualVersion = when (val versionItem = versionModel.getElementAt(index)) {
is VersionItem.Default -> versionItem.version.toString()
is VersionItem.Custom -> throw AssertionError("Unexpected custom version item: " + versionItem.value)
fun GradleDaemonJvmCriteriaView.assertVersionDropdownItems(gradleVersion: GradleVersion) {
val expectedVersionList = GradleJvmSupportMatrix.getSupportedJavaVersions(gradleVersion)
expectedVersionList.reversed().forEachIndexed { index, expectedVersion ->
val actualVersion = when (val versionItem = versionModel.getElementAt(index)) {
is VersionItem.Default -> versionItem.version
is VersionItem.Custom -> throw AssertionError("Unexpected custom version item: " + versionItem.value)
}
assertEquals(expectedVersion.feature, actualVersion)
}
assertEquals(expectedVersion.toString(), actualVersion)
}
}
fun GradleDaemonJvmCriteriaView.assertVendorDropdownItems() {