January 2009 - macruby-changes - lists.macosforge.org

[809] MacRuby/trunk/test-macruby/cases/hotcocoa/plist_test.rb
by source_changes＠macosforge.org 22 Jan '09

22 Jan '09

Revision: 809 http://trac.macosforge.org/projects/ruby/changeset/809 Author: eloy.de.enige(a)gmail.com Date: 2009-01-22 08:31:05 -0800 (Thu, 22 Jan 2009) Log Message: ----------- Added note about failing test in hotcocoa/plist_test.rb Modified Paths: -------------- MacRuby/trunk/test-macruby/cases/hotcocoa/plist_test.rb Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/plist_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/plist_test.rb 2009-01-22 16:30:59 UTC (rev 808) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/plist_test.rb 2009-01-22 16:31:05 UTC (rev 809) @@ -7,7 +7,7 @@ include HotCocoa def test_to_plist - assert_plist(123) + assert_plist(123) # fails because atm a Numeric is not based on NSNumber assert_plist(true) assert_plist(false) assert_plist('foo')

1 0

[808] MacRuby/trunk
by source_changes＠macosforge.org 22 Jan '09

22 Jan '09

Revision: 808 http://trac.macosforge.org/projects/ruby/changeset/808 Author: eloy.de.enige(a)gmail.com Date: 2009-01-22 08:30:59 -0800 (Thu, 22 Jan 2009) Log Message: ----------- Added test coverage for whether or not a framework has been loaded. Added Mappings.framework_loaded? and did some refactoring. Added more documentation, although Mappings.map still really really needs some comprehensive docs?\226?\128?\166 Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings.rb MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb Added Paths: ----------- MacRuby/trunk/test-macruby/test_helper/assertions_helper.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings.rb 2009-01-22 16:30:50 UTC (rev 807) +++ MacRuby/trunk/lib/hotcocoa/mappings.rb 2009-01-22 16:30:59 UTC (rev 808) @@ -26,17 +26,22 @@ end end + # TODO: Needs docs for all possible invocations and examples! def self.map(options, &block) framework = options.delete(:framework) mapped_name = options.keys.first mapped_value = options.values.first + args = [mapped_name, mapped_value] if mapped_value.kind_of?(Class) - add_mapping(mapped_name, mapped_value, &block) + add_mapping(*args, &block) else - on_framework(framework) do - constant = Object.full_const_get(mapped_value) - add_mapping(mapped_name, constant, &block) + if framework.nil? || loaded_framework?(framework) + add_constant_mapping(*args, &block) + else + on_framework(framework) do + add_constant_mapping(*args, &block) + end end end end @@ -48,27 +53,34 @@ mappings[m.builder_method] = m end + # Registers +mapped_name+ as a Mapper#builder_method for the given + # +constant+ string which will be looked up. The +block+ is used as the + # Mapper#builder_method's body. + def self.add_constant_mapping(mapped_name, constant, &block) + add_mapping(mapped_name, Object.full_const_get(constant), &block) + end + + # Returns the Hash of mappings. def self.mappings @mappings ||= {} end + # Registers a callback for after the specified framework has been loaded. def self.on_framework(name, &block) - name = name.nil? ? nil : name.to_s.downcase - if name.nil? or loaded_frameworks.include?(name) - block.call - else - (frameworks[name] ||= []) << block - end + (frameworks[name.to_s.downcase] ||= []) << block end + # Returns the Hash of mapped frameworks. def self.frameworks @frameworks ||= {} end + # Returns the Set of loaded frameworks. def self.loaded_frameworks @loaded_frameworks ||= Set.new end + # Registers a given framework as being loaded. def self.framework_loaded(name) name = name.to_s.downcase loaded_frameworks << name @@ -79,6 +91,11 @@ end end + # Returns whether or not the framework has been loaded yet. + def self.loaded_framework?(name) + loaded_frameworks.include?(name.to_s.downcase) + end + end end Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-22 16:30:50 UTC (rev 807) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-22 16:30:59 UTC (rev 808) @@ -104,6 +104,24 @@ assert_equal ClassFromFramework, Mappings.mappings[:klass].control_class end + it "should keep a unique list of loaded_frameworks" do + assert_difference("Mappings.loaded_frameworks.length", +1) do + Mappings.framework_loaded('TheFramework') + Mappings.framework_loaded('TheFramework') + end + + assert Mappings.loaded_frameworks.include?('theframework') + end + + it "should return whether or not a framework has been loaded yet" do + Mappings.framework_loaded('TheFramework') + assert Mappings.loaded_framework?('TheFramework') + + assert !Mappings.loaded_framework?('IHasNotBeenLoaded') + assert !Mappings.loaded_framework?(nil) + assert !Mappings.loaded_framework?('') + end + def test_reload flunk 'Pending.' end Added: MacRuby/trunk/test-macruby/test_helper/assertions_helper.rb =================================================================== --- MacRuby/trunk/test-macruby/test_helper/assertions_helper.rb (rev 0) +++ MacRuby/trunk/test-macruby/test_helper/assertions_helper.rb 2009-01-22 16:30:59 UTC (rev 808) @@ -0,0 +1,36 @@ +require "test/unit" + +module AssertionsExt + # Asserts that at the end of the block the result of evaluating the given + # +eval_string+ differs by +difference+. + # + # a = [] + # + # assert_difference("a.length", +1) do + # a << "foo" + # end + # + # assert_difference("a.length", -1) do + # a.pop + # end + def assert_difference(eval_string, difference) + before = instance_eval(eval_string) + yield + assert_equal (before + difference), instance_eval(eval_string) + end + + # Asserts that at the end of the block the result of evaluating the given + # +eval_string+ does _not_ differ. + # + # a = Set.new + # a << "foo" + # + # assert_no_difference("a.length") do + # a << "foo" + # end + def assert_no_difference(eval_string, &block) + assert_difference(eval_string, 0, &block) + end +end + +Test::Unit::TestCase.send(:include, AssertionsExt) \ No newline at end of file

