From 314067bdd994a015a7dcc1000cb97de302f6a739 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Sat, 14 Feb 2015 19:00:32 +0300 Subject: [PATCH] fixed run tests action --- .../edu/coursecreator/actions/PyCCRunTestsAction.java | 6 +----- .../edu/coursecreator/actions/CCRunTestsAction.java | 10 ++++++++-- .../jetbrains/edu/learning/actions/StudyRunAction.java | 2 -- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java b/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java index ee002b64c45a..ca44d0cd7b81 100644 --- a/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java +++ b/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java @@ -53,11 +53,7 @@ public class PyCCRunTestsAction extends CCRunTestsAction { } VirtualFileManager.getInstance().refreshWithoutFileWatcher(true); ProjectView.getInstance(project).refresh(); - VirtualFile courseDir = ideaDir.findChild("course"); - if (courseDir == null) { - return; - } - configuration.setScriptParameters(PathUtil.toSystemDependentName(courseDir.getPath()) + " " + PathUtil.toSystemDependentName(userFile.getPath())); + configuration.setScriptParameters(PathUtil.toSystemDependentName(project.getBasePath()) + " " + PathUtil.toSystemDependentName(userFile.getPath())); Executor executor = DefaultRunExecutor.getRunExecutorInstance(); ProgramRunnerUtil.executeConfiguration(project, settings, executor); } diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java index b23a4f549924..485279abf936 100644 --- a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java +++ b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java @@ -29,6 +29,7 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; @@ -142,7 +143,7 @@ public abstract class CCRunTestsAction extends AnAction { if (testsTemplate == null) { return; } - VirtualFile testFile = taskDir.findChild(testsTemplate.getName()); + VirtualFile testFile = taskDir.findChild(testsTemplate.getName() + "." + testsTemplate.getExtension()); if (testFile == null) { return; } @@ -156,7 +157,8 @@ public abstract class CCRunTestsAction extends AnAction { @NotNull final Project project) { try { String answerFileName = FileUtil.getNameWithoutExtension(fileName) + ".answer"; - final VirtualFile answerFile = taskDir.findChild(answerFileName); + final String extension = FileUtilRt.getExtension(fileName); + final VirtualFile answerFile = taskDir.findChild(answerFileName + "." + extension); if (answerFile == null) { LOG.debug("could not find answer file " + answerFileName); return; @@ -168,6 +170,10 @@ public abstract class CCRunTestsAction extends AnAction { documentManager.saveAllDocuments(); } }); + final VirtualFile oldTaskFile = taskDir.findChild(fileName); + if (oldTaskFile != null) { + oldTaskFile.delete(project); + } answerFile.copy(project, taskDir, fileName); flushWindows(taskFile, answerFile); createResourceFiles(answerFile, project); diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyRunAction.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyRunAction.java index a2e6c051d3c5..8bf70f564a7c 100644 --- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyRunAction.java +++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyRunAction.java @@ -16,7 +16,6 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vfs.VirtualFile; import com.jetbrains.edu.courseFormat.Task; import com.jetbrains.edu.courseFormat.TaskFile; -import com.jetbrains.edu.learning.StudyTaskManager; import com.jetbrains.edu.learning.StudyUtils; import com.jetbrains.edu.learning.editor.StudyEditor; import org.jetbrains.annotations.NotNull; @@ -41,7 +40,6 @@ public class StudyRunAction extends DumbAwareAction { private void executeFile(@NotNull final Project project, @NotNull final VirtualFile openedFile, @NotNull final String filePath) { - StudyTaskManager taskManager = StudyTaskManager.getInstance(project); GeneralCommandLine cmd = new GeneralCommandLine(); cmd.withWorkDirectory(openedFile.getParent().getCanonicalPath());