motiro 0.6.6 → 0.6.7

data/test/unit/diff_chunk_builder_test.rb

@@ -0,0 +1,269 @@
+#  Motiro - A project tracking tool
+#  Copyright (C) 2006-2007  Thiago Arrais
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'diff_chunk_builder'
+
+class DiffChunkBuilderTest < Test::Unit::TestCase
+
+  def setup
+    @builder = DiffChunkBuilder.new
+  end
+
+  def test_addition_only
+    @builder.push_addition 'I have added this'
+
+    chunks = @builder.get_chunks
+
+    assert_equal 1, chunks.size
+    assert !chunks.first.unchanged?
+    assert_equal :addition, chunks.first.action
+    assert_equal 1, chunks.first.lines.size
+    line = chunks.first.lines.first
+    assert_nil line.original_position
+    assert_nil line.original_text
+    assert_equal 1, line.modified_position
+    assert_equal 'I have added this', line.modified_text
+  end
+
+  def test_deletion_only
+    @builder.push_deletion 'I have removed this'
+
+    chunks = @builder.get_chunks
+
+    assert_equal 1, chunks.size
+    assert !chunks.first.unchanged?
+    assert_equal :deletion, chunks.first.action
+    assert_equal 1, chunks.first.lines.size
+    line = chunks.first.lines.first
+    assert_equal 1, line.original_position
+    assert_equal 'I have removed this', line.original_text
+    assert_nil line.modified_position
+    assert_nil line.modified_text
+  end
+
+  def test_matches_alterning_addition_and_deletion
+    @builder.push_deletion 'I have removed this'
+    @builder.push_addition 'I have added this'
+
+    chunks = @builder.get_chunks
+
+    assert_equal 1, chunks.size
+    assert !chunks.first.unchanged?
+    assert_equal :modification, chunks.first.action
+    assert_equal 1, chunks.first.lines.size
+    line = chunks.first.lines.first
+    assert_equal 1, line.original_position
+    assert_equal 1, line.original_position
+    assert_equal 'I have removed this', line.original_text
+    assert_equal 1, line.modified_position
+    assert_equal 'I have added this', line.modified_text
+  end
+
+  def test_multiline_modification
+    @builder.push_deletion 'This is the first old line'
+    @builder.push_deletion 'This is the second old line'
+    @builder.push_addition 'This is the first new line'
+    @builder.push_addition 'This is the second new line'
+
+    chunks = @builder.get_chunks
+
+    assert_equal 1, chunks.size
+    assert_equal :modification, chunks.first.action
+    lines = chunks.first.lines
+    assert_equal 2, lines.size
+    assert_equal 1, lines.first.original_position
+    assert_equal 'This is the first old line', lines.first.original_text
+    assert_equal 2, lines.last.original_position
+    assert_equal 'This is the second old line', lines.last.original_text
+    assert_equal 1, lines.first.modified_position
+    assert_equal 'This is the first new line', lines.first.modified_text
+    assert_equal 2, lines.last.modified_position
+    assert_equal 'This is the second new line', lines.last.modified_text
+  end
+
+  def test_more_adds_than_deletes
+    @builder.push_deletion  'This is the first old line'
+    @builder.push_addition  'This is the first new line'
+    @builder.push_addition  'This is the second new line'
+    @builder.push_unchanged 'This line remains the same'
+
+    chunks = @builder.get_chunks
+
+    assert_equal 2, chunks.size
+    assert_equal :modification, chunks.first.action
+    assert_equal :unchanged, chunks.last.action
+    assert chunks.last.unchanged?
+    lines = chunks.first.lines
+    assert_equal 2, lines.size
+    assert_equal 1, lines.first.original_position
+    assert_equal 'This is the first old line', lines.first.original_text
+    assert_nil lines.last.original_position
+    assert_nil lines.last.original_text
+    assert_equal 1, lines.first.modified_position
+    assert_equal 'This is the first new line', lines.first.modified_text
+    assert_equal 2, lines.last.modified_position
+    assert_equal 'This is the second new line', lines.last.modified_text
+    assert_equal 2, chunks.last.lines.first.original_position
+    assert_equal 'This line remains the same', chunks.last.lines.first.original_text
+    assert_equal 3, chunks.last.lines.first.modified_position
+    assert_equal 'This line remains the same', chunks.last.lines.first.modified_text
+  end
+
+  def test_less_adds_than_deletes
+    @builder.push_deletion 'This is the first old line'
+    @builder.push_deletion 'This is the second old line'
+    @builder.push_addition 'This is the first new line'
+    @builder.push_unchanged 'This line remains the same'
+
+    chunks = @builder.get_chunks
+
+    assert_equal 2, chunks.size
+    assert_equal :modification, chunks.first.action
+    assert_equal :unchanged, chunks.last.action
+    assert chunks.last.unchanged?
+    lines = chunks.first.lines
+    assert_equal 2, lines.size
+    assert_equal 1, lines.first.original_position
+    assert_equal 'This is the first old line', lines.first.original_text
+    assert_equal 2, lines.last.original_position
+    assert_equal 'This is the second old line', lines.last.original_text
+    assert_equal 1, lines.first.modified_position
+    assert_equal 'This is the first new line', lines.first.modified_text
+    assert_nil lines.last.modified_position
+    assert_nil lines.last.modified_text
+    assert_equal 3, chunks.last.lines.first.original_position
+    assert_equal 'This line remains the same', chunks.last.lines.first.original_text
+    assert_equal 2, chunks.last.lines.first.modified_position
+    assert_equal 'This line remains the same', chunks.last.lines.first.modified_text
+  end
+
+  def test_some_code_kept_some_modified
+    @builder.start_line 6
+
+    @builder.push_unchanged 'div.channel-title {'
+    @builder.push_deletion  '    font: normal 8pt Verdana,sans-serif;'
+    @builder.push_addition  '    font: bold 10pt Verdana,sans-serif;'
+    @builder.push_unchanged '    margin:0 0 0 0;'
+
+    chunks = @builder.get_chunks
+    
+    assert_equal 3, chunks.size
+    assert chunks[0].unchanged?
+    assert_equal :modification, chunks[1].action
+    assert chunks[2].unchanged?
+    chunks.each { |c| assert_equal 1, c.lines.size }
+    assert_equal 6, chunks[0].lines.first.original_position
+    assert_equal 'div.channel-title {', chunks[0].lines.first.original_text
+    assert_equal 7, chunks[1].lines.first.original_position
+    assert_equal '    font: normal 8pt Verdana,sans-serif;', chunks[1].lines.first.original_text
+    assert_equal 8, chunks[2].lines.first.original_position
+    assert_equal '    margin:0 0 0 0;', chunks[2].lines.first.original_text
+    assert_equal 6, chunks[0].lines.first.modified_position
+    assert_equal 'div.channel-title {', chunks[0].lines.first.modified_text
+    assert_equal 7, chunks[1].lines.first.modified_position
+    assert_equal '    font: bold 10pt Verdana,sans-serif;', chunks[1].lines.first.modified_text
+    assert_equal 8, chunks[2].lines.first.modified_position
+    assert_equal '    margin:0 0 0 0;', chunks[2].lines.first.modified_text
+  end
+
+  def test_esparse_changes
+    @builder.start_line 6
+
+    @builder.push_unchanged 'div.channel-title {'
+    @builder.push_deletion  '    margin:0;'
+    @builder.push_deletion  '    font: normal 8pt Verdana,sans-serif;'
+    @builder.push_addition  '    font: bold 10pt Verdana,sans-serif;'
+
+    @builder.start_line 13
+
+    @builder.push_addition  '    padding: 0 8px 0 8px;'
+    @builder.push_unchanged '}'
+
+    chunks = @builder.get_chunks
+
+    assert_equal 5, chunks.size
+    assert chunks[0].unchanged?
+    assert_equal :modification, chunks[1].action
+    assert chunks[2].separator?
+    assert_equal :addition, chunks[3].action
+    assert chunks[4].unchanged?
+    assert_equal 1, chunks[0].lines.size
+    assert_equal 2, chunks[1].lines.size
+    assert_equal 4, chunks[2].num_lines
+    assert_equal 1, chunks[3].lines.size
+    assert_equal 6, chunks[0].lines.first.original_position
+    assert_equal 7, chunks[1].lines.first.original_position
+    assert_equal 8, chunks[1].lines.last.original_position
+    assert_nil chunks[3].lines.first.original_position
+    assert_equal 13, chunks[4].lines.first.original_position
+    assert_equal 'div.channel-title {', chunks[0].lines.first.original_text
+    assert_equal '    margin:0;', chunks[1].lines.first.original_text
+    assert_equal '    font: normal 8pt Verdana,sans-serif;', chunks[1].lines.last.original_text
+    assert_nil chunks[3].lines.first.original_text
+    assert_equal '}', chunks[4].lines.first.original_text
+
+    assert_equal 6, chunks[0].lines.first.modified_position
+    assert_equal 7, chunks[1].lines.first.modified_position
+    assert_nil chunks[1].lines.last.modified_position
+    assert_equal 13, chunks[3].lines.first.modified_position
+    assert_equal 14, chunks[4].lines.first.modified_position
+    assert_equal 'div.channel-title {', chunks[0].lines.first.modified_text
+    assert_equal '    font: bold 10pt Verdana,sans-serif;', chunks[1].lines.first.modified_text
+    assert_nil chunks[1].lines.last.modified_text
+    assert_equal '    padding: 0 8px 0 8px;', chunks[3].lines.first.modified_text
+    assert_equal '}', chunks[4].lines.first.modified_text
+  end
+
+  def test_unmatching_line_numbers
+    @builder.start_line(6, 6)
+
+    @builder.push_unchanged 'div.channel-title {'
+    @builder.push_deletion  '    font: normal 8pt Verdana,sans-serif;'
+    @builder.push_addition  '    font: bold 10pt Verdana,sans-serif;'
+    @builder.push_addition  '    margin:0 0 0 0;'
+
+    @builder.start_line(13, 14)
+
+    @builder.push_unchanged 'div.channel-body-outer {'
+    @builder.push_deletion  '    padding: 0 9px 0 9px;'
+    @builder.push_addition  '    padding: 0 8px 0 8px;'
+    @builder.push_unchanged '}'
+
+    chunks = @builder.get_chunks
+
+    assert_equal 6, chunks.size
+    assert_equal 6, chunks[0].lines.first.original_position
+    assert_equal 7, chunks[1].lines.first.original_position
+    assert_nil chunks[1].lines.last.original_position
+    assert_equal 13, chunks[3].lines.first.original_position
+    assert_equal 14, chunks[4].lines.first.original_position
+    assert_equal 15, chunks[5].lines.first.original_position
+
+    assert_equal 6, chunks[0].lines.first.modified_position
+    assert_equal 7, chunks[1].lines.first.modified_position
+    assert_equal 8, chunks[1].lines.last.modified_position
+    assert_equal 14, chunks[3].lines.first.modified_position
+    assert_equal 15, chunks[4].lines.first.modified_position
+    assert_equal 16, chunks[5].lines.first.modified_position
+  end
+  
+#TODO unch unch del
+#TODO unch add add unch
+#TODO escape html and blank line in view/helper code
+
+end