1 0

[807] MacRuby/trunk
by source_changes＠macosforge.org 22 Jan '09

22 Jan '09

Revision: 807 http://trac.macosforge.org/projects/ruby/changeset/807 Author: eloy.de.enige(a)gmail.com Date: 2009-01-22 08:30:50 -0800 (Thu, 22 Jan 2009) Log Message: ----------- Added tests for hotcocoa/object_ext.rb from upstream and missing ones. Also added poper copyright and license attribution to Sam Smoot. Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/object_ext.rb Added Paths: ----------- MacRuby/trunk/test-macruby/cases/hotcocoa/object_ext_test.rb Modified: MacRuby/trunk/lib/hotcocoa/object_ext.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/object_ext.rb 2009-01-22 16:30:41 UTC (rev 806) +++ MacRuby/trunk/lib/hotcocoa/object_ext.rb 2009-01-22 16:30:50 UTC (rev 807) @@ -1,5 +1,7 @@ +# Object.full_const_get was taken from the ‘extlib’ project: +# http://github.com/sam/extlib which is released under a MIT License and +# copyrighted by Sam Smoot (2008). -# This is ripped from sam/extlib and changed a little bit. class Object # @param name<String> The name of the constant to get, e.g. "Merb::Router". @@ -7,13 +9,12 @@ # @return <Object> The constant corresponding to the name. def full_const_get(name) list = name.split("::") - list.shift if list.first.strip.empty? + list.shift if list.first.empty? obj = self list.each do |x| # This is required because const_get tries to look for constants in the # ancestor chain, but we only want constants that are HERE - raise NameError, "uninitialized constant #{self.name}::#{name}" unless obj.const_defined?(x) - obj = obj.const_get(x) + obj = obj.const_defined?(x) ? obj.const_get(x) : obj.const_missing(x) end obj end Added: MacRuby/trunk/test-macruby/cases/hotcocoa/object_ext_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/object_ext_test.rb (rev 0) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/object_ext_test.rb 2009-01-22 16:30:50 UTC (rev 807) @@ -0,0 +1,32 @@ +#!/usr/bin/env macruby + +require File.expand_path('../../../test_helper', __FILE__) +require 'hotcocoa' + +module TestNamespaceForConstLookup + def self.const_missing(const) + @missing_const = const + end + + def self.missing_const + @missing_const + end +end + +class TestObjectExt < Test::Unit::TestCase + it 'should return a constant by FQ name _in_ receiver namespace' do + assert_equal HotCocoa, Object.full_const_get("HotCocoa") + assert_equal HotCocoa::Mappings, Object.full_const_get("HotCocoa::Mappings") + end + + it "should call ::const_missing on the namespace which _does_ exist" do + Object.full_const_get('TestNamespaceForConstLookup::DoesNotExist') + assert_equal 'DoesNotExist', TestNamespaceForConstLookup.missing_const + end + + it "should normally raise a NameError if a const cannot be found" do + assert_raise(NameError) do + Object.full_const_get('DoesNotExist::ForSure') + end + end +end \ No newline at end of file

