Additional tests

Assisted-by: Cursor

Author: twaugh

Makefile.am

@@ -116,8 +116,13 @@ TESTS = tests/newline1/run-test \
 	tests/combine2/run-test \
 	tests/combine3/run-test \
 	tests/combine4/run-test \
+	tests/combine5/run-test \
+	tests/combine6/run-test \
 	tests/combine-devnull/run-test \
 	tests/combine-devnull-p/run-test \
+	tests/combine-no-match/run-test \
+	tests/interdiff-devnull/run-test \
+	tests/flipdiff-devnull/run-test \
 	tests/gendiff1/run-test \
 	tests/gendiff2/run-test \
 	tests/comma/run-test \

tests/combine-no-match/run-test

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# Test combinediff when no files match at any -p level
+# Should fall back to showing separate patches
+
+. ${top_srcdir-.}/tests/common.sh
+
+# Create first patch with one file
+cat << EOF > patch1
+--- /dev/null
++++ b/file1.txt
+@@ -0,0 +1,2 @@
++content1
++line2
+EOF
+
+# Create second patch with completely different file
+cat << EOF > patch2
+--- a/completely/different/file2.txt
++++ b/completely/different/file2.txt
+@@ -1,1 +1,2 @@
+ existing
++new line
+EOF
+
+# Run combinediff - should show separate patches since no files match
+${COMBINEDIFF} patch1 patch2 2>errors >actual || exit 1
+[ -s errors ] && exit 1
+
+# Should show "only in patch2:" indicating patches weren't combined
+grep -q "only in patch2:" actual || exit 1
+
+# Should contain both patches
+grep -q "file1.txt" actual || exit 1
+grep -q "file2.txt" actual || exit 1
+
+exit 0

tests/combine5/run-test

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# Test combinediff with multiple path levels requiring -p2
+# This tests the automatic detection of deeper path stripping
+
+. ${top_srcdir-.}/tests/common.sh
+
+# Create first patch with deeply nested path
+cat << EOF > patch1
+--- /dev/null
++++ b/src/deep/nested/file.c
+@@ -0,0 +1,2 @@
++#include <stdio.h>
++int main() { return 0; }
+EOF
+
+# Create second patch modifying the same file with different path prefix
+cat << EOF > patch2
+--- a/src/deep/nested/file.c
++++ b/src/deep/nested/file.c
+@@ -1,2 +1,3 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ int main() { return 0; }
+EOF
+
+# Expected combined output (should auto-detect -p1)
+cat << EOF > expected
+diff -u /dev/null b/src/deep/nested/file.c
+--- /dev/null
++++ b/src/deep/nested/file.c
+@@ -0,0 +1,3 @@
++#include <stdio.h>
++#include <stdlib.h>
++int main() { return 0; }
+EOF
+
+# Run combinediff
+${COMBINEDIFF} patch1 patch2 2>errors >actual || exit 1
+[ -s errors ] && exit 1
+
+# Compare the actual output with expected
+diff -u expected actual || exit 1
+
+exit 0

tests/combine6/run-test

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Test combinediff with file deletion (regular file to /dev/null)
+# This tests /dev/null handling in the reverse direction
+
+. ${top_srcdir-.}/tests/common.sh
+
+# Create first patch that creates a file
+cat << EOF > patch1
+--- /dev/null
++++ b/tempfile.txt
+@@ -0,0 +1,3 @@
++temporary
++content
++here
+EOF
+
+# Create second patch that deletes the same file
+cat << EOF > patch2
+--- a/tempfile.txt
++++ /dev/null
+@@ -1,3 +0,0 @@
+-temporary
+-content
+-here
+EOF
+
+# Run combinediff
+${COMBINEDIFF} patch1 patch2 2>errors >actual || exit 1
+[ -s errors ] && exit 1
+
+# Expected combined output should be empty (create then delete = no change)
+diff -u /dev/null actual || exit 1
+
+exit 0

tests/flipdiff-devnull/run-test

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Test flipdiff with /dev/null automatic -p detection
+# This tests that flipdiff can auto-detect -p values when dealing with /dev/null
+
+. ${top_srcdir-.}/tests/common.sh
+
+# Create first patch (creates a file)
+cat << EOF > patch1
+--- /dev/null
++++ b/testfile.c
+@@ -0,0 +1,2 @@
++#include <stdio.h>
++int main() { return 0; }
+EOF
+
+# Create second patch (modifies the same file)
+cat << EOF > patch2
+--- a/testfile.c
++++ b/testfile.c
+@@ -1,2 +1,3 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ int main() { return 0; }
+EOF
+
+# Expected flipdiff output (should auto-detect -p1)
+cat << EOF > expected
+--- a/testfile.c
++++ b/testfile.c
+@@ -0,0 +1 @@
++#include <stdlib.h>
+
+=== 8< === cut here === 8< ===
+
+--- /dev/null
++++ b/testfile.c
+@@ -1 +1,3 @@
++#include <stdio.h>
+ #include <stdlib.h>
++int main() { return 0; }
+EOF
+
+# Run flipdiff - should auto-detect -p1 and produce flipped patches
+${FLIPDIFF} patch1 patch2 2>errors >actual || exit 1
+[ -s errors ] && exit 1
+
+# Compare the actual output with expected
+diff -u expected actual || exit 1
+
+exit 0

tests/interdiff-devnull/run-test

@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Test interdiff with /dev/null automatic -p detection
+# This tests that interdiff can auto-detect -p values when dealing with /dev/null
+
+. ${top_srcdir-.}/tests/common.sh
+
+# Create first patch (creates a file with initial content)
+cat << EOF > patch1
+--- /dev/null
++++ b/newfile.txt
+@@ -0,0 +1,3 @@
++line one
++line two
++line three
+EOF
+
+# Create second patch (creates the same file with different content)
+cat << EOF > patch2
+--- /dev/null
++++ a/newfile.txt
+@@ -0,0 +1,4 @@
++line one
++inserted line
++line two
++line three
+EOF
+
+# Expected interdiff output (should auto-detect -p1)
+# This shows what needs to change to go from patch1's result to patch2's result
+cat << EOF > expected
+diff -u b/newfile.txt a/newfile.txt
+--- b/newfile.txt
++++ a/newfile.txt
+@@ -1,3 +1,4 @@
+ line one
++inserted line
+ line two
+ line three
+EOF
+
+# Run interdiff
+${INTERDIFF} patch1 patch2 2>errors >actual || exit 1
+[ -s errors ] && exit 1
+
+# Compare the actual output with expected
+diff -u expected actual || exit 1
+
+exit 0