[macruby-changes] [3077] MacRuby/trunk/spec/macruby/core/kvc_spec.rb
source_changes at macosforge.org
source_changes at macosforge.org
Sun Dec 6 15:58:16 PST 2009
Revision: 3077
http://trac.macosforge.org/projects/ruby/changeset/3077
Author: neeracher at apple.com
Date: 2009-12-06 15:58:16 -0800 (Sun, 06 Dec 2009)
Log Message:
-----------
Refactor unordered classes
Modified Paths:
--------------
MacRuby/trunk/spec/macruby/core/kvc_spec.rb
Modified: MacRuby/trunk/spec/macruby/core/kvc_spec.rb
===================================================================
--- MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2009-12-06 23:52:16 UTC (rev 3076)
+++ MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2009-12-06 23:58:16 UTC (rev 3077)
@@ -107,21 +107,6 @@
end
end
-def manipulateUnorderedCollection(w)
- 3.upto(4) {|n| w.mutableSetValueForKey("kvcUnorderedCollection").addObject(n)}
- w.mutableSetValueForKey("kvcUnorderedCollection").addObjectsFromArray([1,2])
- w.mutableSetValueForKey("kvcUnorderedCollection").unionSet(NSSet.setWithArray([5,6]))
- w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray((1..6).to_a)).should == true
-
- w.mutableSetValueForKey("kvcUnorderedCollection").removeObject(1)
- w.mutableSetValueForKey("kvcUnorderedCollection").intersectSet(NSSet.setWithArray([1,3,4,5,7]))
- w.mutableSetValueForKey("kvcUnorderedCollection").minusSet(NSSet.setWithArray([5,7]))
- w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray([3,4])).should == true
-
- w.mutableSetValueForKey("kvcUnorderedCollection").removeAllObjects
- w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.set).should == true
-end
-
class WholeSetWrapper < SetWrapper
def kvcUnorderedCollection
@wrapped
@@ -132,7 +117,7 @@
end
end
-class ObjectSetWrapper < SetWrapper
+class AccessSetWrapper < SetWrapper
def countOfKvcUnorderedCollection
@wrapped.count
end
@@ -144,7 +129,9 @@
def memberOfKvcUnorderedCollection(o)
@wrapped.member(o)
end
+end
+class ObjectSetWrapper < AccessSetWrapper
def addKvcUnorderedCollectionObject(o)
@wrapped.addObject(o)
end
@@ -154,19 +141,7 @@
end
end
-class SetSetWrapper < SetWrapper
- def countOfKvcUnorderedCollection
- @wrapped.count
- end
-
- def enumeratorOfKvcUnorderedCollection
- @wrapped.objectEnumerator
- end
-
- def memberOfKvcUnorderedCollection(o)
- @wrapped.member(o)
- end
-
+class SetSetWrapper < AccessSetWrapper
def addKvcUnorderedCollection(c)
@wrapped.unionSet(c)
end
@@ -180,6 +155,21 @@
end
end
+def manipulateUnorderedCollection(w)
+ 3.upto(4) {|n| w.mutableSetValueForKey("kvcUnorderedCollection").addObject(n)}
+ w.mutableSetValueForKey("kvcUnorderedCollection").addObjectsFromArray([1,2])
+ w.mutableSetValueForKey("kvcUnorderedCollection").unionSet(NSSet.setWithArray([5,6]))
+ w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray((1..6).to_a)).should == true
+
+ w.mutableSetValueForKey("kvcUnorderedCollection").removeObject(1)
+ w.mutableSetValueForKey("kvcUnorderedCollection").intersectSet(NSSet.setWithArray([1,3,4,5,7]))
+ w.mutableSetValueForKey("kvcUnorderedCollection").minusSet(NSSet.setWithArray([5,7]))
+ w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray([3,4])).should == true
+
+ w.mutableSetValueForKey("kvcUnorderedCollection").removeAllObjects
+ w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.set).should == true
+end
+
describe "A scalar being accessed through NSKeyValueCoding" do
it "can be manipulated" do
w = ScalarWrapper.new
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20091206/6561abd5/attachment.html>
More information about the macruby-changes
mailing list