Skip to content

Commit 93d92ed

Browse files
FintanHFintanH
committed
Merge remote-tracking branch 'han/test-reorg'
* han/test-reorg: radicle-surf: test structure compliance.
2 parents d7b3da8 + 0c94174 commit 93d92ed

File tree

21 files changed

+2105
-2042
lines changed

21 files changed

+2105
-2042
lines changed

‎radicle-surf/Cargo.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ include = [
1515
"data/git-platinum.tgz",
1616
]
1717

18+
[lib]
19+
test = false
20+
doctest = false
21+
1822
[features]
1923
serialize = ["serde"]
2024
# NOTE: testing `test_submodule_failure` on GH actions

‎radicle-surf/src/diff.rs‎

Lines changed: 0 additions & 236 deletions
Original file line numberDiff line numberDiff line change
@@ -594,239 +594,3 @@ impl Diff {
594594
}
595595
}
596596
}
597-
598-
#[cfg(test)]
599-
mod tests {
600-
use crate::{
601-
diff::*,
602-
file_system::{unsound, *},
603-
};
604-
use pretty_assertions::assert_eq;
605-
606-
#[test]
607-
fn test_create_file() {
608-
let directory = Directory::root();
609-
610-
let mut new_directory = Directory::root();
611-
new_directory.insert_file(unsound::path::new("banana.rs"), File::new(b"use banana"));
612-
613-
let diff = Diff::diff(directory, new_directory);
614-
615-
let expected_diff = Diff {
616-
created: vec![CreateFile {
617-
path: Path::with_root(&[unsound::label::new("banana.rs")]),
618-
diff: FileDiff::Plain {
619-
hunks: Hunks::default(),
620-
},
621-
}],
622-
deleted: vec![],
623-
copied: vec![],
624-
moved: vec![],
625-
modified: vec![],
626-
};
627-
628-
assert_eq!(diff, expected_diff)
629-
}
630-
631-
#[test]
632-
fn test_delete_file() {
633-
let mut directory = Directory::root();
634-
directory.insert_file(unsound::path::new("banana.rs"), File::new(b"use banana"));
635-
636-
let new_directory = Directory::root();
637-
638-
let diff = Diff::diff(directory, new_directory);
639-
640-
let expected_diff = Diff {
641-
created: vec![],
642-
deleted: vec![DeleteFile {
643-
path: Path::with_root(&[unsound::label::new("banana.rs")]),
644-
diff: FileDiff::Plain {
645-
hunks: Hunks::default(),
646-
},
647-
}],
648-
moved: vec![],
649-
copied: vec![],
650-
modified: vec![],
651-
};
652-
653-
assert_eq!(diff, expected_diff)
654-
}
655-
656-
/* TODO(fintan): Move is not detected yet
657-
#[test]
658-
fn test_moved_file() {
659-
let mut directory = Directory::root();
660-
directory.insert_file(&unsound::path::new("mod.rs"), File::new(b"use banana"));
661-
662-
let mut new_directory = Directory::root();
663-
new_directory.insert_file(&unsound::path::new("banana.rs"), File::new(b"use banana"));
664-
665-
let diff = Diff::diff(directory, new_directory).expect("diff failed");
666-
667-
assert_eq!(diff, Diff::new())
668-
}
669-
*/
670-
671-
#[test]
672-
fn test_modify_file() {
673-
let mut directory = Directory::root();
674-
directory.insert_file(unsound::path::new("banana.rs"), File::new(b"use banana"));
675-
676-
let mut new_directory = Directory::root();
677-
new_directory.insert_file(unsound::path::new("banana.rs"), File::new(b"use banana;"));
678-
679-
let diff = Diff::diff(directory, new_directory);
680-
681-
let expected_diff = Diff {
682-
created: vec![],
683-
deleted: vec![],
684-
moved: vec![],
685-
copied: vec![],
686-
modified: vec![ModifiedFile {
687-
path: Path::with_root(&[unsound::label::new("banana.rs")]),
688-
diff: FileDiff::Plain {
689-
hunks: Hunks::default(),
690-
},
691-
eof: None,
692-
}],
693-
};
694-
695-
assert_eq!(diff, expected_diff)
696-
}
697-
698-
#[test]
699-
fn test_create_directory() {
700-
let directory = Directory::root();
701-
702-
let mut new_directory = Directory::root();
703-
new_directory.insert_file(
704-
unsound::path::new("src/banana.rs"),
705-
File::new(b"use banana"),
706-
);
707-
708-
let diff = Diff::diff(directory, new_directory);
709-
710-
let expected_diff = Diff {
711-
created: vec![CreateFile {
712-
path: Path::with_root(&[
713-
unsound::label::new("src"),
714-
unsound::label::new("banana.rs"),
715-
]),
716-
diff: FileDiff::Plain {
717-
hunks: Hunks::default(),
718-
},
719-
}],
720-
deleted: vec![],
721-
moved: vec![],
722-
copied: vec![],
723-
modified: vec![],
724-
};
725-
726-
assert_eq!(diff, expected_diff)
727-
}
728-
729-
#[test]
730-
fn test_delete_directory() {
731-
let mut directory = Directory::root();
732-
directory.insert_file(
733-
unsound::path::new("src/banana.rs"),
734-
File::new(b"use banana"),
735-
);
736-
737-
let new_directory = Directory::root();
738-
739-
let diff = Diff::diff(directory, new_directory);
740-
741-
let expected_diff = Diff {
742-
created: vec![],
743-
deleted: vec![DeleteFile {
744-
path: Path::with_root(&[
745-
unsound::label::new("src"),
746-
unsound::label::new("banana.rs"),
747-
]),
748-
diff: FileDiff::Plain {
749-
hunks: Hunks::default(),
750-
},
751-
}],
752-
moved: vec![],
753-
copied: vec![],
754-
modified: vec![],
755-
};
756-
757-
assert_eq!(diff, expected_diff)
758-
}
759-
760-
#[test]
761-
fn test_modify_file_directory() {
762-
let mut directory = Directory::root();
763-
directory.insert_file(
764-
unsound::path::new("src/banana.rs"),
765-
File::new(b"use banana"),
766-
);
767-
768-
let mut new_directory = Directory::root();
769-
new_directory.insert_file(
770-
unsound::path::new("src/banana.rs"),
771-
File::new(b"use banana;"),
772-
);
773-
774-
let diff = Diff::diff(directory, new_directory);
775-
776-
let expected_diff = Diff {
777-
created: vec![],
778-
deleted: vec![],
779-
moved: vec![],
780-
copied: vec![],
781-
modified: vec![ModifiedFile {
782-
path: Path::with_root(&[
783-
unsound::label::new("src"),
784-
unsound::label::new("banana.rs"),
785-
]),
786-
diff: FileDiff::Plain {
787-
hunks: Hunks::default(),
788-
},
789-
eof: None,
790-
}],
791-
};
792-
793-
assert_eq!(diff, expected_diff)
794-
}
795-
796-
/* TODO(fintan): Tricky stuff
797-
#[test]
798-
fn test_disjoint_directories() {
799-
let mut directory = Directory::root();
800-
directory.insert_file(
801-
&unsound::path::new("foo/src/banana.rs"),
802-
File::new(b"use banana"),
803-
);
804-
805-
let mut other_directory = Directory::root();
806-
other_directory.insert_file(
807-
&unsound::path::new("bar/src/pineapple.rs"),
808-
File::new(b"use pineapple"),
809-
);
810-
811-
let diff = Diff::diff(directory, other_directory).expect("diff failed");
812-
813-
let expected_diff = Diff {
814-
created: vec![CreateFile(Path::from_labels(
815-
unsound::label::new("bar"),
816-
&[
817-
unsound::label::new("src"),
818-
unsound::label::new("pineapple.rs"),
819-
],
820-
))],
821-
deleted: vec![DeleteFile(Path::from_labels(
822-
unsound::label::new("foo"),
823-
&[unsound::label::new("src"), unsound::label::new("banana.rs")],
824-
))],
825-
moved: vec![],
826-
modified: vec![],
827-
};
828-
829-
assert_eq!(diff, expected_diff)
830-
}
831-
*/
832-
}

