conflict 0.1.0 → 0.2.0

data/test/round_trip/multiple_actions_test.rb

@@ -1,82 +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
+# 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

@@ -1,79 +1,109 @@
-# 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
+# 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 setup
+
+    @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}  ]
+
+  end
+
+  def test_combinations
+
+    @cfg = {:port=>84}
+    @thread = Thread.new do
+      Server::new(@cfg).start
+    end
+    
+    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, Conflict::DIFF_URL
+            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 test_combinations_cvs
+
+    @cfg = {:port=>88}
+    @thread = Thread.new do
+      Server::new(@cfg).start
+    end
+
+    good = [ [3, 1], [3, 2], [3, 3] ]
+    
+    @clients.each_index do | i |
+      @diffs.each_index do | j |
+
+        body = @clients[i].merge(@diffs[j])
+        code = send body, Conflict::DIFF_CVS_URL
+        point = [i, j]
+        expected_code = good.index(point) ? 200 : 500
+        assert_equal(expected_code.to_s, code, point.to_s + " -> " + body.to_s)
+
+      end
+    end
+
+    @thread.kill
+    @thread.join(5)
+
+  end
+ 
+  def send body, url
+    
+    req = Net::HTTP::Post.new(url)
+    req.set_form_data(body)
+    http = Net::HTTP.new("127.0.0.1", @cfg[:port])
+    res = http.request(req).code
+    
+  end
+  
+end

data/test/round_trip/relative_path_test.rb

@@ -1,63 +1,63 @@
-# 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 RoundTripRelativePathTest < Test::Unit::TestCase
-  include ConflictConstants
-  
-  def test_relative_path
-    
-    cfg = {:port=>82}
-    @thread = Thread.new do
-      Server::new(cfg).start
-    end
-
-    info_one = File.new(STOMP_1_INFO_PATH).to_s
-    info_two = File.new(STOMP_2_INFO_PATH).to_s        
-    diff_one = File::new(STOMP_1_DIFF_PATH).to_s
-    diff_two = File::new(STOMP_2_DIFF_PATH).to_s
-
-    first_event = Event::new(CLIENT_ONE, "changed", STOMP_RESOURCE)
-    second_event = Event::new(CLIENT_TWO, "changed", STOMP_RESOURCE)
-    
-    client_one = Client::new({:id=>CLIENT_ONE}.merge(cfg))
-    client_two = Client::new({:id=>CLIENT_TWO}.merge(cfg))
-    
-    response = client_one.diff diff_one, info_one
-    assert_equal [], response
-
-    response = client_two.diff diff_two, info_two
-    assert [Conflict::Conflict::new(second_event, first_event)].eql?(response)
-
-    response = client_one.resend
-    assert [Conflict::Conflict::new(first_event, second_event)].eql?(response)
-    
-    response = client_two.revert info_two
-    assert_equal [], response
-    
-    response = client_one.revert info_one
-    assert_equal [], response
-    
-    @thread.kill
-    @thread.join(5)
-    
-  end
-
-end
+# 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 RoundTripRelativePathTest < Test::Unit::TestCase
+  include ConflictConstants
+  
+  def test_relative_path
+    
+    cfg = {:port=>82}
+    @thread = Thread.new do
+      Server::new(cfg).start
+    end
+
+    info_one = File.new(STOMP_1_INFO_PATH).to_s
+    info_two = File.new(STOMP_2_INFO_PATH).to_s        
+    diff_one = File::new(STOMP_1_DIFF_PATH).to_s
+    diff_two = File::new(STOMP_2_DIFF_PATH).to_s
+
+    first_event = Event::new(CLIENT_ONE, "changed", STOMP_RESOURCE)
+    second_event = Event::new(CLIENT_TWO, "changed", STOMP_RESOURCE)
+    
+    client_one = Client::new({:id=>CLIENT_ONE}.merge(cfg))
+    client_two = Client::new({:id=>CLIENT_TWO}.merge(cfg))
+    
+    response = client_one.diff diff_one, info_one
+    assert_equal [], response
+
+    response = client_two.diff diff_two, info_two
+    assert [Conflict::Conflict::new(second_event, first_event)].eql?(response)
+
+    response = client_one.resend
+    assert [Conflict::Conflict::new(first_event, second_event)].eql?(response)
+    
+    response = client_two.revert info_two
+    assert_equal [], response
+    
+    response = client_one.revert info_one
+    assert_equal [], response
+    
+    @thread.kill
+    @thread.join(5)
+    
+  end
+
+end