conflict 0.1.0

data/test/data/apache_myfaces.diff.txt

@@ -0,0 +1,22 @@
+Index: FacesServlet.java
+===================================================================
+--- FacesServlet.java	(revision 539518)
++++ FacesServlet.java	(working copy)
+@@ -122,7 +122,7 @@
+ 
+             log.warn(buffer.toString());
+ 
+-            // Why does RI return a 404 and not a 403, SC_FORBIDDEN ?
++            // Why does RI return a 404 and not a 403, SC_FORBIDDEN ? ask Ed
+             
+             ((HttpServletResponse) response)
+                     .sendError(HttpServletResponse.SC_NOT_FOUND);
+@@ -137,7 +137,7 @@
+                                                        _lifecycle);
+         try {
+ 			_lifecycle.execute(facesContext);
+-			_lifecycle.render(facesContext);
++			_lifecycle.render(facesContext); // this is here for portlets
+ 		}
+         catch (Throwable e)
+         {

data/test/data/rails.diff.txt

@@ -0,0 +1,13 @@
+Index: release.rb
+===================================================================
+--- release.rb	(revision 6859)
++++ release.rb	(working copy)
+@@ -2,7 +2,7 @@
+ 
+ VERSION  = ARGV.first
+ PACKAGES = %w( activesupport activerecord actionpack actionmailer actionwebservice )
+-
++# edit
+ # Checkout source
+ `rm -rf release && svn export http://dev.rubyonrails.org/svn/rails/trunk release`
+ 

data/test/data/rails.info.txt

@@ -0,0 +1,11 @@
+Path: .
+URL: http://svn.rubyonrails.org/rails/trunk
+Repository Root: http://svn.rubyonrails.org/rails
+Repository UUID: 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
+Revision: 6859
+Node Kind: directory
+Schedule: normal
+Last Changed Author: bitsweat
+Last Changed Rev: 6859
+Last Changed Date: 2007-05-26 01:26:50 -0500 (Sat, 26 May 2007)
+

data/test/data/stomp/stomp.1.diff.txt

@@ -0,0 +1,21 @@
+Index: lib/stomp.rb
+===================================================================
+--- lib/stomp.rb	(revision 83)
++++ lib/stomp.rb	(working copy)
+@@ -6,7 +6,6 @@
+ #   You may obtain a copy of the License at
+ #
+ #       http://www.apache.org/licenses/LICENSE-2.0
+-#
+ #   Unless required by applicable law or agreed to in writing, software
+ #   distributed under the License is distributed on an "AS IS" BASIS,
+ #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@@ -229,7 +228,7 @@
+       @transmit_semaphore.synchronize do
+         s.puts command
+         headers.each {|k,v| s.puts "#{k}:#{v}" }
+-        s.puts "content-length: #{body.length}"
++        s.puts "content-length: #{body.nil? ? 0 : body.length}"
+         s.puts "content-type: text/plain; charset=UTF-8"
+         s.puts
+         s.write body

data/test/data/stomp/stomp.1.info.txt

@@ -0,0 +1,11 @@
+Path: .
+URL: http://svn.codehaus.org/stomp/ruby/trunk
+Repository Root: http://svn.codehaus.org/stomp
+Repository UUID: fd4e7336-3dff-0310-b68a-b6615a75f13b
+Revision: 83
+Node Kind: directory
+Schedule: normal
+Last Changed Author: kookster
+Last Changed Rev: 81
+Last Changed Date: 2007-05-09 14:49:19 -0500 (Wed, 09 May 2007)
+

data/test/data/stomp/stomp.2.diff.txt

@@ -0,0 +1,21 @@
+Index: stomp.rb
+===================================================================
+--- stomp.rb	(revision 83)
++++ stomp.rb	(working copy)
+@@ -6,7 +6,6 @@
+ #   You may obtain a copy of the License at
+ #
+ #       http://www.apache.org/licenses/LICENSE-2.0
+-#
+ #   Unless required by applicable law or agreed to in writing, software
+ #   distributed under the License is distributed on an "AS IS" BASIS,
+ #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@@ -229,7 +228,7 @@
+       @transmit_semaphore.synchronize do
+         s.puts command
+         headers.each {|k,v| s.puts "#{k}:#{v}" }
+-        s.puts "content-length: #{body.length}"
++        s.puts "content-length: #{body.nil? ? 0 : body.length}"
+         s.puts "content-type: text/plain; charset=UTF-8"
+         s.puts
+         s.write body

data/test/data/stomp/stomp.2.info.txt

@@ -0,0 +1,11 @@
+Path: .
+URL: http://svn.codehaus.org/stomp/ruby/trunk/lib
+Repository Root: http://svn.codehaus.org/stomp
+Repository UUID: fd4e7336-3dff-0310-b68a-b6615a75f13b
+Revision: 83
+Node Kind: directory
+Schedule: normal
+Last Changed Author: brianm
+Last Changed Rev: 48
+Last Changed Date: 2007-02-01 17:09:57 -0600 (Thu, 01 Feb 2007)
+

data/test/data/three/added.diff.txt

@@ -0,0 +1,11 @@
+Index: test_data.txt
+===================================================================
+--- test_data.txt	(revision 0)
++++ test_data.txt	(revision 0)
+@@ -0,0 +1,5 @@
++1 
++2
++3
++4
++5
+

data/test/data/three/changed.diff.txt

@@ -0,0 +1,12 @@
+Index: test_data.txt
+===================================================================
+--- test_data.txt	(revision 44)
++++ test_data.txt	(working copy)
+@@ -1,5 +1,5 @@
+ 1 
+-2
++2 - changed
+ 3
+ 4
+ 5
+

data/test/data/three/conflict.info.txt

@@ -0,0 +1,11 @@
+Path: .
+URL: https://conflict.svn.sourceforge.net/svnroot/conflict/src/ruby
+Repository Root: https://conflict.svn.sourceforge.net/svnroot/conflict
+Repository UUID: 458fecf6-5234-0410-8a5b-9d2fc9e9e673
+Revision: 38
+Node Kind: directory
+Schedule: normal
+Last Changed Author: dennisbyrne
+Last Changed Rev: 38
+Last Changed Date: 2007-07-05 20:29:17 -0500 (Thu, 05 Jul 2007)
+

data/test/data/three/deleted.diff.txt

@@ -0,0 +1,11 @@
+Index: test_data.txt
+===================================================================
+--- test_data.txt	(revision 38)
++++ test_data.txt	(working copy)
+@@ -1,5 +0,0 @@
+-1 
+-2
+-3
+-4
+-5
+

data/test/database_test.rb

@@ -0,0 +1,130 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test/unit'
+require 'conflict'
+include Conflict
+require File.dirname(__FILE__) + '/common.rb'
+
+class DataBaseTest < Test::Unit::TestCase
+  include ConflictConstants
+  
+  def setup
+    @db = DataBase::new
+    @db.clear
+    @db.insert @history_one = Event.new(CLIENT_ONE, "added", CONTROLLER)
+    @db.insert @history_two = Event.new(CLIENT_TWO, "changed", VIEW)    
+  end
+  
+  def test_dev_with_no_history_and_no_events_should_not_change_db
+    
+    body = @db.find_conflicts(CLIENT_THREE, [])
+    
+    assert_equal [], body
+    assert_equal 2, @db.size
+    assert @db.presence_of(@history_one)
+    assert @db.presence_of(@history_two)
+    
+  end
+  
+  def test_devs_with_history_and_no_events_should_be_removed_from_db
+    
+    body = @db.find_conflicts(CLIENT_TWO, [])
+    
+    assert_equal [], body
+    assert_equal 1, @db.size
+    assert @db.presence_of(@history_one)
+    
+    body = @db.find_conflicts(CLIENT_ONE, [])
+    assert_equal [], body
+    assert_equal 0, @db.size
+  end  
+
+  def test_dev_with_history_conflicts_with_dev_with_history_should_make_collision
+    
+    event = Event.new(CLIENT_TWO, "added", CONTROLLER)
+    body = @db.find_conflicts(CLIENT_TWO, [event])
+    
+    assert [Conflict::Conflict::new(event, @history_one)].eql?(body)
+    assert_equal 2, @db.size
+    assert @db.presence_of(@history_one)
+    assert @db.presence_of(event)
+  end
+
+  def test_dev_with_history_and_one_event_but_no_conflict_should_produce_no_conflict
+  
+    event = Event.new(CLIENT_TWO, "added", MODEL)
+    body = @db.find_conflicts(CLIENT_TWO, [event])  
+    
+    assert_equal [], body
+    assert_equal 2, @db.size
+    assert @db.presence_of(@history_one) # keep first
+    assert @db.presence_of(event)        # lose second, add new
+    
+  end
+
+  def test_dev_with_no_history_has_no_conflict_should_add_one_event_to_db
+  
+    event = Event.new(CLIENT_THREE, "added", MODEL)
+    body = @db.find_conflicts(CLIENT_THREE, [event])
+    
+    assert_equal [], body
+    assert_equal 3, @db.size
+    [@history_one, @history_two, event].each do | e | assert @db.presence_of(e) end
+    
+  end
+  
+  def test_dev_with_no_history_has_no_conflict_then_does_have_conflict
+  
+    event = Event.new(CLIENT_THREE, "added", MODEL)
+    body = @db.find_conflicts(CLIENT_THREE, [event])
+
+    assert_equal [], body
+    assert_equal 3, @db.size
+    [@history_one, @history_two, event].each do | e | assert @db.presence_of(e) end
+    
+    # in a second request
+    second_event = Event.new(CLIENT_THREE, "changed", VIEW)
+    body = @db.find_conflicts(CLIENT_THREE, [second_event])
+    
+    assert [Conflict::Conflict::new(second_event, @history_two)].eql?(body)
+    assert_equal 3, @db.size
+    [@history_one, @history_two, second_event].each do | e | assert @db.presence_of(e) end
+  end
+
+  def test_conflict_should_only_be_reported_for_the_client_sending_request
+  
+    first = Event.new(CLIENT_ONE, "changed", VIEW)
+    second = Event.new(CLIENT_ONE, "added", CONTROLLER)
+    body = @db.find_conflicts(CLIENT_ONE, [first, second])
+    
+    assert [Conflict::Conflict::new(first, @history_two)].eql?(body)
+    assert_equal 3, @db.size
+    [first, @history_two, second].each do |e| assert @db.presence_of(e) end
+    
+    # in a second request
+    third = Event.new(CLIENT_THREE, "changed", VIEW)
+    conflicts = @db.find_conflicts(CLIENT_THREE, [third])
+
+    assert_equal 2, conflicts.size
+    assert conflicts[1].eql?(Conflict::Conflict::new(third, first))
+    assert conflicts[0].eql?(Conflict::Conflict::new(third, @history_two))
+    assert_equal 4, @db.size
+    [first, @history_two, second, third].each do |e| assert @db.presence_of(e) end
+  end
+
+end

data/test/equality_test.rb

@@ -0,0 +1,60 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test/unit'
+require 'conflict'
+include Conflict
+require File.dirname(__FILE__) + '/common.rb'
+
+class ConflictTest < Test::Unit::TestCase
+  include ConflictConstants
+
+  def test_conflict_eql
+  
+    local = Event::new(CLIENT_ONE, "changed", CONTROLLER)
+    remote = Event::new(CLIENT_TWO, "changed", CONTROLLER)
+  
+    conflict = Conflict::Conflict::new(local, remote)
+    
+    assert conflict.eql?(Conflict::Conflict::new(local, remote))
+    assert ! conflict.eql?(Conflict::Conflict::new(local, Event::new(CLIENT_TWO, "deleted", CONTROLLER)))
+    assert ! conflict.eql?(Conflict::Conflict::new(local, Event::new("not" + CLIENT_TWO, "changed", CONTROLLER)))
+    assert ! conflict.eql?(Conflict::Conflict::new(Event::new(CLIENT_ONE, "deleted", CONTROLLER), remote))
+    assert ! conflict.eql?(Conflict::Conflict::new(Event::new("not" + CLIENT_ONE, "changed", CONTROLLER), remote))    
+  end
+
+  def test_event_eql
+    
+    first = Event::new(CLIENT_ONE, "changed", CONTROLLER)
+    second = Event::new(CLIENT_ONE, "changed", CONTROLLER)
+    third = Event::new(CLIENT_TWO, "changed", CONTROLLER)
+    forth = Event::new(CLIENT_ONE, "changed", VIEW)
+    fifth = Event::new(CLIENT_ONE, "added", CONTROLLER)
+            
+    assert first.eql?(second)
+    assert second.eql?(first)
+    
+    assert ! first.eql?(third)
+    assert ! second.eql?(third)
+    
+    assert ! first.eql?(forth)
+    assert ! second.eql?(forth)    
+    
+    assert ! first.eql?(fifth)
+    assert ! second.eql?(fifth)    
+  end
+end

data/test/event_test.rb

@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test/unit'
+require 'conflict'
+include Conflict
+
+class EventTest < Test::Unit::TestCase
+
+  def test_expires_quick
+  
+    created = Time.now
+    event = Event::new("dev", "changed", "resource", created, 0)
+    assert_equal created, event.expires
+  
+  end
+  
+  def test_expires
+    
+    created = Time.now
+    event = Event::new("dev", "changed", "resource", created, 1)
+    assert_equal created + 1, event.expires
+    
+  end
+
+end

data/test/negative_test.rb

@@ -0,0 +1,107 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test/unit'
+require 'conflict'
+include Conflict
+
+class NegativeTest < Test::Unit::TestCase
+  include ConflictConstants
+  
+  def test_collision
+    
+    local = Event::new(CLIENT_ONE, "changed", VIEW)
+    remote = Event::new(CLIENT_TWO, "changed", MODEL)
+    
+    assert_raise { Conflict::Conflict::new nil, nil }
+    assert_raise { Conflict::Conflict::new local, nil }
+    assert_raise { Conflict::Conflict::new nil, local }
+    assert_raise { Conflict::Conflict::new remote, local } # they have different resources
+    assert_raise { Conflict::Conflict::new local, local }
+    assert_raise { Conflict::Conflict::new local, Event::new(CLIENT_ONE, "changed", VIEW) }
+  end
+
+  def test_client
+  
+    assert_raise { Client::new().resend }
+    assert_raise { Client::new().diff "", nil }
+    assert_raise { Client::new().diff "", "" }
+  end
+
+  def test_diff_parser
+    
+    parser = DiffParser::new({:url=>"http://foo.com", :path=>".", :ttl=>Conflict::TTL})
+    
+    assert_raise { parser.parse "OK", nil }
+    assert_raise { parser.parse "OK", "" }
+    assert_raise { parser.parse nil, "OK" }
+    assert_raise { parser.parse "", "OK" }
+    assert_raise { DiffParser::new(nil) }
+    assert_raise { DiffParser::new({}) }
+    assert_raise { DiffParser::new({:url=>nil}) }
+    assert_raise { DiffParser::new({:url=>""}) }
+  end
+
+  def test_info_parser
+    
+    parser = InfoParser::new
+    
+    assert_raise { parser.parse nil }
+    assert_raise { parser.parse "" }    
+  end
+
+  def test_database
+    
+    db = DataBase::new
+    
+    assert_raise { db.find_conflicts "", [] }
+    assert_raise { db.find_conflicts nil, [] }
+    assert_raise { db.find_conflicts "DEV", [Event::new("NOT_DEV", "added", "foo")] }
+    assert_raise { db.find_conflicts "DEV", nil }
+    assert_raise { db.find_conflicts "DEV", [Event::new("DEV", "added", "foo"), Event::new("DEV", "changed", "foo")] }
+    
+  end
+
+  def test_event
+    
+    assert_raise { Event.new("", "", "OK") }
+    assert_raise { Event.new("", "added", "") }
+    assert_raise { Event.new("", "added", VIEW) }
+    assert_raise { Event.new(CLIENT_ONE, "", "") }
+    assert_raise { Event.new(CLIENT_ONE, "", VIEW) }
+    assert_raise { Event.new(CLIENT_ONE, "added", "") }
+    
+    assert_raise { Event.new(nil, nil, "OK") }
+    assert_raise { Event.new(nil, "added", nil) }
+    assert_raise { Event.new(nil, "added", VIEW) }
+    assert_raise { Event.new(CLIENT_ONE, nil, nil) }
+    assert_raise { Event.new(CLIENT_ONE, nil, VIEW) }
+    assert_raise { Event.new(CLIENT_ONE, "added", nil) }
+    
+  end
+
+  def assert_raise # replace this w/ built in assert_raise
+  
+    begin
+      yield
+      assert false
+    rescue ConflictException
+    end
+  
+  end
+
+end