export policy

Author: Heliozoa

plugins/java/src/lib.rs

@@ -5,9 +5,9 @@ mod error;
 mod maven;
 mod plugin;
 
-pub use ant::AntPlugin;
+pub use ant::{policy::AntStudentFilePolicy, AntPlugin};
 pub use error::JavaError;
-pub use maven::MavenPlugin;
+pub use maven::{policy::MavenStudentFilePolicy, MavenPlugin};
 
 use j4rs::{ClasspathEntry, Jvm, JvmBuilder};
 use serde::Deserialize;

plugins/make/src/lib.rs

@@ -8,3 +8,4 @@ mod valgrind_log;
 
 pub use error::MakeError;
 pub use plugin::MakePlugin;
+pub use policy::MakeStudentFilePolicy;

plugins/notests/src/lib.rs

@@ -4,9 +4,9 @@ use std::collections::HashMap;
 use std::io::{Read, Seek};
 use std::path::{Path, PathBuf};
 use std::time::Duration;
+pub use tmc_langs_framework::policy::EverythingIsStudentFilePolicy as NoTestsStudentFilePolicy;
 use tmc_langs_framework::{
     domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult},
-    policy::EverythingIsStudentFilePolicy,
     zip::ZipArchive,
     LanguagePlugin, StudentFilePolicy, TmcError,
 };
@@ -30,7 +30,7 @@ impl NoTestsPlugin {
 
 impl LanguagePlugin for NoTestsPlugin {
     const PLUGIN_NAME: &'static str = "No-Tests";
-    type StudentFilePolicy = EverythingIsStudentFilePolicy;
+    type StudentFilePolicy = NoTestsStudentFilePolicy;
 
     fn scan_exercise(&self, path: &Path, exercise_name: String) -> Result<ExerciseDesc, TmcError> {
         let test_name = format!("{}Test", exercise_name);
@@ -62,7 +62,7 @@ impl LanguagePlugin for NoTestsPlugin {
     }
 
     fn get_student_file_policy(project_path: &Path) -> Self::StudentFilePolicy {
-        EverythingIsStudentFilePolicy::new(project_path.to_path_buf())
+        NoTestsStudentFilePolicy::new(project_path.to_path_buf())
     }
 
     fn is_exercise_type_correct(path: &Path) -> bool {

tmc-langs-framework/src/plugin.rs

@@ -30,7 +30,7 @@ use zip::ZipArchive;
 /// this interface are free to cache results if needed.
 pub trait LanguagePlugin {
     const PLUGIN_NAME: &'static str;
-    type StudentFilePolicy: StudentFilePolicy + 'static;
+    type StudentFilePolicy: StudentFilePolicy;
 
     /// Returns a list of all directories inside that contain an exercise in this
     /// language.