data/test/unit/page_test.rb

@@ -277,6 +277,52 @@ class PageTest < Test::Unit::TestCase
     assert_equal 2, page.revisions[1].position
   end
   
+  def test_converts_to_headline
+    page = revise_brand_new_page(:title => 'My page',
+                                 :kind => 'common',
+                                 :text => "This is my page and it is written \n" +
+                                          "in English, German and \n" +
+                                          "Portuguese\n\n" +
+                                          "--- de ------\n\n" +
+                                          "Dieses ist meine Seite und es ist \n" +
+                                          "auf Englisch, Deutsch und Portugiese \n " +
+                                          "geschrieben\n\n" +
+                                          "--- pt-br ------\n\n" +
+                                          "Esta é minha página e está escrita \n" +
+                                          "em inglês, alemão e português")
+    headline = page.to_headline
+    assert_equal page.last_editor.login, headline.author
+    assert_equal page.modified_at, headline.happened_at
+    assert_equal "My page\n\n" + 
+                 "This is my page and it is written \n" +
+                 "in English, German and \n" +
+                 "Portuguese\n\n" +
+                 "--- de ---\n\n" +
+                 "My page\n\n" +
+                 "Dieses ist meine Seite und es ist \n" +
+                 "auf Englisch, Deutsch und Portugiese \n " +
+                 "geschrieben\n\n" +
+                 "--- pt-br ---\n\n" +
+                 "My page\n\n" +
+                 "Esta é minha página e está escrita \n" +
+                 "em inglês, alemão e português", headline[:description]
+  end
+  
+  def test_event_page_uses_planned_date_as_headline_date
+    event_date = Date.new(2007, 7, 1)
+    event = revise_brand_new_page(:title => 'My event',
+                                  :kind => 'event',
+                                  :happens_at => event_date, 
+                                  :text => "Let's get together and feel alright")
+    assert_equal event_date.to_t, event.to_headline.happened_at
+  end
+  
+  def test_pages_without_editor_or_modification_time_are_reported_as_modified_by_someone_at_some_time
+    headline = Page.new(:name => 'VeryOldPage', :kind => 'common').to_headline
+    assert_equal DEFAULT_AUTHOR, headline.author
+    assert_equal DEFAULT_TIME, headline.happened_at
+  end
+  
 private
   
   def create_page_with_one_revision

