New test runners: folder renamed to path according to protocol

This commit is contained in:
Ilya.Kazakevich
2017-02-01 16:23:01 +03:00
parent 642921b3b7
commit 7e18b2430e
2 changed files with 6 additions and 6 deletions
@@ -186,7 +186,7 @@ public final class PyUniversalTestForm implements SimplePropertiesProvider {
private void configureElementsVisibility() {
final TestTargetType targetType = getTargetType();
myTargetText.setVisible(targetType != TestTargetType.CUSTOM);
myTargetText.getButton().setVisible(targetType == TestTargetType.FOLDER);
myTargetText.getButton().setVisible(targetType == TestTargetType.PATH);
}
@SuppressWarnings("WeakerAccess") // Accessor for property
@@ -135,7 +135,7 @@ abstract class PyUniversalTestSettingsEditor(private val form: PyUniversalTestFo
}
enum class TestTargetType(val optionName: String) {
PYTHON("--target"), FOLDER("--path"), CUSTOM("")
PYTHON("--target"), PATH("--path"), CUSTOM("")
}
@@ -161,7 +161,7 @@ abstract class PyUniversalTestConfiguration(project: Project,
private val runBareFunctions: Boolean = true)
: AbstractPythonTestRunConfiguration<PyUniversalTestConfiguration>(project, configurationFactory), PyRerunAwareConfiguration {
@DelegationProperty
val target = ConfigurationTarget(".", TestTargetType.FOLDER)
val target = ConfigurationTarget(".", TestTargetType.PATH)
@ConfigField
var additionalArguments = ""
@@ -216,7 +216,7 @@ abstract class PyUniversalTestConfiguration(project: Project,
fun reset() {
target.target = "."
target.targetType = TestTargetType.FOLDER
target.targetType = TestTargetType.PATH
additionalArguments = ""
}
@@ -260,7 +260,7 @@ abstract class PyUniversalTestConfiguration(project: Project,
* Function is used to create tests by context.
*
* If yes, and element is [PsiElement] then it is [TestTargetType.PYTHON].
* If file then [TestTargetType.FOLDER]
* If file then [TestTargetType.PATH]
*/
fun couldBeTestTarget(element: PsiElement) =
// TODO: PythonUnitTestUtil logic is weak. We should give user ability to launch test on symbol since user knows better if folder
@@ -341,7 +341,7 @@ object PyUniversalTestsConfigurationProducer : RunConfigurationProducer<PyUniver
}
return Pair(qualifiedName, ConfigurationTarget(qualifiedName, TestTargetType.PYTHON))
}
is PsiFile -> return Pair(element.virtualFile.name, ConfigurationTarget(element.virtualFile.path, TestTargetType.FOLDER))
is PsiFile -> return Pair(element.virtualFile.name, ConfigurationTarget(element.virtualFile.path, TestTargetType.PATH))
}
}
element = element.parent