test/method_delegation_test.rb in rgen-0.5.4 vs test/method_delegation_test.rb in rgen-0.6.0

@@ -1,9 +1,9 @@
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
 require 'test/unit'
-require 'rgen/method_delegation'
+require 'rgen/util/method_delegation'
 
 class MethodDelegationTest < Test::Unit::TestCase
   include RGen
   
   class TestDelegate
@@ -80,27 +80,27 @@
     checkDelegation(delegator, "artificialMethod", delegator.object_id, true)
   end
   
   def test_const_missing
     surroundingModule = Module.nesting.first
-    MethodDelegation.registerDelegate(ConstPathElement, surroundingModule, "const_missing")
+    Util::MethodDelegation.registerDelegate(ConstPathElement, surroundingModule, "const_missing")
     
     assert_equal "SomeArbitraryConst", SomeArbitraryConst.to_s
     assert_equal "AnotherConst::A::B::C", AnotherConst::A::B::C.to_s
     
-    MethodDelegation.unregisterDelegate(ConstPathElement, surroundingModule, "const_missing")
+    Util::MethodDelegation.unregisterDelegate(ConstPathElement, surroundingModule, "const_missing")
     assert_raise NameError do 
       SomeArbitraryConst
     end
   end
   
   def checkDelegation(delegator, method, originalResult, newMethod=false)
     delegate1 = TestDelegate.new
     delegate2 = TestDelegate.new
     
-    MethodDelegation.registerDelegate(delegate1, delegator, method)
-    MethodDelegation.registerDelegate(delegate2, delegator, method)
+    Util::MethodDelegation.registerDelegate(delegate1, delegator, method)
+    Util::MethodDelegation.registerDelegate(delegate2, delegator, method)
     
     assert delegator.respond_to?(:_methodDelegates)
     if newMethod
       assert !delegator.respond_to?("#{method}_delegate_original".to_sym)
     else
@@ -143,20 +143,20 @@
     # both delegates are called though
     assert_equal 4, delegate1.callcount
     assert_equal 2, delegate2.callcount
     
     # calling unregister with a non existing method has no effect
-    MethodDelegation.unregisterDelegate(delegate1, delegator, "xxx")
-    MethodDelegation.unregisterDelegate(delegate1, delegator, method)
+    Util::MethodDelegation.unregisterDelegate(delegate1, delegator, "xxx")
+    Util::MethodDelegation.unregisterDelegate(delegate1, delegator, method)
     
     checkCallOriginal(delegator, method, originalResult, newMethod)
     # delegate1 not called any more
     assert_equal 4, delegate1.callcount
     # delegate2 is still called
     assert_equal 3, delegate2.callcount
     
-    MethodDelegation.unregisterDelegate(delegate2, delegator, method)
+    Util::MethodDelegation.unregisterDelegate(delegate2, delegator, method)
     
     checkCallOriginal(delegator, method, originalResult, newMethod)
     # both delegates not called any more
     assert_equal 4, delegate1.callcount
     assert_equal 3, delegate2.callcount
@@ -173,6 +173,6 @@
     else
       result = delegator.send(method)
       assert_equal originalResult, result
     end
   end
-end
\ No newline at end of file
+end