From e92b06493ef5af39e2df8a44d1df78eb2955e2ae Mon Sep 17 00:00:00 2001 From: Aleksey Rostovskiy Date: Tue, 7 Nov 2017 13:50:11 +0300 Subject: [PATCH] [gui-tests] Fixes after review --- .../intellij/testGuiFramework/framework/GuiTestRunner.kt | 2 +- .../testGuiFramework/framework/GuiTestSuiteParam.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestRunner.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestRunner.kt index 6620775d279f..cedafb344021 100755 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestRunner.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestRunner.kt @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit class GuiTestRunner internal constructor(val runner: GuiTestRunnerInterface) { - private val SERVER_LOG = org.apache.log4j.Logger.getLogger("#com.intellij.testGuiFramework.framework.GuiTestLocalRunner")!! + private val SERVER_LOG = org.apache.log4j.Logger.getLogger("#com.intellij.testGuiFramework.framework.GuiTestRunner")!! private val criticalError = Ref(false) diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestSuiteParam.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestSuiteParam.kt index a7cef873dc6a..677738c9272b 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestSuiteParam.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestSuiteParam.kt @@ -27,19 +27,19 @@ class GuiTestSuiteParam(val klass: Class<*>) : Parameterized(klass) { //IDE type to run suite tests with val myIde = getIdeFromAnnotation(klass) - var myFirstStart = true + var isFirstStart = true val UNDEFINED_FIRST_CLASS = "undefined" val myFirstStartClassName: String by lazy { val annotation = klass.getAnnotation(FirstStartWith::class.java) val value = annotation?.value if (value != null) value.java.canonicalName else UNDEFINED_FIRST_CLASS } - val LOG = org.apache.log4j.Logger.getLogger("#com.intellij.testGuiFramework.framework.GuiTestSuite")!! + val LOG = org.apache.log4j.Logger.getLogger("#com.intellij.testGuiFramework.framework.GuiTestSuiteParam")!! override fun runChild(runner: Runner, notifier: RunNotifier?) { try { //let's start IDE to complete installation, import configs and etc before running tests - if (myFirstStart) firstStart() + if (isFirstStart) firstStart() val runnerWithParameters = runner as BlockJUnit4ClassRunnerWithParameters val testNameField = BlockJUnit4ClassRunnerWithParameters::class.java.getDeclaredField("name") @@ -64,6 +64,6 @@ class GuiTestSuiteParam(val klass: Class<*>) : Parameterized(klass) { if (myFirstStartClassName == UNDEFINED_FIRST_CLASS) return LOG.info("IDE is configuring for the first time...") GuiTestLocalLauncher.firstStartIdeLocally(myIde, myFirstStartClassName) - myFirstStart = false + isFirstStart = false } } \ No newline at end of file