def test_git_source_paths_with_supported_extensions(self):
# Configure the git diff output
self._set_git_diff_output(
git_diff_output({
"subdir/file1.py":
line_numbers(3, 10) + line_numbers(34, 47)
}),
git_diff_output({
"subdir/file2.py": line_numbers(3, 10),
"file3.py": [0]
}),
git_diff_output({"README.md": line_numbers(3, 10)}),
)
# Set supported extensions
self.diff._supported_extensions = ["py"]
# Get the source paths in the diff
source_paths = self.diff.src_paths_changed()
# Validate the source paths, README.md should be left out
self.assertEqual(len(source_paths), 3)
self.assertEqual("file3.py", source_paths[0])
self.assertEqual("subdir/file1.py", source_paths[1])
self.assertEqual("subdir/file2.py", source_paths[2])
def test_git_source_paths(self):
# Configure the git diff output
self._set_git_diff_output(
git_diff_output({
"subdir/file1.py":
line_numbers(3, 10) + line_numbers(34, 47)
}),
git_diff_output({
"subdir/file2.py": line_numbers(3, 10),
"file3.py": [0]
}),
git_diff_output(dict(), deleted_files=["README.md"]),
)
# Get the source paths in the diff
source_paths = self.diff.src_paths_changed()
# Validate the source paths
# They should be in alphabetical order
self.assertEqual(len(source_paths), 4)
self.assertEqual("file3.py", source_paths[0])
self.assertEqual("README.md", source_paths[1])
self.assertEqual("subdir/file1.py", source_paths[2])
self.assertEqual("subdir/file2.py", source_paths[3])
def test_ignore_unstaged_inclusion(self):
self.diff = GitDiffReporter(git_diff=self._git_diff, ignore_unstaged=True)
unstaged_input = git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
self._set_git_diff_output('', '', unstaged_input)
self.assertEqual(2, len(self.diff._get_included_diff_results()))
self.assertEqual(['', ''], self.diff._get_included_diff_results())
def test_ignore_unstaged_inclusion(self):
self.diff = GitDiffReporter(git_diff=self._git_diff, ignore_unstaged=True)
unstaged_input = git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
self._set_git_diff_output('', '', unstaged_input)
self.assertEqual(2, len(self.diff._get_included_diff_results()))
self.assertEqual(['', ''], self.diff._get_included_diff_results())
def test_inclusion_list(self):
unstaged_input = git_diff_output(
{'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
self._set_git_diff_output('', '', unstaged_input)
self.assertEqual(3, len(self.diff._get_included_diff_results()))
self.assertEqual(['', '', unstaged_input],
self.diff._get_included_diff_results())
def test_ignore_staged_inclusion(self):
self.diff = GitDiffReporter(git_diff=self._git_diff,
ignore_staged=True)
staged_input = git_diff_output(
{"subdir/file1.py": line_numbers(3, 10) + line_numbers(34, 47)})
self._set_git_diff_output("", staged_input, "")
self.assertEqual(2, len(self.diff._get_included_diff_results()))
self.assertEqual(["", ""], self.diff._get_included_diff_results())
def test_git_repeat_lines(self):
# Same committed, staged, and unstaged lines
diff = git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
self._set_git_diff_output(diff, diff, diff)
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('subdir/file1.py')
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(3, 10) + line_numbers(34, 47))
def test_git_repeat_lines(self):
# Same committed, staged, and unstaged lines
diff = git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
self._set_git_diff_output(diff, diff, diff)
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('subdir/file1.py')
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(3, 10) + line_numbers(34, 47))
def test_duplicate_source_paths(self):
# Duplicate the output for committed, staged, and unstaged changes
diff = git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
self._set_git_diff_output(diff, diff, diff)
# Get the source paths in the diff
source_paths = self.diff.src_paths_changed()
# Should see only one copy of source files
self.assertEqual(len(source_paths), 1)
self.assertEqual('subdir/file1.py', source_paths[0])
def test_duplicate_source_paths(self):
# Duplicate the output for committed, staged, and unstaged changes
diff = git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
self._set_git_diff_output(diff, diff, diff)
# Get the source paths in the diff
source_paths = self.diff.src_paths_changed()
# Should see only one copy of source files
self.assertEqual(len(source_paths), 1)
self.assertEqual('subdir/file1.py', source_paths[0])
def test_git_lines_changed(self):
# Configure the git diff output
self._set_git_diff_output(
git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)}),
git_diff_output({'subdir/file2.py': line_numbers(3, 10), 'file3.py': [0]}),
git_diff_output(dict(), deleted_files=['README.md'])
)
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('subdir/file1.py')
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(3, 10) + line_numbers(34, 47))
def test_git_deleted_lines(self):
# Configure the git diff output
self._set_git_diff_output(
git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)}),
git_diff_output({'subdir/file2.py': line_numbers(3, 10), 'file3.py': [0]}),
git_diff_output(dict(), deleted_files=['README.md'])
)
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('README.md')
# Validate no lines changed
self.assertEqual(len(lines_changed), 0)
def test_ignore_lines_outside_src(self):
# Add some lines at the start of the diff, before any
# source files are specified
diff = git_diff_output({'subdir/file1.py': line_numbers(3, 10)})
master_diff = "\n".join(['- deleted line', '+ added line', diff])
# Configure the git diff output
self._set_git_diff_output(master_diff, "", "")
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('subdir/file1.py')
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(3, 10))
def test_ignore_lines_outside_src(self):
# Add some lines at the start of the diff, before any
# source files are specified
diff = git_diff_output({'subdir/file1.py': line_numbers(3, 10)})
master_diff = "\n".join(['- deleted line', '+ added line', diff])
# Configure the git diff output
self._set_git_diff_output(master_diff, "", "")
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('subdir/file1.py')
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(3, 10))
def test_git_lines_changed(self):
# Configure the git diff output
self._set_git_diff_output(
git_diff_output(
{"subdir/file1.py": line_numbers(3, 10) + line_numbers(34, 47)}
),
git_diff_output({"subdir/file2.py": line_numbers(3, 10), "file3.py": [0]}),
git_diff_output(dict(), deleted_files=["README.md"]),
)
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed("subdir/file1.py")
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(3, 10) + line_numbers(34, 47))
def _test_git_path_selection(self, include, exclude, expected):
old_cwd = os.getcwd()
with tempfile.TemporaryDirectory() as tmp_dir:
# change the working directory into the temp directory so that globs are working
os.chdir(tmp_dir)
self.diff = GitDiffReporter(git_diff=self._git_diff,
exclude=exclude,
include=include)
main_dir = Path(tmp_dir)
(main_dir / "file3.py").touch()
subdir1 = main_dir / "subdir1"
subdir1.mkdir()
(subdir1 / "file1.py").touch()
subdir2 = main_dir / "subdir2"
subdir2.mkdir()
(subdir2 / "file2.py").touch()
# Configure the git diff output
self._set_git_diff_output(
git_diff_output({
"subdir1/file1.py":
line_numbers(3, 10) + line_numbers(34, 47)
}),
git_diff_output({
"subdir2/file2.py": line_numbers(3, 10),
"file3.py": [0]
}),
git_diff_output(dict(), deleted_files=["README.md"]),
)
# Get the source paths in the diff
with mock.patch.object(os.path, "abspath",
lambda path: f"{tmp_dir}/{path}"):
source_paths = self.diff.src_paths_changed()
# Validate the source paths
# They should be in alphabetical order
self.assertEqual(source_paths, expected)
# change back to the previous working directory
os.chdir(old_cwd)
def test_git_source_paths(self):
# Configure the git diff output
self._set_git_diff_output(
git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)}),
git_diff_output({'subdir/file2.py': line_numbers(3, 10), 'file3.py': [0]}),
git_diff_output(dict(), deleted_files=['README.md'])
)
# Get the source paths in the diff
source_paths = self.diff.src_paths_changed()
# Validate the source paths
# They should be in alphabetical order
self.assertEqual(len(source_paths), 4)
self.assertEqual('file3.py', source_paths[0])
self.assertEqual('README.md', source_paths[1])
self.assertEqual('subdir/file1.py', source_paths[2])
self.assertEqual('subdir/file2.py', source_paths[3])
def test_git_exclude(self):
self.diff = GitDiffReporter(git_diff=self._git_diff, exclude=['file1.py'])
# Configure the git diff output
self._set_git_diff_output(
git_diff_output({'subdir1/file1.py': line_numbers(3, 10) + line_numbers(34, 47)}),
git_diff_output({'subdir2/file2.py': line_numbers(3, 10), 'file3.py': [0]}),
git_diff_output(dict(), deleted_files=['README.md'])
)
# Get the source paths in the diff
source_paths = self.diff.src_paths_changed()
# Validate the source paths
# They should be in alphabetical order
self.assertEqual(len(source_paths), 3)
self.assertEqual('file3.py', source_paths[0])
self.assertEqual('README.md', source_paths[1])
self.assertEqual('subdir2/file2.py', source_paths[2])
def test_git_source_paths_with_supported_extensions(self):
# Configure the git diff output
self._set_git_diff_output(
git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)}),
git_diff_output({'subdir/file2.py': line_numbers(3, 10), 'file3.py': [0]}),
git_diff_output({'README.md': line_numbers(3, 10)})
)
# Set supported extensions
self.diff._supported_extensions = ['py']
# Get the source paths in the diff
source_paths = self.diff.src_paths_changed()
# Validate the source paths, README.md should be left out
self.assertEqual(len(source_paths), 3)
self.assertEqual('file3.py', source_paths[0])
self.assertEqual('subdir/file1.py', source_paths[1])
self.assertEqual('subdir/file2.py', source_paths[2])
def test_inter_diff_conflict(self):
# Commit changes to lines 3 through 10
added_diff = git_diff_output({"file.py": line_numbers(3, 10)})
# Delete the lines we modified
deleted_lines = []
for line in added_diff.split("\n"):
# Any added line becomes a deleted line
if line.startswith("+"):
deleted_lines.append(line.replace("+", "-"))
# No need to include lines we already deleted
elif line.startswith("-"):
pass
# Keep any other line
else:
deleted_lines.append(line)
deleted_diff = "\n".join(deleted_lines)
# Try all combinations of diff conflicts
combinations = [
(added_diff, deleted_diff, ""),
(added_diff, "", deleted_diff),
("", added_diff, deleted_diff),
(added_diff, deleted_diff, deleted_diff),
]
for (master_diff, staged_diff, unstaged_diff) in combinations:
# Set up so we add lines, then delete them
self._set_git_diff_output(master_diff, staged_diff, unstaged_diff)
# Should have no lines changed, since
# we deleted all the lines we modified
fail_msg = dedent(
"""
master_diff = {0}
staged_diff = {1}
unstaged_diff = {2}
"""
).format(master_diff, staged_diff, unstaged_diff)
self.assertEqual(self.diff.lines_changed("file.py"), [], msg=fail_msg)
def test_inter_diff_conflict(self):
# Commit changes to lines 3 through 10
added_diff = git_diff_output({'file.py': line_numbers(3, 10)})
# Delete the lines we modified
deleted_lines = []
for line in added_diff.split('\n'):
# Any added line becomes a deleted line
if line.startswith('+'):
deleted_lines.append(line.replace('+', '-'))
# No need to include lines we already deleted
elif line.startswith('-'):
pass
# Keep any other line
else:
deleted_lines.append(line)
deleted_diff = "\n".join(deleted_lines)
# Try all combinations of diff conflicts
combinations = [(added_diff, deleted_diff, ''),
(added_diff, '', deleted_diff),
('', added_diff, deleted_diff),
(added_diff, deleted_diff, deleted_diff)]
for (master_diff, staged_diff, unstaged_diff) in combinations:
# Set up so we add lines, then delete them
self._set_git_diff_output(master_diff, staged_diff, unstaged_diff)
# Should have no lines changed, since
# we deleted all the lines we modified
fail_msg = dedent("""
master_diff = {0}
staged_diff = {1}
unstaged_diff = {2}
""").format(master_diff, staged_diff, unstaged_diff)
self.assertEqual(self.diff.lines_changed('file.py'), [],
msg=fail_msg)
def test_git_line_within_hunk(self):
master_diff = git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
# Surround hunk in master (lines 3 to 10)
surround = git_diff_output({'subdir/file1.py': line_numbers(2, 11)})
# Within hunk in master (lines 34 to 47)
within = git_diff_output({'subdir/file1.py': line_numbers(35, 46)})
# Lines in staged / unstaged overlap with hunks in master
self._set_git_diff_output(master_diff, surround, within)
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('subdir/file1.py')
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(2, 11) + line_numbers(34, 47))
def test_git_line_within_hunk(self):
master_diff = git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
# Surround hunk in master (lines 3 to 10)
surround = git_diff_output({'subdir/file1.py': line_numbers(2, 11)})
# Within hunk in master (lines 34 to 47)
within = git_diff_output({'subdir/file1.py': line_numbers(35, 46)})
# Lines in staged / unstaged overlap with hunks in master
self._set_git_diff_output(master_diff, surround, within)
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('subdir/file1.py')
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(2, 11) + line_numbers(34, 47))
def test_git_overlapping_lines(self):
master_diff = git_diff_output(
{'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)}
)
# Overlap, extending the end of the hunk (lines 3 to 10)
overlap_1 = git_diff_output({'subdir/file1.py': line_numbers(5, 14)})
# Overlap, extending the beginning of the hunk (lines 34 to 47)
overlap_2 = git_diff_output({'subdir/file1.py': line_numbers(32, 37)})
# Lines in staged / unstaged overlap with lines in master
self._set_git_diff_output(master_diff, overlap_1, overlap_2)
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('subdir/file1.py')
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(3, 14) + line_numbers(32, 47))
def test_git_overlapping_lines(self):
master_diff = git_diff_output(
{'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)}
)
# Overlap, extending the end of the hunk (lines 3 to 10)
overlap_1 = git_diff_output({'subdir/file1.py': line_numbers(5, 14)})
# Overlap, extending the beginning of the hunk (lines 34 to 47)
overlap_2 = git_diff_output({'subdir/file1.py': line_numbers(32, 37)})
# Lines in staged / unstaged overlap with lines in master
self._set_git_diff_output(master_diff, overlap_1, overlap_2)
# Get the lines changed in the diff
lines_changed = self.diff.lines_changed('subdir/file1.py')
# Validate the lines changed
self.assertEqual(lines_changed, line_numbers(3, 14) + line_numbers(32, 47))
def test_inclusion_list(self):
unstaged_input = git_diff_output({'subdir/file1.py': line_numbers(3, 10) + line_numbers(34, 47)})
self._set_git_diff_output('', '', unstaged_input)
self.assertEqual(3, len(self.diff._get_included_diff_results()))
self.assertEqual(['', '', unstaged_input], self.diff._get_included_diff_results())
