You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/02/14 13:09:43 UTC
svn commit: r1446139 -
/subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb
Author: rhuijben
Date: Thu Feb 14 12:09:43 2013
New Revision: 1446139
URL: http://svn.apache.org/r1446139
Log:
Another attempt to fix faulty assumptions in the ruby test.
(The real bug was in the repos-wc diff. See r1446090)
* subversion/bindings/swig/ruby/test/test_wc.rb
(assert_diff_callbacks,
test_diff_callbacks_for_backward_compatibility,
test_diff_callbacks): Don't expect changes on an anchor that is not the target.
Modified:
subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb?rev=1446139&r1=1446138&r2=1446139&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb Thu Feb 14 12:09:43 2013
@@ -742,20 +742,13 @@ EOE
adm.crawl_revisions(dir_path, reporter)
property_info = {
- :dir_changed_prop_names => [
- "svn:entry:committed-date",
- "svn:entry:uuid",
- "svn:entry:last-author",
- "svn:entry:committed-rev"
- ],
:file_changed_prop_name => prop_name,
:file_changed_prop_value => prop_value,
}
sorted_result = callbacks.result.sort_by {|r| r.first.to_s}
expected_props, actual_result = yield(property_info, sorted_result)
- dir_changed_props, file_changed_props, empty_changed_props = expected_props
+ file_changed_props, empty_changed_props = expected_props
assert_equal([
- [:dir_props_changed, @wc_path, dir_changed_props],
[:file_added, path2, empty_changed_props],
[:file_changed, path1, file_changed_props],
],
@@ -767,20 +760,14 @@ EOE
def test_diff_callbacks_for_backward_compatibility
assert_diff_callbacks(:diff_editor) do |property_info, result|
- dir_changed_prop_names = property_info[:dir_changed_prop_names]
- dir_changed_props = dir_changed_prop_names.sort.collect do |name|
- Svn::Core::Prop.new(name, nil)
- end
prop_name = property_info[:file_changed_prop_name]
prop_value = property_info[:file_changed_prop_value]
file_changed_props = [Svn::Core::Prop.new(prop_name, prop_value)]
empty_changed_props = []
sorted_result = result.dup
- dir_prop_changed = sorted_result.assoc(:dir_props_changed)
- dir_prop_changed[2] = dir_prop_changed[2].sort_by {|prop| prop.name}
- [[dir_changed_props, file_changed_props, empty_changed_props],
+ [[file_changed_props, empty_changed_props],
sorted_result]
end
end