diff --git a/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java b/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java deleted file mode 100644 index 9fd0b70a232a..000000000000 --- a/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jetbrains.edu.learning.checker; - -import com.intellij.execution.ExecutionException; -import com.intellij.execution.configurations.GeneralCommandLine; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.jetbrains.edu.learning.courseFormat.tasks.Task; -import org.jetbrains.annotations.NotNull; - -public abstract class StudyTestRunner {protected final Task myTask; - protected final VirtualFile myTaskDir; - - public StudyTestRunner(@NotNull final Task task, @NotNull final VirtualFile taskDir) { - myTask = task; - myTaskDir = taskDir; - } - - public abstract Process createCheckProcess(@NotNull final Project project, @NotNull final String executablePath) throws ExecutionException; - - public abstract GeneralCommandLine getCommandLine(); - -} diff --git a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudySmartChecker.java b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudySmartChecker.java index 59c850b661e6..0848d459bebe 100644 --- a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudySmartChecker.java +++ b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudySmartChecker.java @@ -36,7 +36,7 @@ public class PyStudySmartChecker { @NotNull final VirtualFile answerFile, @NotNull final TaskFile answerTaskFile, @NotNull final TaskFile usersTaskFile, - @NotNull final StudyTestRunner testRunner, + @NotNull final PyStudyTestRunner testRunner, @NotNull final VirtualFile virtualFile, @NotNull final Document usersDocument) { VirtualFile fileWindows = null; @@ -83,7 +83,7 @@ public class PyStudySmartChecker { } public static void runSmartTestProcess(@NotNull final VirtualFile taskDir, - @NotNull final StudyTestRunner testRunner, + @NotNull final PyStudyTestRunner testRunner, @NotNull final String taskFileName, @NotNull final TaskFile taskFile, @NotNull final Project project) { diff --git a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTaskChecker.java b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTaskChecker.java index 909a3ecb4f90..6b2f117354e8 100644 --- a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTaskChecker.java +++ b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTaskChecker.java @@ -46,7 +46,7 @@ public class PyStudyTaskChecker extends StudyTaskChecker { StudyCheckUtils.flushWindows(myTask, taskDir); latch.countDown(); })); - final StudyTestRunner testRunner = new PyStudyTestRunner(myTask, taskDir); + final PyStudyTestRunner testRunner = new PyStudyTestRunner(myTask, taskDir); try { final VirtualFile fileToCheck = getTaskVirtualFile(myTask, taskDir); if (fileToCheck != null) { diff --git a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTestRunner.java b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTestRunner.java index b111077d23f4..ea3bcb7a511c 100644 --- a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTestRunner.java +++ b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTestRunner.java @@ -18,12 +18,15 @@ import org.jetbrains.annotations.NotNull; import java.io.File; import java.util.Map; -public class PyStudyTestRunner extends StudyTestRunner { +public class PyStudyTestRunner { private static final String PYTHONPATH = "PYTHONPATH"; + @NotNull private final Task myTask; + @NotNull private final VirtualFile myTaskDir; private GeneralCommandLine myCommandLine; PyStudyTestRunner(@NotNull final Task task, @NotNull final VirtualFile taskDir) { - super(task, taskDir); + myTask = task; + myTaskDir = taskDir; } public Process createCheckProcess(@NotNull final Project project, @NotNull final String executablePath) throws ExecutionException { @@ -56,7 +59,6 @@ public class PyStudyTestRunner extends StudyTestRunner { return null; } - @Override public GeneralCommandLine getCommandLine() { return myCommandLine; }