1 0

[806] MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb
by source_changes＠macosforge.org 22 Jan '09

22 Jan '09

Revision: 806 http://trac.macosforge.org/projects/ruby/changeset/806 Author: eloy.de.enige(a)gmail.com Date: 2009-01-22 08:30:41 -0800 (Thu, 22 Jan 2009) Log Message: ----------- Cleaned mappings_test.rb a bit. Make sure that defined mappings and loaded frameworks etc are cleaned up at the end of the test case. Modified Paths: -------------- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-22 16:30:36 UTC (rev 805) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-22 16:30:41 UTC (rev 806) @@ -23,6 +23,7 @@ after do Mappings.mappings[:klass] = nil Mappings.frameworks["theframework"] = nil + Mappings.loaded_frameworks.delete('theframework') end it "should have two Hash attributes named #mappings and #frameworks" do @@ -62,8 +63,7 @@ it "should create a mapping to a class in a framework with #map" do mock = Mock.new - eval "class ::ClassInTheFrameWork; end" - Mappings.map(:klass => 'ClassInTheFrameWork', :framework => 'TheFramework') do + Mappings.map(:klass => 'SampleClass', :framework => 'TheFramework') do mock.call! end Mappings.frameworks["theframework"].last.call @@ -90,7 +90,7 @@ it "should resolve a constant when a framework, that's registered with #map, is loaded" do assert_nothing_raised(NameError) do - Mappings.map(:klass => 'ClassFromFramework', :framework => 'TheFrameworkAfterLoad') {} + Mappings.map(:klass => 'ClassFromFramework', :framework => 'TheFramework') {} end # The mapping should not yet exist @@ -98,7 +98,7 @@ # now we actually define the class and fake the loading of the framework eval "class ::ClassFromFramework; end" - Mappings.framework_loaded('TheFrameworkAfterLoad') + Mappings.framework_loaded('TheFramework') # It should be loaded by now assert_equal ClassFromFramework, Mappings.mappings[:klass].control_class

1 0

[805] MacRuby/trunk
by source_changes＠macosforge.org 22 Jan '09

22 Jan '09

