MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed run tests action

Browse Source
This commit is contained in:
Ekaterina Tuzova
2015-02-14 19:00:32 +03:00
parent a403e56241
commit 314067bdd9
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java
+8 -2
View File
@@ -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);
python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyRunAction.java
-2
View File
@@ -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());