‎radicle-surf/src/diff/git.rs‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -229,78 +229,3 @@ impl<'a> TryFrom<git2::Diff<'a>> for Diff {
229229
Ok(diff)
230230
}
231231
}
232-
233-
#[cfg(test)]
234-
mod tests {
235-
use super::*;
236-
237-
#[test]
238-
fn test_both_missing_eof_newline() {
239-
let buf = r#"
240-
diff --git a/.env b/.env
241-
index f89e4c0..7c56eb7 100644
242-
--- a/.env
243-
+++ b/.env
244-
@@ -1 +1 @@
245-
-hello=123
246-
\ No newline at end of file
247-
+hello=1234
248-
\ No newline at end of file
249-
"#;
250-
let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
251-
let diff = Diff::try_from(diff).unwrap();
252-
assert_eq!(diff.modified[0].eof, Some(EofNewLine::BothMissing));
253-
}
254-
255-
#[test]
256-
fn test_none_missing_eof_newline() {
257-
let buf = r#"
258-
diff --git a/.env b/.env
259-
index f89e4c0..7c56eb7 100644
260-
--- a/.env
261-
+++ b/.env
262-
@@ -1 +1 @@
263-
-hello=123
264-
+hello=1234
265-
"#;
266-
let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
267-
let diff = Diff::try_from(diff).unwrap();
268-
assert_eq!(diff.modified[0].eof, None);
269-
}
270-
271-
// TODO(xphoniex): uncomment once libgit2 has fixed the bug
272-
//#[test]
273-
fn test_old_missing_eof_newline() {
274-
let buf = r#"
275-
diff --git a/.env b/.env
276-
index f89e4c0..7c56eb7 100644
277-
--- a/.env
278-
+++ b/.env
279-
@@ -1 +1 @@
280-
-hello=123
281-
\ No newline at end of file
282-
+hello=1234
283-
"#;
284-
let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
285-
let diff = Diff::try_from(diff).unwrap();
286-
assert_eq!(diff.modified[0].eof, Some(EofNewLine::OldMissing));
287-
}
288-
289-
// TODO(xphoniex): uncomment once libgit2 has fixed the bug
290-
//#[test]
291-
fn test_new_missing_eof_newline() {
292-
let buf = r#"
293-
diff --git a/.env b/.env
294-
index f89e4c0..7c56eb7 100644
295-
--- a/.env
296-
+++ b/.env
297-
@@ -1 +1 @@
298-
-hello=123
299-
+hello=1234
300-
\ No newline at end of file
301-
"#;
302-
let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
303-
let diff = Diff::try_from(diff).unwrap();
304-
assert_eq!(diff.modified[0].eof, Some(EofNewLine::NewMissing));
305-
}
306-
}

0 commit comments

Comments
 (0)