conflict 0.1.0

data/test/round_trip/relative_path_test.rb

@@ -0,0 +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

metadata

@@ -0,0 +1,86 @@
+--- !ruby/object:Gem::Specification 
+rubygems_version: 0.8.11
+specification_version: 1
+name: conflict
+version: !ruby/object:Gem::Version 
+  version: 0.1.0
+date: 2007-08-05 00:00:00 -08:00
+summary: Notifies a developer of conflicts between his/her work and that of other developers
+require_paths: 
+- lib
+email: dbyrne@thoughtworks.com
+homepage: http://sourceforge.net/projects/conflict
+rubyforge_project: conflict
+description: 
+autorequire: conflict
+default_executable: 
+bindir: bin
+has_rdoc: false
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
+platform: ruby
+signing_key: 
+cert_chain: 
+authors: 
+- Dennis Byrne
+files: 
+- Rakefile
+- README
+- LICENSE
+- lib/conflict.rb
+- lib/run_conflict
+- lib/conflict
+- lib/conflict/domain.rb
+- lib/conflict/core.rb
+- lib/conflict/parsers.rb
+- bin/conflict
+- test/equality_test.rb
+- test/event_test.rb
+- test/database_test.rb
+- test/data
+- test/negative_test.rb
+- test/parser_test.rb
+- test/common.rb
+- test/round_trip
+- test/data/stomp
+- test/data/rails.diff.txt
+- test/data/apache_myfaces.diff.txt
+- test/data/rails.info.txt
+- test/data/a13g.diff.txt
+- test/data/three
+- test/data/stomp/stomp.2.diff.txt
+- test/data/stomp/stomp.2.info.txt
+- test/data/stomp/stomp.1.diff.txt
+- test/data/stomp/stomp.1.info.txt
+- test/data/three/changed.diff.txt
+- test/data/three/deleted.diff.txt
+- test/data/three/conflict.info.txt
+- test/data/three/added.diff.txt
+- test/round_trip/multi_diff_test.rb
+- test/round_trip/happy_path_test.rb
+- test/round_trip/expiration_test.rb
+- test/round_trip/negative_test.rb
+- test/round_trip/relative_path_test.rb
+- test/round_trip/multiple_actions_test.rb
+test_files: 
+- test/equality_test.rb
+- test/event_test.rb
+- test/database_test.rb
+- test/negative_test.rb
+- test/parser_test.rb
+rdoc_options: []
+
+extra_rdoc_files: []
+
+executables: 
+- conflict
+extensions: []
+
+requirements: 
+- none
+dependencies: []
+