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

fix check utilities

Browse Source
This commit is contained in:
Liana.Bakradze
2016-11-17 17:08:28 +03:00
committed by liana.bakradze
parent 1219b87725
commit 0bfe268495
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationProducer.java
+8 -2
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.jetbrains.edu.coursecreator.CCUtils;
import com.jetbrains.edu.coursecreator.PyCCLanguageManager;
import com.jetbrains.edu.learning.StudyUtils;
import com.jetbrains.edu.learning.core.EduNames;
import com.jetbrains.edu.learning.courseFormat.Task;
@@ -59,7 +60,12 @@ public class PyCCRunTestsConfigurationProducer extends RunConfigurationProducer<
if (task == null) {
return null;
}
return task.getLesson().getName() + "/" + task.getName();
String generatedName = task.getLesson().getName() + "/" + task.getName();
if (task.hasSubtasks()) {
int index = task.getActiveSubtaskIndex() + 1;
generatedName += " " + index;
}
return generatedName;
}
@Nullable
@@ -81,7 +87,7 @@ public class PyCCRunTestsConfigurationProducer extends RunConfigurationProducer<
if (task == null) {
return null;
}
String testsFileName = EduNames.TESTS_FILE;
String testsFileName = PyCCLanguageManager.getSubtaskTestsFileName(task.getActiveSubtaskIndex());
String taskDirPath = FileUtil.toSystemDependentName(taskDir.getPath());
String testsPath = taskDir.findChild(EduNames.SRC) != null ?
FileUtil.join(taskDirPath, EduNames.SRC, testsFileName) :
python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java
+7
View File
@@ -7,8 +7,10 @@ import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.edu.learning.checker.StudyTestRunner;
import com.jetbrains.edu.learning.core.EduNames;
import com.jetbrains.edu.learning.courseFormat.Course;
import com.jetbrains.edu.learning.courseFormat.Task;
import com.jetbrains.python.sdk.PythonSdkType;
@@ -35,6 +37,11 @@ public class PyStudyTestRunner extends StudyTestRunner {
}
String testsFileName = manager.getTestFileName();
if (myTask.hasSubtasks()) {
testsFileName = FileUtil.getNameWithoutExtension(testsFileName);
int index = myTask.getActiveSubtaskIndex() + 1;
testsFileName += EduNames.SUBTASK_MARKER + index + "." + FileUtilRt.getExtension(manager.getTestFileName());
}
final File testRunner = new File(myTaskDir.getPath(), testsFileName);
final GeneralCommandLine commandLine = new GeneralCommandLine();
commandLine.withWorkDirectory(myTaskDir.getPath());