Revision: 805 http://trac.macosforge.org/projects/ruby/changeset/805 Author: eloy.de.enige(a)gmail.com Date: 2009-01-22 08:30:36 -0800 (Thu, 22 Jan 2009) Log Message: ----------- Object.full_const_get now raises a NameError is a const is missing. Also keep track of the frameworks which are loaded and use that information to decide whether or not to lookup a constant now, or once the framework has been loaded. Made tests green. Patch by Vincent Isambart. Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings.rb MacRuby/trunk/lib/hotcocoa/object_ext.rb MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings.rb 2009-01-21 09:47:51 UTC (rev 804) +++ MacRuby/trunk/lib/hotcocoa/mappings.rb 2009-01-22 16:30:36 UTC (rev 805) @@ -34,13 +34,9 @@ if mapped_value.kind_of?(Class) add_mapping(mapped_name, mapped_value, &block) else - constant = Object.full_const_get(mapped_value) - if framework.nil? || constant + on_framework(framework) do + constant = Object.full_const_get(mapped_value) add_mapping(mapped_name, constant, &block) - else - on_framework(framework) do - add_mapping(mapped_name, constant, &block) - end end end end @@ -57,16 +53,27 @@ end def self.on_framework(name, &block) - (frameworks[name.to_s.downcase] ||= []) << block + name = name.nil? ? nil : name.to_s.downcase + if name.nil? or loaded_frameworks.include?(name) + block.call + else + (frameworks[name] ||= []) << block + end end def self.frameworks @frameworks ||= {} end + def self.loaded_frameworks + @loaded_frameworks ||= Set.new + end + def self.framework_loaded(name) - if frameworks[name.to_s.downcase] - frameworks[name.to_s.downcase].each do |mapper| + name = name.to_s.downcase + loaded_frameworks << name + if frameworks[name] + frameworks[name].each do |mapper| mapper.call end end Modified: MacRuby/trunk/lib/hotcocoa/object_ext.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/object_ext.rb 2009-01-21 09:47:51 UTC (rev 804) +++ MacRuby/trunk/lib/hotcocoa/object_ext.rb 2009-01-22 16:30:36 UTC (rev 805) @@ -12,8 +12,8 @@ list.each do |x| # This is required because const_get tries to look for constants in the # ancestor chain, but we only want constants that are HERE - obj = obj.const_defined?(x) ? obj.const_get(x) : nil - return false unless obj + raise NameError, "uninitialized constant #{self.name}::#{name}" unless obj.const_defined?(x) + obj = obj.const_get(x) end obj end Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-21 09:47:51 UTC (rev 804) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-22 16:30:36 UTC (rev 805) @@ -62,6 +62,7 @@ it "should create a mapping to a class in a framework with #map" do mock = Mock.new + eval "class ::ClassInTheFrameWork; end" Mappings.map(:klass => 'ClassInTheFrameWork', :framework => 'TheFramework') do mock.call! end @@ -89,7 +90,7 @@ it "should resolve a constant when a framework, that's registered with #map, is loaded" do assert_nothing_raised(NameError) do - Mappings.map(:klass => 'ClassFromFramework', :framework => 'TheFramework') {} + Mappings.map(:klass => 'ClassFromFramework', :framework => 'TheFrameworkAfterLoad') {} end # The mapping should not yet exist @@ -97,7 +98,7 @@ # now we actually define the class and fake the loading of the framework eval "class ::ClassFromFramework; end" - Mappings.framework_loaded('TheFramework') + Mappings.framework_loaded('TheFrameworkAfterLoad') # It should be loaded by now assert_equal ClassFromFramework, Mappings.mappings[:klass].control_class

1 0

[804] MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb
by source_changes＠macosforge.org 21 Jan '09

21 Jan '09

Revision: 804 http://trac.macosforge.org/projects/ruby/changeset/804 Author: eloy.de.enige(a)gmail.com Date: 2009-01-21 01:47:51 -0800 (Wed, 21 Jan 2009) Log Message: ----------- Added failing test case for HotCocoa mappings after discussing with Vincent. Modified Paths: -------------- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-21 00:34:04 UTC (rev 803) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-21 09:47:51 UTC (rev 804) @@ -19,7 +19,12 @@ class TestMappings < Test::Unit::TestCase include HotCocoa - + + after do + Mappings.mappings[:klass] = nil + Mappings.frameworks["theframework"] = nil + end + it "should have two Hash attributes named #mappings and #frameworks" do assert Mappings.mappings.is_a?(Hash) assert Mappings.frameworks.is_a?(Hash) @@ -82,6 +87,22 @@ end end + it "should resolve a constant when a framework, that's registered with #map, is loaded" do + assert_nothing_raised(NameError) do + Mappings.map(:klass => 'ClassFromFramework', :framework => 'TheFramework') {} + end + + # The mapping should not yet exist + assert_nil Mappings.mappings[:klass] + + # now we actually define the class and fake the loading of the framework + eval "class ::ClassFromFramework; end" + Mappings.framework_loaded('TheFramework') + + # It should be loaded by now + assert_equal ClassFromFramework, Mappings.mappings[:klass].control_class + end + def test_reload flunk 'Pending.' end

