conflict 0.1.0

data/test/parser_test.rb

@@ -0,0 +1,98 @@
+# 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 ParserTest < Test::Unit::TestCase
+  include ConflictConstants
+  COMMON_PROPERTIES = {:path=>".", :ttl=>Conflict::TTL}
+  
+  def test_info_parser
+  
+    parser = InfoParser::new
+    info = File.new(STOMP_1_INFO_PATH).to_s
+    properties = parser.parse info
+    assert_equal STOMP_1_URL, properties[:url]
+    
+    info = File.new(STOMP_2_INFO_PATH).to_s
+    properties = parser.parse info
+    assert_equal STOMP_2_URL, properties[:url]
+  end
+
+  def test_diff_parser_with_info
+    
+    diff = File::new(STOMP_1_DIFF_PATH).to_s
+    parser = DiffParser::new({:url=>STOMP_1_URL}.merge(COMMON_PROPERTIES))
+    events = parser.parse diff, CLIENT_ONE
+    
+    assert_equal 1, events.size
+    first_event = events[0]
+    
+    diff = File::new(STOMP_2_DIFF_PATH).to_s
+    parser = DiffParser::new({:url=>STOMP_2_URL}.merge(COMMON_PROPERTIES))
+    events = parser.parse diff, CLIENT_ONE
+    
+    assert_equal 1, events.size
+    second_event = events[0]
+    assert first_event.eql?(second_event)
+  end
+
+  def test_diff_parser_two_changes_same_file
+
+    url = 'https://svn.apache.org/repos/asf/myfaces/core/trunk/api/src/main/java/javax'
+    parser = DiffParser::new({:url=>url}.merge(COMMON_PROPERTIES))
+    diff = File.new(DATA_DIR + 'apache_myfaces.diff.txt').to_s
+    events = parser.parse diff, CLIENT_ONE
+    
+    assert_equal 1, events.size
+    assert events[0].eql?(Event::new(CLIENT_ONE, "changed", url + "/FacesServlet.java"))
+  end
+
+  def test_diff_parser_deleted_added_changed_in_same_patch
+    
+    url = 'http://activemessaging.googlecode.com/svn/trunk/plugins/activemessaging/lib'
+    parser = DiffParser::new({:url=>url}.merge(COMMON_PROPERTIES))
+    diff = File.new(DATA_DIR + 'a13g.diff.txt').to_s
+    events = parser.parse diff, CLIENT_ONE
+    
+    assert_equal 3, events.size
+    assert events[0].eql?(Event::new(CLIENT_ONE, "deleted", url + "/asqs.rb"))
+    assert events[1].eql?(Event::new(CLIENT_ONE, "changed", url + "/jms.rb"))
+    assert events[2].eql?(Event::new(CLIENT_ONE, "added", url + "/new.rb"))
+  end
+
+  def test_diff_parser_deleted_added_changed_in_different_files
+    
+    resource = CONFLICT_URL + '/test_data.txt'
+    parser = DiffParser::new({:url=>CONFLICT_URL}.merge(COMMON_PROPERTIES))
+    added = File::new(DATA_DIR + "three/added.diff.txt").to_s
+    deleted = File::new(DATA_DIR + "three/deleted.diff.txt").to_s
+    changed = File::new(DATA_DIR + "three/changed.diff.txt").to_s    
+
+    events = parser.parse added, CLIENT_ONE
+    assert events[0].eql?(Event::new(CLIENT_ONE, "added", resource))
+    
+    events = parser.parse deleted, CLIENT_ONE
+    assert events[0].eql?(Event::new(CLIENT_ONE, "deleted", resource))
+    
+    events = parser.parse changed, CLIENT_ONE
+    assert events[0].eql?(Event::new(CLIENT_ONE, "changed", resource))
+  end
+end

data/test/round_trip/expiration_test.rb

@@ -0,0 +1,56 @@
+# 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 RoundTripExpirationTest < Test::Unit::TestCase
+  include ConflictConstants
+  
+  def test_expiration
+  
+    diff = File.new("./test/data/rails.diff.txt").to_s
+    info = File.new("./test/data/rails.info.txt").to_s  
+    ttl = 0
+    
+    cfg = {:port=>86}
+    thread = Thread.new do
+      Server::new(cfg.merge({:ttl=>ttl})).start
+    end
+  
+    client_one = Client::new({:id=>CLIENT_ONE}.merge(cfg))
+    client_two = Client::new({:id=>CLIENT_TWO}.merge(cfg))
+    
+    conflicts = client_one.diff diff, info
+    assert_equal 0, conflicts.size
+    assert_equal 1, client_one.count
+    
+    sleep(ttl + 1) # let it expire
+    
+    assert_equal 1, client_one.count, "server will not dump the event until next request"
+    
+    conflicts = client_two.diff diff, info
+    assert_equal 0, conflicts.size, "should not conflict w/ expired event"
+    assert_equal 1, client_one.count, "expired event should be gone"
+    
+    thread.kill
+    thread.join(5)
+
+  end
+  
+end

