parse(); $def = $diff->files['src/IDF/templates/idf/issues/view.html']; $orig_lines = preg_split("/\015\012|\015|\012/", $orig); $merged = $diff->mergeChunks($orig_lines, $def, 10); $lchunk = end($merged); $lline = end($lchunk); $this->assertEqual(array('', '166', '{/if}{/block}'), $lline); } public function testDiffWithHeaders() { $diff_content = file_get_contents(dirname(__FILE__).'/0001-Some-configuration-variables-have-been-added-in-orde.patch'); $diff = new IDF_Diff($diff_content); $diff->parse(); $this->assertEqual(2, count($diff->files)); $this->assertEqual(12, count($diff->files['src/IDF/conf/idf.php-dist']['chunks'][0])); } public function testDiffRemoveOneLine() { $diff_content = file_get_contents(dirname(__FILE__).'/test-diff-remove-oneline.diff'); $diff = new IDF_Diff($diff_content); $diff->parse(); $this->assertEqual(2, count($diff->files)); $this->assertEqual(array(280, 288, ''), $diff->files['src/IDF/Scm/Git.php']['chunks'][1][2]); $this->assertEqual(7, count($diff->files['src/IDF/Scm/Git.php']['chunks'][1])); } }