Test fixes

Heliozoa · Heliozoa · commit b2957d822de5 · 2025-10-07T14:18:25.000+03:00
diff --git a/crates/plugins/csharp/src/policy.rs b/crates/plugins/csharp/src/policy.rs
@@ -33,14 +33,14 @@ mod test {
     fn file_in_binary_dir_is_not_student_file() {
         let policy = CSharpStudentFilePolicy::new(Path::new(".")).unwrap();
         assert!(!policy.is_student_file(Path::new("src/bin/any/file")));
-        assert!(!policy.is_student_file(Path::new("obj/any/src/file")));
+        assert!(!policy.is_student_file(Path::new("obj/any/src/file.cs")));
     }
 
     #[test]
-    fn file_in_src_is_student_file() {
+    fn cs_file_in_src_is_student_file() {
         let policy = CSharpStudentFilePolicy::new(Path::new(".")).unwrap();
-        assert!(policy.is_student_file(Path::new("src/file")));
-        assert!(policy.is_student_file(Path::new("src/any/file")));
+        assert!(policy.is_student_file(Path::new("src/file.cs")));
+        assert!(policy.is_student_file(Path::new("src/any/file.cs")));
     }
 
     #[test]
diff --git a/crates/plugins/java/src/ant_policy.rs b/crates/plugins/java/src/ant_policy.rs
@@ -38,7 +38,7 @@ mod test {
     #[test]
     fn is_not_student_source_file() {
         let policy = AntStudentFilePolicy::new(Path::new(".")).unwrap();
-        assert!(policy.is_student_file(Path::new("src/file")));
+        assert!(!policy.is_student_file(Path::new("src/file")));
         assert!(!policy.is_student_file(Path::new("file")));
         assert!(!policy.is_student_file(Path::new("dir/src/file")));
         assert!(!policy.is_student_file(Path::new("srca/file")));
diff --git a/crates/plugins/java/src/maven_plugin.rs b/crates/plugins/java/src/maven_plugin.rs
@@ -17,7 +17,7 @@ use tmc_langs_framework::{
     Archive, ExerciseDesc, Language, LanguagePlugin, RunResult, StyleValidationResult, TmcCommand,
     TmcError, nom::IResult, nom_language::error::VerboseError,
 };
-use tmc_langs_util::{file_util, path_util};
+use tmc_langs_util::file_util;
 
 const MVN_ARCHIVE: &[u8] = include_bytes!("../deps/apache-maven-3.8.1-bin.tar.gz");
 const MVN_PATH_IN_ARCHIVE: &str = "apache-maven-3.8.1"; // the name of the base directory in the maven archive
@@ -137,12 +137,9 @@ impl LanguagePlugin for MavenPlugin {
             let next = iter.with_next(|file| {
                 let file_path = file.path()?;
 
-                if file.is_file() && file_path.extension() == Some(OsStr::new("java")) {
-                    // check if java file has src as ancestor
-                    for ancestor in file_path.ancestors() {
-                        if let Some(src_parent) = path_util::get_parent_of_named(ancestor, "src") {
-                            return Ok(Break(Some(src_parent)));
-                        }
+                if file.is_file() && file_path.file_name() == Some(OsStr::new("pom.xml")) {
+                    if let Some(pom_parent) = file_path.parent() {
+                        return Ok(Break(Some(pom_parent.to_path_buf())));
                     }
                 }
                 Ok(Continue(()))
diff --git a/crates/plugins/java/src/maven_policy.rs b/crates/plugins/java/src/maven_policy.rs
@@ -20,6 +20,7 @@ impl StudentFilePolicy for MavenStudentFilePolicy {
     }
 
     fn is_non_extra_student_file(&self, path: &Path) -> bool {
+        // technically pom.xml would need to be included to differentiate between maven and ant projects
         path.starts_with("src/main") && path.extension() == Some(OsStr::new("java"))
     }
 }
@@ -31,8 +32,8 @@ mod test {
     #[test]
     fn is_student_file() {
         let policy = MavenStudentFilePolicy::new(Path::new(".")).unwrap();
-        assert!(policy.is_student_file(Path::new("src/main/file")));
-        assert!(policy.is_student_file(Path::new("src/main/dir/file")));
+        assert!(policy.is_student_file(Path::new("src/main/file.java")));
+        assert!(policy.is_student_file(Path::new("src/main/dir/file.java")));
     }
 
     #[test]
diff --git a/crates/plugins/make/src/policy.rs b/crates/plugins/make/src/policy.rs
@@ -32,14 +32,17 @@ mod test {
     #[test]
     fn is_student_file() {
         let policy = MakeStudentFilePolicy::new(Path::new(".")).unwrap();
-        assert!(policy.is_student_file(Path::new("src")));
-        assert!(policy.is_student_file(Path::new("src/file")));
-        assert!(policy.is_student_file(Path::new("src/dir/file")));
+        assert!(policy.is_student_file(Path::new("src/file.c")));
+        assert!(policy.is_student_file(Path::new("src/file.h")));
+        assert!(policy.is_student_file(Path::new("src/dir/file.c")));
+        assert!(policy.is_student_file(Path::new("src/dir/file.h")));
     }
 
     #[test]
     fn is_not_student_source_file() {
         let policy = MakeStudentFilePolicy::new(Path::new(".")).unwrap();
+        assert!(!policy.is_student_file(Path::new("a.c")));
+        assert!(!policy.is_student_file(Path::new("a.h")));
         assert!(!policy.is_student_file(Path::new("srcc")));
         assert!(!policy.is_student_file(Path::new("dir/src/file")));
     }
diff --git a/crates/plugins/make/tests/data/valgrind-failing-exercise/src/source.c b/crates/plugins/make/tests/data/valgrind-failing-exercise/src/source.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include "source.h"
+#include <stdlib.h>
 
 int one(void)
 {
diff --git a/crates/plugins/r/src/policy.rs b/crates/plugins/r/src/policy.rs
@@ -39,7 +39,6 @@ mod test {
         init();
 
         let policy = RStudentFilePolicy::new(Path::new(".")).unwrap();
-        assert!(policy.is_student_file(Path::new("R")));
         assert!(policy.is_student_file(Path::new("R/file.R")));
     }
 
@@ -48,6 +47,7 @@ mod test {
         init();
 
         let policy = RStudentFilePolicy::new(Path::new(".")).unwrap();
+        assert!(!policy.is_student_file(Path::new("a.R")));
         assert!(!policy.is_student_file(Path::new("dir/R")));
         assert!(!policy.is_student_file(Path::new("dir/R/file")));
     }
diff --git a/crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@make__valgrind-failing-exercise.snap b/crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@make__valgrind-failing-exercise.snap
@@ -9,4 +9,4 @@ message: compressed project from [PATH] to [PATH]
 result: executed-command
 data:
   output-data-kind: compressed-project-hash
-  output-data: f22f8d2f4502dc8c14e98c9b89f8413b92b219e9ad1aaf6dfc429d1cc177745d
+  output-data: fb42a43f95667107fd4b696ceadd19cda6595daa2c3afa825f53984fab4baa02
diff --git a/crates/tmc-langs-cli/tests/snapshots/integration__compress_project_zip@make__valgrind-failing-exercise.snap b/crates/tmc-langs-cli/tests/snapshots/integration__compress_project_zip@make__valgrind-failing-exercise.snap
@@ -9,4 +9,4 @@ message: compressed project from [PATH] to [PATH]
 result: executed-command
 data:
   output-data-kind: compressed-project-hash
-  output-data: f22f8d2f4502dc8c14e98c9b89f8413b92b219e9ad1aaf6dfc429d1cc177745d
+  output-data: fb42a43f95667107fd4b696ceadd19cda6595daa2c3afa825f53984fab4baa02
diff --git a/crates/tmc-langs-cli/tests/snapshots/integration__compress_project_zstd@make__valgrind-failing-exercise.snap b/crates/tmc-langs-cli/tests/snapshots/integration__compress_project_zstd@make__valgrind-failing-exercise.snap
@@ -9,4 +9,4 @@ message: compressed project from [PATH] to [PATH]
 result: executed-command
 data:
   output-data-kind: compressed-project-hash
-  output-data: f22f8d2f4502dc8c14e98c9b89f8413b92b219e9ad1aaf6dfc429d1cc177745d
+  output-data: fb42a43f95667107fd4b696ceadd19cda6595daa2c3afa825f53984fab4baa02
diff --git a/crates/tmc-langs-framework/src/archive.rs b/crates/tmc-langs-framework/src/archive.rs
@@ -295,15 +295,9 @@ pub enum Compression {
 }
 
 impl Compression {
-    pub fn compress(
-        self,
-        path: &Path,
-        hash: bool,
-        size_limit_mb: u32,
-    ) -> Result<(Vec<u8>, Option<Hash>), TmcError> {
-        let mut builder =
-            ArchiveBuilder::new(Cursor::new(Vec::new()), self, size_limit_mb, true, hash);
-        walk_dir_for_compression(path, size_limit_mb, |entry, relative_path| {
+    pub fn compress(self, path: &Path, hash: bool) -> Result<(Vec<u8>, Option<Hash>), TmcError> {
+        let mut builder = ArchiveBuilder::new(Cursor::new(Vec::new()), self, None, true, hash);
+        walk_dir_for_compression(path, |entry, relative_path| {
             if entry.path().is_dir() {
                 builder.add_directory(entry.path(), relative_path)?;
             } else if entry.path().is_file() {
@@ -312,23 +306,14 @@ impl Compression {
             Ok(())
         })?;
         let (cursor, hash) = builder.finish()?;
-        if u32::try_from(cursor.get_ref().len()).unwrap_or(u32::MAX) > size_limit_mb {
-            return Err(TmcError::ArchiveSizeLimitExceeded {
-                limit: size_limit_mb,
-            });
-        }
         Ok((cursor.into_inner(), hash))
     }
 }
 
 fn walk_dir_for_compression(
     root: &Path,
-    size_limit_mb: u32,
     mut f: impl FnMut(&walkdir::DirEntry, &str) -> Result<(), TmcError>,
 ) -> Result<(), TmcError> {
-    let size_limit_b = u64::from(size_limit_mb).saturating_mul(1000 * 1000);
-    let mut size_total_b = 0;
-
     let parent = root.parent().map(PathBuf::from).unwrap_or_default();
     for entry in WalkDir::new(root)
         .sort_by_file_name()
@@ -337,13 +322,6 @@ fn walk_dir_for_compression(
         .filter_entry(|e| e.file_name() != file_util::LOCK_FILE_NAME)
     {
         let entry = entry?;
-        let metadata = entry.metadata()?;
-        size_total_b += metadata.len();
-        if size_total_b > size_limit_b {
-            return Err(TmcError::ArchiveSizeLimitExceeded {
-                limit: size_limit_mb,
-            });
-        }
         let stripped = entry
             .path()
             .strip_prefix(&parent)
@@ -381,8 +359,8 @@ impl FromStr for Compression {
 }
 
 pub struct ArchiveBuilder<W: Write + Seek> {
-    size_limit_b: usize,
-    size_limit_mb: u32,
+    size_limit_b: Option<usize>,
+    size_limit_mb: Option<u32>,
     size_total_b: usize,
     hasher: Option<Hasher>,
     kind: Kind<W>,
@@ -406,13 +384,15 @@ impl<W: Write + Seek> ArchiveBuilder<W> {
     pub fn new(
         writer: W,
         compression: Compression,
-        size_limit_mb: u32,
+        size_limit_mb: Option<u32>,
         deterministic: bool,
         hash: bool,
     ) -> Self {
-        let size_limit_b = usize::try_from(size_limit_mb)
-            .unwrap_or(usize::MAX)
-            .saturating_mul(1000 * 1000);
+        let size_limit_b = size_limit_mb.map(|slmb| {
+            usize::try_from(slmb)
+                .unwrap_or(usize::MAX)
+                .saturating_mul(1000 * 1000)
+        });
         let hasher = if hash { Some(Hasher::new()) } else { None };
         let kind = match compression {
             Compression::Tar => {
@@ -471,10 +451,12 @@ impl<W: Write + Seek> ArchiveBuilder<W> {
         self.hash(path_in_archive.as_bytes());
         let bytes = file_util::read_file(source)?;
         self.size_total_b += bytes.len();
-        if self.size_total_b > self.size_limit_b {
-            return Err(TmcError::ArchiveSizeLimitExceeded {
-                limit: self.size_limit_mb,
-            });
+        if let (Some(size_limit_b), Some(size_limit_mb)) = (self.size_limit_b, self.size_limit_mb) {
+            if self.size_total_b > size_limit_b {
+                return Err(TmcError::ArchiveSizeLimitExceeded {
+                    limit: size_limit_mb,
+                });
+            }
         }
         self.hash(&bytes);
         match &mut self.kind {
@@ -538,8 +520,13 @@ mod test {
 
     #[test]
     fn exceeding_file_limit_causes_error() {
-        let mut builder =
-            ArchiveBuilder::new(Cursor::new(Vec::new()), Compression::Tar, 1, true, true);
+        let mut builder = ArchiveBuilder::new(
+            Cursor::new(Vec::new()),
+            Compression::Tar,
+            Some(1),
+            true,
+            true,
+        );
 
         // write exactly 1MB, OK
         let mut temp = NamedTempFile::new().unwrap();
diff --git a/crates/tmc-langs-plugins/src/compression.rs b/crates/tmc-langs-plugins/src/compression.rs
@@ -24,7 +24,7 @@ pub fn compress_student_files(
     let mut writer = ArchiveBuilder::new(
         Cursor::new(vec![]),
         compression,
-        size_limit_mb,
+        Some(size_limit_mb),
         deterministic,
         hash,
     );
diff --git a/crates/tmc-langs-plugins/src/lib.rs b/crates/tmc-langs-plugins/src/lib.rs
@@ -56,7 +56,7 @@ pub fn compress_project(
     size_limit_mb: u32,
 ) -> Result<(Vec<u8>, Option<Hash>), PluginError> {
     let (compressed, hash) = if naive {
-        compression.compress(path, hash, size_limit_mb)?
+        compression.compress(path, hash)?
     } else {
         let policy = get_student_file_policy(path)?;
         compression::compress_student_files(
diff --git a/sample_exercises/make/valgrind-failing-exercise/src/source.c b/sample_exercises/make/valgrind-failing-exercise/src/source.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include "source.h"
+#include <stdlib.h>
 
 int one(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ impl StudentFilePolicy for MavenStudentFilePolicy {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`fn is_non_extra_student_file(&self, path: &Path) -> bool {`
	`23`	`+ // technically pom.xml would need to be included to differentiate between maven and ant projects`
`23`	`24`	`path.starts_with("src/main") && path.extension() == Some(OsStr::new("java"))`
`24`	`25`	`}`
`25`	`26`	`}`
`@@ -31,8 +32,8 @@ mod test {`
`31`	`32`	`#[test]`
`32`	`33`	`fn is_student_file() {`
`33`	`34`	`let policy = MavenStudentFilePolicy::new(Path::new(".")).unwrap();`
`34`		`- assert!(policy.is_student_file(Path::new("src/main/file")));`
`35`		`- assert!(policy.is_student_file(Path::new("src/main/dir/file")));`
	`35`	`+ assert!(policy.is_student_file(Path::new("src/main/file.java")));`
	`36`	`+ assert!(policy.is_student_file(Path::new("src/main/dir/file.java")));`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`#[test]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#include <stdio.h>`
`2`	`2`	`#include "source.h"`
	`3`	`+#include <stdlib.h>`
`3`	`4`
`4`	`5`	`int one(void)`
`5`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ mod test {`
`39`	`39`	`init();`
`40`	`40`
`41`	`41`	`let policy = RStudentFilePolicy::new(Path::new(".")).unwrap();`
`42`		`- assert!(policy.is_student_file(Path::new("R")));`
`43`	`42`	`assert!(policy.is_student_file(Path::new("R/file.R")));`
`44`	`43`	`}`
`45`	`44`
`@@ -48,6 +47,7 @@ mod test {`
`48`	`47`	`init();`
`49`	`48`
`50`	`49`	`let policy = RStudentFilePolicy::new(Path::new(".")).unwrap();`
	`50`	`+ assert!(!policy.is_student_file(Path::new("a.R")));`
`51`	`51`	`assert!(!policy.is_student_file(Path::new("dir/R")));`
`52`	`52`	`assert!(!policy.is_student_file(Path::new("dir/R/file")));`
`53`	`53`	`}`