data/test/unit/revision_test.rb

@@ -34,5 +34,165 @@ class RevisionTest < Test::Unit::TestCase
     
     assert_equal rev.page.revisions, rev.revisions
   end
+  
+  def test_diffs_one_line_modification
+    fst_rev = pages('changed_page').revisions[0]
+    snd_rev = pages('changed_page').revisions[1]
+    
+    change_chunks = fst_rev.diff(2)
+    assert_equal 1, change_chunks.size
+    chunk = change_chunks.first
+    assert !chunk.unchanged?
+    assert_equal :modification, chunk.action
+    assert_equal 1, chunk.lines.size
+    line = chunk.lines.first
+    assert_equal 1, line.original_position
+    assert_equal fst_rev.text, line.original_text
+    assert_equal 1, line.modified_position
+    assert_equal snd_rev.text, line.modified_text 
+  end
+  
+  def test_diffs_all_two_lines_modified
+    page = revise_brand_new_page(:title => 'A good page',
+                                 :text => "This is the first line\n" +
+                                          "And this is the second one")
+    page.revise(bob, now, :title => 'A good page',
+                          :text => "This is the modified first line\n" +
+                                   "And this is the modified second line")
+                                   
+    chunks = page.revisions[0].diff(2)
+    assert_equal 1, chunks.size
+    chunk = chunks.first
+    assert_equal :modification, chunk.action
+    assert_equal 2, chunk.lines.size
+    assert_equal 'This is the first line', chunk.lines.first.original_text
+    assert_equal 'This is the modified first line', chunk.lines.first.modified_text
+    assert_equal 2, chunk.lines.last.original_position
+    assert_equal 'And this is the second one', chunk.lines.last.original_text
+    assert_equal 2, chunk.lines.last.modified_position
+    assert_equal 'And this is the modified second line', chunk.lines.last.modified_text
+  end
+  
+  def test_diffs_with_one_line_unchanged_in_the_middle
+    page = revise_brand_new_page(:title => 'A good page',
+                                 :text => "This is the first line\n" +
+                                          "This line will not be changed\n" +
+                                          "And this is the third one")
+    page.revise(bob, now, :title => 'A good page',
+                          :text => "This is the modified first line\n" +
+                                   "This line will not be changed\n" +
+                                   "And this is another modification")
+                                   
+    chunks = page.revisions[0].diff(2)
+    assert_equal 3, chunks.size
+    assert !chunks[0].unchanged?
+    assert_equal :modification, chunks[0].action
+    assert  chunks[1].unchanged?
+    assert_equal :unchanged, chunks[1].action
+    assert !chunks[2].unchanged?
+    assert_equal :modification, chunks[2].action
+    assert_equal 1, chunks[0].lines.size
+    assert_equal 1, chunks[1].lines.size
+    assert_equal 1, chunks[2].lines.size
+    assert_equal 'This is the first line', chunks[0].lines.first.original_text
+    assert_equal 'This is the modified first line', chunks[0].lines.first.modified_text
+    assert_equal 'This line will not be changed', chunks[1].lines.first.original_text
+    assert_equal 'And this is the third one', chunks[2].lines.first.original_text
+    assert_equal 'And this is another modification', chunks[2].lines.first.modified_text
+  end
+  
+  def test_diffs_right_unbalanced_modification
+    page = revise_brand_new_page(:title => 'A good page',
+                                 :text => "This is the first line\n" +
+                                          "This line will not be changed\n" +
+                                          "And this is the last one")
+    page.revise(bob, now, :title => 'A good page',
+                          :text => "This is the modified first line,\n" +
+                                   "But I also inserted a new one\n" +
+                                   "This line will not be changed\n" +
+                                   "And this is the last one")
+    chunks = page.revisions[0].diff(2)
+    assert_equal 2, chunks.size
+    assert !chunks.first.unchanged?
+    assert  chunks.last.unchanged?
+    assert_equal 2, chunks.first.lines.size
+    assert_equal 'This is the first line', chunks.first.lines.first.original_text
+    assert_equal 'This is the modified first line,', chunks.first.lines.first.modified_text
+    assert_nil chunks.first.lines.last.original_position
+    assert_nil chunks.first.lines.last.original_text
+    assert_equal 2, chunks.first.lines.last.modified_position
+    assert_equal 'But I also inserted a new one', chunks.first.lines.last.modified_text
+    assert_equal 2, chunks.last.lines.first.original_position
+    assert_equal 3, chunks.last.lines.first.modified_position
+    assert_equal 'This line will not be changed', chunks.last.lines.first.original_text
+  end
+
+  def test_diffs_left_unbalanced_modification
+    page = revise_brand_new_page(:title => 'A good page',
+                                 :text => "This is the first line\n" +
+                                          "This line will be removed\n" +
+                                          "And this one won't be changed")
+    page.revise(bob, now, :title => 'A good page',
+                          :text => "This is the modified first line\n" +
+                                   "And this one won't be changed")
+    chunks = page.revisions[0].diff(2)
+    assert_equal 2, chunks.size
+    assert_equal 2, chunks.first.lines.size
+    assert_equal 'This is the first line', chunks.first.lines.first.original_text
+    assert_equal 'This is the modified first line', chunks.first.lines.first.modified_text
+    assert_equal 'This line will be removed', chunks.first.lines.last.original_text
+    assert_nil chunks.first.lines.last.modified_text
+    assert_equal 'And this one won\'t be changed', chunks.last.lines.first.original_text
+  end
+  
+  def test_diffs_addition_only_chunk
+    page = revise_brand_new_page(:title => 'A good page',
+                                 :text => "This is the first line\n" +
+                                          "And this is the second one")
+    page.revise(bob, now, :title => 'A good page',
+                          :text => "This is the first line\n" +
+                                   "And this is the second one\n" +
+                                   "But it is not the last\n" +
+                                   "Because someone added other two")
+
+    chunks = page.revisions[0].diff(2)
+    assert_equal 2, chunks.size
+    assert  chunks.first.unchanged?
+    assert !chunks.last.unchanged?
+    assert_equal :addition, chunks.last.action
+    assert_equal 2, chunks.first.lines.size
+    assert_equal 2, chunks.first.lines.last.original_position
+    assert_equal 2, chunks.first.lines.last.modified_position
+    assert_equal 2, chunks.last.lines.size
+    assert_nil chunks.last.lines.first.original_position
+    assert_nil chunks.last.lines.first.original_text
+    assert_equal 3, chunks.last.lines.first.modified_position
+    assert_equal 'But it is not the last', chunks.last.lines.first.modified_text
+  end
+
+  def test_diffs_removal_only_chunk
+    page = revise_brand_new_page(:title => 'A good page',
+                                 :text => "This is the first line\n" +
+                                          "This is the second line\n" +
+                                          "And this is the last one")
+    page.revise(bob, now, :title => 'A good page',
+                          :text => "This is the first line\n" +
+                                   "And this is the last one")
+
+    chunks = page.revisions[0].diff(2)
+    assert_equal 3, chunks.size
+    assert  chunks[0].unchanged?
+    assert !chunks[1].unchanged?
+    assert  chunks[2].unchanged?
+    chunk = chunks[1]
+    assert_equal :removal, chunk.action
+    assert_equal 1, chunk.lines.size
+    assert_equal 2, chunk.lines.first.original_position
+    assert_equal 'This is the second line', chunk.lines.first.original_text
+    assert_nil chunk.lines.first.modified_position
+    assert_nil chunk.lines.first.modified_text
+    assert_equal 3, chunks[2].lines.first.original_position
+    assert_equal 2, chunks[2].lines.first.modified_position
+  end
 
 end

data/test/unit/wiki_reporter_test.rb

@@ -83,6 +83,7 @@ class WikiReporterTest < Test::Unit::TestCase
       page_provider.should_receive(:find).
         zero_or_more_times.
         and_return([Page.new(:name => 'EventPage').revise(bob, now,
+                             :kind => 'event',
                              :happens_at => planned_date,
                              :title => 'Event page')])
       hl = EventsReporter.new(:page_provider => page_provider).headlines[0]
@@ -90,7 +91,7 @@ class WikiReporterTest < Test::Unit::TestCase
     end
   end
   
-  def test_provides_includes_page_text_in_headline_description
+  def test_includes_page_text_in_headline_description
     FlexMock.use do |page_provider|
       page_provider.should_receive(:find).
         zero_or_more_times.