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 GUI-65: do not override a timeout

Browse Source 
This fix allows to do not override a timeout specified for a test by a test rule (Timeout) with a GuiTestRule default timeout. It is not recommended to mix Timeout rule and parameter in a @Test annotation.
This commit is contained in:
Sergey Karashevich
2018-04-25 13:56:31 +03:00
parent dde00df4ee
commit 50f04e43e2
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestRule.kt
+12 -5
View File
@@ -66,11 +66,16 @@ class GuiTestRule : TestRule {
.around(myFatalErrorsFlusher)
.around(IdeHandling())
.around(ScreenshotOnFailure())
.around(Timeout(20, TimeUnit.MINUTES))!!
private val timeoutRule = Timeout(20, TimeUnit.MINUTES)
override fun apply(base: Statement?, description: Description?): Statement {
myTestName = "${description!!.className}#${description.methodName}"
return myRuleChain.apply(base, description)
//do not apply timeout rule if it is already applied to a test class
return if (description.testClass.fields.any { it.type == Timeout::class.java })
myRuleChain.apply(base, description)
else
myRuleChain.around(timeoutRule).apply(base, description)
}
fun robot(): Robot = myRobotTestRule.getRobot()
@@ -148,9 +153,11 @@ class GuiTestRule : TestRule {
fun isFirstStep(): Boolean {
return try {
val actionLinkFixture = ActionLinkFixture.findActionLinkByName(CREATE_NEW_PROJECT_ACTION_NAME, robot(), welcomeFrameFixture.target(), tenSec)
val actionLinkFixture = ActionLinkFixture.findActionLinkByName(CREATE_NEW_PROJECT_ACTION_NAME, robot(),
welcomeFrameFixture.target(), tenSec)
actionLinkFixture.target().isShowing
} catch (componentLookupException: ComponentLookupException) {
}
catch (componentLookupException: ComponentLookupException) {
false
}
}
@@ -287,7 +294,7 @@ class GuiTestRule : TestRule {
val toSelect = VfsUtil.findFileByIoFile(projectPath, false)
Assert.assertNotNull(toSelect)
doImportProject(toSelect!!)
//TODO: add wait to open project
//TODO: add wait to open project
return findIdeFrame(projectPath)
}