- added test for testing -T

Author: hz2

.vscode/cspell.dictionaries/jargon.wordlist.txt

@@ -175,8 +175,3 @@ nofield
 # * clippy
 uninlined
 nonminimal
-
-# * mv exchange functionality
-renameat
-FDCWD
-ENOTSUP

tests/by-util/test_mv.rs

@@ -1395,15 +1395,13 @@ fn test_mv_errors() {
     // $ at.mkdir dir && at.touch file
     // $ mv dir file
     // err == mv: cannot overwrite non-directory 'file' with directory 'dir'
-    assert!(
-        !scene
-            .ucmd()
-            .arg(dir)
-            .arg(file_a)
-            .fails()
-            .stderr_str()
-            .is_empty()
-    );
+    assert!(!scene
+        .ucmd()
+        .arg(dir)
+        .arg(file_a)
+        .fails()
+        .stderr_str()
+        .is_empty());
 }
 
 #[test]
@@ -1468,17 +1466,15 @@ fn test_mv_interactive_error() {
     // $ at.mkdir dir && at.touch file
     // $ mv -i dir file
     // err == mv: cannot overwrite non-directory 'file' with directory 'dir'
-    assert!(
-        !scene
-            .ucmd()
-            .arg("-i")
-            .arg(dir)
-            .arg(file_a)
-            .pipe_in("y")
-            .fails()
-            .stderr_str()
-            .is_empty()
-    );
+    assert!(!scene
+        .ucmd()
+        .arg("-i")
+        .arg(dir)
+        .arg(file_a)
+        .pipe_in("y")
+        .fails()
+        .stderr_str()
+        .is_empty());
 }
 
 #[test]
@@ -1603,17 +1599,13 @@ fn test_mv_seen_file() {
     let result = ts.ucmd().arg("a/f").arg("b/f").arg("c").fails();
 
     #[cfg(not(unix))]
-    assert!(
-        result
-            .stderr_str()
-            .contains("will not overwrite just-created 'c\\f' with 'b/f'")
-    );
+    assert!(result
+        .stderr_str()
+        .contains("will not overwrite just-created 'c\\f' with 'b/f'"));
     #[cfg(unix)]
-    assert!(
-        result
-            .stderr_str()
-            .contains("will not overwrite just-created 'c/f' with 'b/f'")
-    );
+    assert!(result
+        .stderr_str()
+        .contains("will not overwrite just-created 'c/f' with 'b/f'"));
 
     // a/f has been moved into c/f
     assert!(at.plus("c").join("f").exists());
@@ -1637,17 +1629,13 @@ fn test_mv_seen_multiple_files_to_directory() {
 
     let result = ts.ucmd().arg("a/f").arg("b/f").arg("b/g").arg("c").fails();
     #[cfg(not(unix))]
-    assert!(
-        result
-            .stderr_str()
-            .contains("will not overwrite just-created 'c\\f' with 'b/f'")
-    );
+    assert!(result
+        .stderr_str()
+        .contains("will not overwrite just-created 'c\\f' with 'b/f'"));
     #[cfg(unix)]
-    assert!(
-        result
-            .stderr_str()
-            .contains("will not overwrite just-created 'c/f' with 'b/f'")
-    );
+    assert!(result
+        .stderr_str()
+        .contains("will not overwrite just-created 'c/f' with 'b/f'"));
 
     assert!(!at.plus("a").join("f").exists());
     assert!(at.plus("b").join("f").exists());
@@ -1785,7 +1773,7 @@ fn test_move_should_not_fallback_to_copy() {
 #[cfg(target_os = "linux")]
 mod inter_partition_copying {
     use std::fs::{read_to_string, set_permissions, write};
-    use std::os::unix::fs::{PermissionsExt, symlink};
+    use std::os::unix::fs::{symlink, PermissionsExt};
     use tempfile::TempDir;
     use uutests::util::TestScenario;
     use uutests::util_name;
@@ -2518,7 +2506,7 @@ fn test_mv_exchange_verbose() {
         .arg("file1")
         .arg("file2")
         .succeeds()
-        .stdout_contains("file1 <-> file2");
+        .stdout_contains("exchanged 'file1' <-> 'file2'");
 }
 
 #[test]
@@ -2625,3 +2613,26 @@ fn test_mv_exchange_not_supported() {
         .fails()
         .stderr_contains("--exchange is not supported on this system");
 }
+
+#[test]
+#[cfg(target_os = "linux")]
+fn test_mv_exchange_with_no_target_directory() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    at.mkdir("d1");
+    at.mkdir("d2");
+    at.write("d1/file1", "content1");
+    at.write("d2/file2", "content2");
+
+    ucmd.arg("-T")
+        .arg("--exchange")
+        .arg("d1")
+        .arg("d2")
+        .succeeds();
+
+    // after exchange, d1 should contain file2 and d2 should contain file1
+    assert_eq!(at.read("d1/file2"), "content2");
+    assert_eq!(at.read("d2/file1"), "content1");
+    assert!(!at.file_exists("d1/file1"));
+    assert!(!at.file_exists("d2/file2"));
+}