data/test/round_trip/happy_path_test.rb

@@ -0,0 +1,105 @@
+# 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 RoundTripTest < Test::Unit::TestCase
+  include ConflictConstants
+  RESOURCE = "http://svn.rubyonrails.org/rails/trunk/release.rb"
+
+  def setup
+    @diff = File.new("./test/data/rails.diff.txt").to_s
+    @info = File.new("./test/data/rails.info.txt").to_s
+
+    @first = Event::new(CLIENT_ONE, "changed", RESOURCE)
+    @second = Event::new(CLIENT_TWO, "changed", RESOURCE)
+    @third = Event::new(CLIENT_THREE, "changed", RESOURCE)
+
+  end
+
+  def test_happy_path_conflict_accumalation
+    happy_path_conflict_accumalation nil
+  end
+  
+  def test_happy_path_conflict_accumalation_with_alternate_port_and_url
+    happy_path_conflict_accumalation 81
+  end
+
+  private
+  def happy_path_conflict_accumalation port
+
+    cfg = {:port=>port}
+    @thread = Thread.new do
+      Server::new(cfg).start
+    end
+
+    client_one = Client::new({:id=>CLIENT_ONE}.merge(cfg))
+    client_two = Client::new({:id=>CLIENT_TWO}.merge(cfg))
+    client_three = Client::new({:id=>CLIENT_THREE}.merge(cfg))
+    
+    response = client_one.diff @diff, @info
+    assert [].eql?(response)
+    assert_equal 1, client_one.count
+
+    response = client_two.diff(@diff, @info)
+    assert [Conflict::Conflict.new(@second, @first)].eql?(response)
+    assert_equal 2, client_one.count
+
+    response = client_three.diff @diff, @info
+    assert [Conflict::Conflict.new(@third, @first), Conflict::Conflict::new(@third, @second)].eql?(response)
+    assert_equal 3, client_one.count
+
+    response = client_one.resend
+    assert [Conflict::Conflict.new(@first, @second), Conflict::Conflict::new(@first, @third)].eql?(response)
+    assert_equal 3, client_one.count
+
+    response = client_two.resend
+    assert [Conflict::Conflict.new(@second, @third), Conflict::Conflict::new(@second, @first)].eql?(response)
+    assert_equal 3, client_one.count
+
+    response = client_three.revert @info
+    assert [].eql?(response)
+    assert_equal 2, client_one.count
+
+    response = client_two.resend
+    assert [Conflict::Conflict.new(@second, @first)].eql?(response)
+    assert_equal 2, client_one.count
+
+    response = client_one.resend
+    assert [Conflict::Conflict.new(@first, @second)].eql?(response)
+    assert_equal 2, client_one.count
+
+    response = client_two.revert @info
+    assert [].eql?(response)
+    assert_equal 1, client_one.count
+
+    response = client_one.resend
+    assert [].eql?(response)    
+    assert_equal 1, client_one.count
+
+    response = client_one.revert @info
+    assert [].eql?(response)
+    assert_equal 0, client_one.count
+
+    @thread.kill
+    @thread.join(5)
+  
+  end
+
+end

data/test/round_trip/multi_diff_test.rb

@@ -0,0 +1,67 @@
+# 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 RoundTripMultiDiffTest < Test::Unit::TestCase
+  include ConflictConstants
+  
+  def test_dev_with_no_conflicts
+    
+    @cfg = {:port=>85}
+    @thread = Thread.new do
+      Server::new(@cfg).start
+    end
+
+    rails_diff = File.new("./test/data/rails.diff.txt").to_s
+    rails_info = File.new("./test/data/rails.info.txt").to_s
+    stomp_one_diff = File::new(STOMP_1_DIFF_PATH).to_s
+    stomp_one_info = File.new(STOMP_1_INFO_PATH).to_s
+    stomp_two_diff = File::new(STOMP_2_DIFF_PATH).to_s
+    stomp_two_info = File.new(STOMP_2_INFO_PATH).to_s        
+    
+    client_one = Client::new({:id=>CLIENT_ONE}.merge(@cfg))
+    client_two = Client::new({:id=>CLIENT_TWO}.merge(@cfg))
+    client_three = Client::new({:id=>CLIENT_THREE}.merge(@cfg))
+
+    response = client_one.multi_diff [rails_diff, stomp_one_diff], [rails_info, stomp_one_info]
+    assert_equal [], response
+    
+    response = client_one.multi_diff [stomp_two_diff], [stomp_two_info]
+    assert_equal [], response
+    
+    response = client_one.multi_diff [stomp_one_diff], [stomp_one_info]
+    assert_equal [], response
+    
+    response = client_three.multi_diff [rails_diff], [rails_info]
+    assert_equal [], response
+    
+    client_one.revert rails_info
+    client_two.revert rails_info
+    client_three.revert rails_info
+    @thread.kill
+    @thread.join(5)    
+    
+  end
+  
+  def test_dev_with_conflicts
+    # this needs to get done
+  end
+  
+end  

