EDU-450 Add tests and task.html to invisible files when converting from old course...

diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyUtils.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyUtils.java
index 5e8ef5acfc7718b6a319a7adcb7ede69f15f6bb8..07dbaa86d7e978055869c4bdea4053835cd88987 100644 (file)
--- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyUtils.java
+++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyUtils.java
@@ -212,6 +212,18 @@ public class StudyUtils {
     return language == null ? null : StudyLanguageManager.INSTANCE.forLanguage(language);
   }
 
+  public static boolean isTestsFile(@NotNull Project project, @NotNull final String name) {
+    Course course = StudyTaskManager.getInstance(project).getCourse();
+    if (course == null) {
+      return false;
+    }
+    StudyLanguageManager manager = getLanguageManager(course);
+    if (manager == null) {
+      return false;
+    }
+    return manager.getTestFileName().equals(name);
+  }
+
   @Nullable
   public static TaskFile getTaskFile(@NotNull final Project project, @NotNull final VirtualFile file) {
     final Course course = StudyTaskManager.getInstance(project).getCourse();

diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
index 89e5219410759ac08d826b1d6c1310855ef1a6a6..01bda954360aeae92b3eb5a8ab8f33465194cc50 100644 (file)
--- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
+++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
@@ -10,6 +10,7 @@ import com.jetbrains.edu.courseFormat.Lesson;
 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 org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -65,7 +66,7 @@ public class StudyGenerator {
     if (filesInTask != null) {
       for (File file : filesInTask) {
         String fileName = file.getName();
-        if (!task.isTaskFile(fileName)) {
+        if (!task.isTaskFile(fileName) && !StudyUtils.isTestsFile(project, fileName) && !EduNames.TASK_HTML.equals(fileName)) {
           File resourceFile = new File(newResourceRoot, fileName);
           File fileInProject = new File(taskDir.getCanonicalPath(), fileName);
           FileUtil.copy(resourceFile, fileInProject);

diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
index e07a349ac5de9a9620463e6c95b4578ff1e2b970..490c84a167e732b420fe121cd1dd5fc3d4b2190f 100644 (file)
--- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
+++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
@@ -71,7 +71,8 @@ public class StudyTreeStructureProvider implements TreeStructureProvider, DumbAw
                                            @NotNull final VirtualFile virtualFile) {
     if (!StudyTaskManager.getInstance(project).isInvisibleFile(virtualFile.getPath())) {
       String fileName = virtualFile.getName();
-      if (!fileName.contains(EduNames.WINDOW_POSTFIX) && !fileName.contains(EduNames.WINDOWS_POSTFIX)) {
+      if (!fileName.contains(EduNames.WINDOW_POSTFIX) && !fileName.contains(EduNames.WINDOWS_POSTFIX)
+          && !StudyUtils.isTestsFile(project, fileName) && !EduNames.TASK_HTML.equals(fileName) && !fileName.contains(".answer")) {
         nodes.add(node);
       }
     }