From eec0507d0872b4c6524a3fbce905b7e97eafc8b9 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 8 Aug 2016 22:02:46 +0200
Subject: [PATCH] [platform] fixes JDK version detection test

---
 jps/model-impl/jps-model-tests.iml                        | 1 +
 .../org/jetbrains/jps/model/JdkVersionDetectorTest.kt     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jps/model-impl/jps-model-tests.iml b/jps/model-impl/jps-model-tests.iml
index e923072b4a8a..e75fcd17f5e9 100644
--- a/jps/model-impl/jps-model-tests.iml
+++ b/jps/model-impl/jps-model-tests.iml
@@ -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>
\ No newline at end of file
diff --git a/jps/model-impl/testSrc/org/jetbrains/jps/model/JdkVersionDetectorTest.kt b/jps/model-impl/testSrc/org/jetbrains/jps/model/JdkVersionDetectorTest.kt
index 357819b671ac..3b58ff3a8113 100644
--- a/jps/model-impl/testSrc/org/jetbrains/jps/model/JdkVersionDetectorTest.kt
+++ b/jps/model-impl/testSrc/org/jetbrains/jps/model/JdkVersionDetectorTest.kt
@@ -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)
   }
 }
\ No newline at end of file