1 0

[803] MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb
by source_changes＠macosforge.org 21 Jan '09

21 Jan '09

Revision: 803 http://trac.macosforge.org/projects/ruby/changeset/803 Author: eloy.de.enige(a)gmail.com Date: 2009-01-20 16:34:04 -0800 (Tue, 20 Jan 2009) Log Message: ----------- Cleaned tests up a bit more. Modified Paths: -------------- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-21 00:29:02 UTC (rev 802) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-21 00:34:04 UTC (rev 803) @@ -4,10 +4,18 @@ require 'hotcocoa' class SampleClass - def self.val; @val || false; end - def self.val= (v); @val = v; end end +class Mock + def call! + @called = true + end + + def called? + @called + end +end + class TestMappings < Test::Unit::TestCase include HotCocoa @@ -47,7 +55,7 @@ end it "should create a mapping to a class in a framework with #map" do - mock = mocked_object + mock = Mock.new Mappings.map(:klass => 'ClassInTheFrameWork', :framework => 'TheFramework') do mock.call! @@ -58,14 +66,14 @@ end it "should execute the framework's callbacks when #framework_loaded is called" do - mock1, mock2 = mocked_object, mocked_object + mocks = Array.new(2) { Mock.new } - [mock1, mock2].each do |mock| + mocks.each do |mock| Mappings.on_framework('TheFramework') { mock.call! } end Mappings.framework_loaded('TheFramework') - [mock1, mock2].each { |mock| assert mock.called? } + mocks.each { |mock| assert mock.called? } end it "should do nothing if the framework passed to #framework_loaded isn't registered" do @@ -77,17 +85,4 @@ def test_reload flunk 'Pending.' end - - private - - def mocked_object - mock = Object.new - def mock.call! - @called = true - end - def mock.called? - @called - end - mock - end end \ No newline at end of file

1 0

[802] MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb
by source_changes＠macosforge.org 21 Jan '09

21 Jan '09

Revision: 802 http://trac.macosforge.org/projects/ruby/changeset/802 Author: eloy.de.enige(a)gmail.com Date: 2009-01-20 16:29:02 -0800 (Tue, 20 Jan 2009) Log Message: ----------- Oops, actually do what the test says?\226?\128?\166 Modified Paths: -------------- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-21 00:21:56 UTC (rev 801) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-21 00:29:02 UTC (rev 802) @@ -28,7 +28,7 @@ end it "should create a mapping to a class with a symbol name of the class given to #map" do - Mappings.map(:klass => 'SampleClass') {} + Mappings.map(:klass => :SampleClass) {} assert_equal SampleClass, Mappings.mappings[:klass].control_class end

1 0

[801] MacRuby/trunk
by source_changes＠macosforge.org 21 Jan '09

21 Jan '09

