From 0c478585cf6856cf1e529f0d2c7df7bb99d50e69 Mon Sep 17 00:00:00 2001
From: "Ilya.Kazakevich" <Ilya.Kazakevich@jetbrains.com>
Date: Wed, 25 Jan 2017 20:20:56 +0300
Subject: [PATCH] New test runners: legacy configuration detection improved *
 In old version we used to check testType which is never null

---
 .../PyUniversalTestLegacyInterop.kt               | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/testing/universalTests/PyUniversalTestLegacyInterop.kt b/python/src/com/jetbrains/python/testing/universalTests/PyUniversalTestLegacyInterop.kt
index 47593ce0bbfe..e29c299faa73 100644
--- a/python/src/com/jetbrains/python/testing/universalTests/PyUniversalTestLegacyInterop.kt
+++ b/python/src/com/jetbrains/python/testing/universalTests/PyUniversalTestLegacyInterop.kt
@@ -149,7 +149,7 @@ class PyUniversalTestLegacyConfigurationAdapter<in T : PyUniversalTestConfigurat
 
   override fun readExternal(element: Element) {
     configManager.legacyConfig.readExternal(element)
-    containsLegacyInformation = (configManager.legacyConfig.getTestType() != null)
+    containsLegacyInformation = configManager.loaded
 
   }
 
@@ -192,6 +192,17 @@ private abstract class LegacyConfigurationManager<
     return clazz.findMethodByName(legacyConfig.methodName, true, TypeEvalContext.userInitiated(legacyConfig.project, script))
   }
 
+  /**
+   * If one of these fields is not empty -- legacy configuration makes sence
+   */
+  open protected val fieldsToCheckForEmptiness = listOf(legacyConfig.scriptName, legacyConfig.className, legacyConfig.methodName)
+
+  /**
+   * @return true of legacy configuration loaded, false if configuration is pure new
+   */
+  val loaded: Boolean
+    get() = fieldsToCheckForEmptiness.find { !it.isNullOrBlank() } != null
+
   /**
    * Copies config from legacy to new configuration.
    * Used by all runners but py.test which has very different settings
@@ -230,6 +241,8 @@ private class LegacyConfigurationManagerPyTest(newConfig: PyUniversalPyTestConfi
    */
   private val KEYWORDS_SPLIT_PATTERN = java.util.regex.Pattern.compile("\\s+and\\s+", java.util.regex.Pattern.CASE_INSENSITIVE)
 
+  override val fieldsToCheckForEmptiness = super.fieldsToCheckForEmptiness + listOf(legacyConfig.keywords, legacyConfig.testToRun)
+
   override fun copyFromLegacy() {
     // Do not call parent since target is always provided as testToRun here
     newConfig.additionalArguments = legacyConfig.params