data/test/round_trip/multiple_actions_test.rb

@@ -0,0 +1,82 @@
+# 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 RoundTripMultipleActionsTest < Test::Unit::TestCase
+  include ConflictConstants
+  RESOURCE = CONFLICT_URL + '/test_data.txt'
+  DATA_DIR = './test/data/three/'
+  
+  def setup
+    
+    @added = File::new(DATA_DIR + "added.diff.txt").to_s
+    @deleted = File::new(DATA_DIR + "deleted.diff.txt").to_s
+    @changed = File::new(DATA_DIR + "changed.diff.txt").to_s
+    @info = File::new(DATA_DIR + "conflict.info.txt").to_s
+
+    @first = Event::new(CLIENT_ONE, "added", RESOURCE)
+    @second = Event::new(CLIENT_TWO, "deleted", RESOURCE)
+    @third = Event::new(CLIENT_THREE, "changed", RESOURCE)
+
+    @conf = {:port=>83}
+    
+    @thread = Thread.new do
+      Server::new(@conf).start
+    end
+
+  end
+
+  def teardown
+    @thread.kill
+    @thread.join(5)
+  end
+
+  def test_workflow_using_add_delete_and_change
+
+    client_one = Client::new({:id=>CLIENT_ONE}.merge(@conf)) # dev start conflict clients
+    client_two = Client::new({:id=>CLIENT_TWO}.merge(@conf))
+    client_three = Client::new({:id=>CLIENT_THREE}.merge(@conf))
+
+    response = client_one.diff(@added, @info)
+    assert_equal [], response
+
+    response = client_two.diff(@deleted, @info)
+    assert [Conflict::Conflict.new(@second, @first)].eql?(response)
+
+    response = client_three.diff(@changed, @info)
+    assert [Conflict::Conflict.new(@third, @first),Conflict::Conflict.new(@third, @second)].eql?(response)
+
+    response = client_two.revert @info
+    assert_equal [], response
+    
+    response = client_one.diff(@added, @info)
+    assert [Conflict::Conflict.new(@first, @third)].eql?(response)
+    
+    response = client_three.diff(@changed, @info)
+    assert [Conflict::Conflict.new(@third, @first)].eql?(response)
+    
+    response = client_one.revert @info
+    assert_equal [], response
+    
+    response = client_three.revert @info
+    assert_equal [], response
+  end
+
+end

data/test/round_trip/negative_test.rb

@@ -0,0 +1,79 @@
+# 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 NegativeServerTest < Test::Unit::TestCase
+include ConflictConstants
+DATA_DIR = './test/data/three/'
+
+  def test_combinations
+
+    @cfg = {:port=>84}
+    @thread = Thread.new do
+      Server::new(@cfg).start
+    end
+    
+    added = File::new(DATA_DIR + "added.diff.txt").to_s
+    deleted = File::new(DATA_DIR + "deleted.diff.txt").to_s
+    info = File::new(DATA_DIR + "conflict.info.txt").to_s
+    
+    clients = [{}, {"client"=>""}, {"client"=>" "}, {"client"=>"foo"}]
+    diffs =   [{}, {"diff"=>""},   {"diff"=>" "},   {"diff"=>added}  ]
+    infos =   [{}, {"info"=>""},   {"info"=>" "},   {"info"=>info}   ]
+   
+    # leaving these out until I can figure out how to make multi-params happen w/ ruby 1.8.4 
+    # {"diff"=>[added,deleted]}
+    #  {"info"=>[info,info]}
+    # [3, 4, 4]
+ 
+    # single diff with no changes, single diff w/ no changes, 
+    # single diff w/ changes, multi-diff with changes
+    good = [ [3, 1, 3], [3, 2, 3], [3, 3, 3] ]
+
+    # tests all mathematical possibilities
+    clients.each_index do | i |
+      diffs.each_index do | j |
+        infos.each_index do | k |
+        
+            body = clients[i].merge(diffs[j]).merge(infos[k])
+            code = send body
+            point = [i, j, k]
+            expected_code = good.index(point) ? 200 : 500
+            assert_equal(expected_code.to_s, code, point.to_s + " -> " + body.to_s)
+           
+        end
+      end
+    end
+    
+    @thread.kill
+    @thread.join(5)
+    
+  end
+  
+  def send body
+    
+    req = Net::HTTP::Post.new(Conflict::DIFF_URL)
+    req.set_form_data(body)
+    http = Net::HTTP.new("127.0.0.1", @cfg[:port])
+    res = http.request(req).code
+    
+  end
+  
+end