Revision: 801 http://trac.macosforge.org/projects/ruby/changeset/801 Author: eloy.de.enige(a)gmail.com Date: 2009-01-20 16:21:56 -0800 (Tue, 20 Jan 2009) Log Message: ----------- Applied patch from #212 by Vincent Isambart and added test coverage. Also improved the other test descriptions and code and refactored the #map code. Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings.rb MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb MacRuby/trunk/test-macruby/cases/objc_test.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings.rb 2009-01-20 20:09:22 UTC (rev 800) +++ MacRuby/trunk/lib/hotcocoa/mappings.rb 2009-01-21 00:21:56 UTC (rev 801) @@ -1,6 +1,6 @@ module HotCocoa module Mappings - + def self.reload Dir.glob(File.join(File.dirname(__FILE__), "mappings", "*.rb")).each do |mapping| load mapping @@ -8,7 +8,7 @@ end DefaultEmptyRect = [0,0,0,0] - + module TargetActionConvenience def on_action=(behavior) object = Object.new @@ -25,38 +25,45 @@ self end end - + def self.map(options, &block) framework = options.delete(:framework) mapped_name = options.keys.first mapped_value = options.values.first - const = Object.full_const_get(mapped_value) + if mapped_value.kind_of?(Class) - m = Mapper.map_instances_of(mapped_value, mapped_name, &block) - mappings[m.builder_method] = m - elsif framework.nil? || const - m = Mapper.map_instances_of(const, mapped_name, &block) - mappings[m.builder_method] = m + add_mapping(mapped_name, mapped_value, &block) else - on_framework(framework) do - m = Mapper.map_instances_of(const, mapped_name, &block) - mappings[m.builder_method] = m + constant = Object.full_const_get(mapped_value) + if framework.nil? || constant + add_mapping(mapped_name, constant, &block) + else + on_framework(framework) do + add_mapping(mapped_name, constant, &block) + end end end end - + + # Registers +mapped_name+ as a Mapper#builder_method for the given + # +mapped_value+. The +block+ is used as the Mapper#builder_method's body. + def self.add_mapping(mapped_name, mapped_value, &block) + m = Mapper.map_instances_of(mapped_value, mapped_name, &block) + mappings[m.builder_method] = m + end + def self.mappings @mappings ||= {} end - + def self.on_framework(name, &block) (frameworks[name.to_s.downcase] ||= []) << block end - + def self.frameworks @frameworks ||= {} end - + def self.framework_loaded(name) if frameworks[name.to_s.downcase] frameworks[name.to_s.downcase].each do |mapper| Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-20 20:09:22 UTC (rev 800) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-21 00:21:56 UTC (rev 801) @@ -17,48 +17,60 @@ assert Mappings.frameworks.is_a?(Hash) end - it "should register callbacks for the point of time when a framework is loaded with #on_framework" do - p = Proc.new {} - Mappings.on_framework(:Foo, &p) - assert_equal(Mappings.frameworks['foo'].last, p) + it "should create a mapping to a class with a Class instance given to #map" do + Mappings.map(:klass => SampleClass) {} + assert_equal SampleClass, Mappings.mappings[:klass].control_class end - it "should create a mapping to a class with #map" do - - block = Proc.new do - def alloc_with_options(options); options; end + it "should create a mapping to a class with a string name of the class given to #map" do + Mappings.map(:klass => 'SampleClass') {} + assert_equal SampleClass, Mappings.mappings[:klass].control_class + end + + it "should create a mapping to a class with a symbol name of the class given to #map" do + Mappings.map(:klass => 'SampleClass') {} + assert_equal SampleClass, Mappings.mappings[:klass].control_class + end + + it "should register the key, in the options given to #map, as the builder_method" do + Mappings.map(:klass => SampleClass) {} + assert_equal Mappings.mappings[:klass].builder_method, :klass + end + + it "should use the block given to #map as the control_module body" do + Mappings.map(:klass => SampleClass) do + def a_control_module_instance_method; end end - HotCocoa::Mappings.map({:foo => :SampleClass}, &block) - - m = HotCocoa::Mappings.mappings[:foo] - - assert_equal(m.control_class, SampleClass) - assert_equal(m.builder_method, :foo) - assert(m.control_module.instance_methods.include?(:alloc_with_options)) - + assert Mappings.mappings[:klass].control_module. + instance_methods.include?(:a_control_module_instance_method) end - it "should create a mapping to a class for a framework with #map" do - p = Proc.new {} - HotCocoa::Mappings.map({:foo => :SampleClass, :framework => :Anonymous}, &p) - # require 'pp'; pp HotCocoa::Mappings + it "should create a mapping to a class in a framework with #map" do + mock = mocked_object - # FIXME: This is not really nice. We test that the result exists, but not what it is. - assert_equal Mappings.frameworks["anonymous"].size, 1 + Mappings.map(:klass => 'ClassInTheFrameWork', :framework => 'TheFramework') do + mock.call! + end + Mappings.frameworks["theframework"].last.call + + assert mock.called? end - it "should call the framework's callbacks if it's passed to #framework_loaded" do - p = Proc.new { SampleClass.val = true } - Mappings.on_framework(:Foo, &p) - Mappings.framework_loaded(:Foo) + it "should execute the framework's callbacks when #framework_loaded is called" do + mock1, mock2 = mocked_object, mocked_object - assert_equal SampleClass.val, true + [mock1, mock2].each do |mock| + Mappings.on_framework('TheFramework') { mock.call! } + end + Mappings.framework_loaded('TheFramework') + + [mock1, mock2].each { |mock| assert mock.called? } end - it "should raise nothing if there's no entry for the framework passed to #framework_loaded" do + it "should do nothing if the framework passed to #framework_loaded isn't registered" do assert_nothing_raised do - Mappings.framework_loaded(:FrameworkDoesNotExist) + Mappings.framework_loaded('FrameworkDoesNotExist') end end @@ -66,4 +78,16 @@ flunk 'Pending.' end + private + + def mocked_object + mock = Object.new + def mock.call! + @called = true + end + def mock.called? + @called + end + mock + end end \ No newline at end of file Modified: MacRuby/trunk/test-macruby/cases/objc_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/objc_test.rb 2009-01-20 20:09:22 UTC (rev 800) +++ MacRuby/trunk/test-macruby/cases/objc_test.rb 2009-01-21 00:21:56 UTC (rev 801) @@ -174,4 +174,4 @@ it "should instantiate with klass::alloc.init" do assert_kind_of NSObject, NSObject.alloc.init end -end +end \ No newline at end of file

