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

[platform] fixes JDK version detection test

Browse Source
This commit is contained in:
Roman Shevchenko
2016-08-08 22:03:19 +02:00
parent 2d0cc9fcef
commit eec0507d08
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/model-impl/jps-model-tests.iml
+1
View File
@@ -9,5 +9,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jps-model-impl" />
<orderEntry type="module" module-name="testFramework" exported="" scope="TEST" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
</component>
</module>
jps/model-impl/testSrc/org/jetbrains/jps/model/JdkVersionDetectorTest.kt
+4 -4
View File
@@ -17,9 +17,9 @@ package org.jetbrains.jps.model
import com.intellij.openapi.util.Bitness
import com.intellij.openapi.util.SystemInfo
import org.assertj.core.api.Assertions.assertThat
import org.jetbrains.jps.model.java.JdkVersionDetector
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Test
import java.util.concurrent.Executors
@@ -31,13 +31,13 @@ class JdkVersionDetectorTest {
@Test fun detectJdkVersion() {
val jdkHome = System.getProperty("java.home")
val jdkVersion = JdkVersionDetector.getInstance().detectJdkVersion(jdkHome, { service.submit(it) })
assertEquals("java version \"${SystemInfo.JAVA_VERSION}\"", jdkVersion)
assertThat(jdkVersion).contains("\"${SystemInfo.JAVA_VERSION}\"")
}
@Test fun detectJdkVersionInfo() {
val jdkHome = System.getProperty("java.home")
val jdkVersion = JdkVersionDetector.getInstance().detectJdkVersionInfo(jdkHome, { service.submit(it) })
assertEquals("java version \"${SystemInfo.JAVA_VERSION}\"", jdkVersion?.version)
assertEquals(if (SystemInfo.is64Bit) Bitness.x64 else Bitness.x32, jdkVersion?.bitness)
assertThat(jdkVersion?.version).contains("\"${SystemInfo.JAVA_VERSION}\"")
assertThat(jdkVersion?.bitness).isEqualTo(if (SystemInfo.is64Bit) Bitness.x64 else Bitness.x32)
}
}