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

[gui-test] fix double invoking for FirstStart#completeIntallation

Browse Source
This commit is contained in:
Sergey Karashevich
2018-05-22 15:11:23 +03:00
parent 1587d584b4
commit d60585c3ab
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/FirstStart.kt
-6
View File
@@ -86,12 +86,6 @@ abstract class FirstStart(val ideType: IdeType) {
companion object {
var DEFAULT_TIMEOUT: Long = GuiTestCase().defaultTimeout
fun guessIdeAndStartRobot() {
val firstStartClass = System.getProperty("idea.gui.test.first.start.class")
val firstStart = Class.forName(firstStartClass).newInstance() as FirstStart
firstStart.completeInstallation()
}
}
private fun completeFirstStart() {
platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/FirstStarter.kt
+9 -15
View File
@@ -20,9 +20,7 @@ import com.intellij.util.lang.UrlClassLoader
import java.net.URL
import kotlin.concurrent.thread
class FirstStarter {
}
class FirstStarter
fun main(args: Array<String>) {
startRobotRoutine()
@@ -42,17 +40,12 @@ private fun startIdeMainRoutine(args: Array<String>) {
private fun startRobotRoutine() {
val robotClassLoader = createRobotClassLoader()
fun awtIsNotStarted()
= !(Thread.getAllStackTraces().keys.any { thread -> thread.name.toLowerCase().contains("awt-eventqueue") })
fun awtIsNotStarted() = !(Thread.getAllStackTraces().keys.any { thread -> thread.name.toLowerCase().contains("awt-eventqueue") })
thread(name = "Wait Awt and Start", contextClassLoader = robotClassLoader) {
thread(name = "GUI Test First Start: Wait AWT and Start", contextClassLoader = robotClassLoader) {
while (awtIsNotStarted()) Thread.sleep(100)
val companion = Class.forName("com.intellij.testGuiFramework.impl.FirstStart\$Companion", true, robotClassLoader)
val firstStartClass = Class.forName("com.intellij.testGuiFramework.impl.FirstStart", true, robotClassLoader)
val value = firstStartClass.getField("Companion").get(Any())
val method = companion.getDeclaredMethod("guessIdeAndStartRobot")
method.isAccessible = true
method.invoke(value)
val firstStartClass = System.getProperty("idea.gui.test.first.start.class")
Class.forName(firstStartClass).newInstance() as FirstStart
}
}
@@ -72,10 +65,11 @@ fun createRobotClassLoader(): UrlClassLoader {
fun getUrlOfBaseClassLoader(): List<URL> {
val classLoader = Thread.currentThread().contextClassLoader
val urlClassLoaderClass = classLoader.javaClass
val getUrlsMethod = urlClassLoaderClass.methods.filter { it.name.toLowerCase() == "geturls" }.firstOrNull()!!
val getUrlsMethod = urlClassLoaderClass.methods.firstOrNull { it.name.toLowerCase() == "geturls" } ?: throw Exception(
"Unable to get URLs for UrlClassLoader")
@Suppress("UNCHECKED_CAST")
val urlsListOrArray = getUrlsMethod.invoke(classLoader)
if (urlsListOrArray is Array<*>) return urlsListOrArray.toList() as List<URL>
else return urlsListOrArray as List<URL>
return if (urlsListOrArray is Array<*>) urlsListOrArray.toList() as List<URL>
else urlsListOrArray as List<URL>
}