1 0

[800] MacRuby/trunk/test-macruby/cases/hotcocoa
by source_changes＠macosforge.org 20 Jan '09

20 Jan '09

Revision: 800 http://trac.macosforge.org/projects/ruby/changeset/800 Author: eloy.de.enige(a)gmail.com Date: 2009-01-20 12:09:22 -0800 (Tue, 20 Jan 2009) Log Message: ----------- The previous patches were a patch by Vincent Isambart, and test cases by Alexander Flatter, for HotCocoa. Some small cleanups. Modified Paths: -------------- MacRuby/trunk/test-macruby/cases/hotcocoa/mapper_test.rb MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mapper_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mapper_test.rb 2009-01-20 20:09:12 UTC (rev 799) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mapper_test.rb 2009-01-20 20:09:22 UTC (rev 800) @@ -29,7 +29,7 @@ end it "should convert from camelcase to underscore" do - assert sample_mapper.underscore("SampleCamelCasedWord"), 'sample_camel_cased_word' + assert sample_mapper.underscore("SampleCamelCasedWord"), 'sample_camel_cased_word' end def test_include_in_class Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-20 20:09:12 UTC (rev 799) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-01-20 20:09:22 UTC (rev 800) @@ -24,7 +24,7 @@ end it "should create a mapping to a class with #map" do - + block = Proc.new do def alloc_with_options(options); options; end end @@ -40,39 +40,30 @@ end it "should create a mapping to a class for a framework with #map" do - p = Proc.new {} - HotCocoa::Mappings.map({:foo => :SampleClass, :framework => :Anonymous}, &p) + # require 'pp'; pp HotCocoa::Mappings - require 'pp'; pp HotCocoa::Mappings - # FIXME: This is not really nice. We test that the result exists, but not what it is. assert_equal Mappings.frameworks["anonymous"].size, 1 - end it "should call the framework's callbacks if it's passed to #framework_loaded" do - p = Proc.new { SampleClass.val = true } - Mappings.on_framework(:Foo, &p) Mappings.framework_loaded(:Foo) - + assert_equal SampleClass.val, true - end it "should raise nothing if there's no entry for the framework passed to #framework_loaded" do - assert_nothing_raised do Mappings.framework_loaded(:FrameworkDoesNotExist) end - end def test_reload flunk 'Pending.' end - + end \ No newline at end of file

1 0