aquarium 0.4.4 → 0.5.1

data/lib/aquarium/finders/type_finder.rb

@@ -4,7 +4,6 @@ require 'aquarium/utils/type_utils'
 require 'aquarium/utils/invalid_options'
 require 'aquarium/extensions/hash'
 require 'aquarium/extensions/regexp'
-require 'aquarium/extensions/symbol'
 require 'aquarium/finders/finder_result'
 
 # Finds types known to the runtime environment.

data/lib/aquarium/utils/array_utils.rb

@@ -1,4 +1,3 @@
-require 'aquarium/extensions/symbol'
 require 'aquarium/utils/html_escaper'
 
 module Aquarium

data/lib/aquarium/utils/method_utils.rb

@@ -5,6 +5,16 @@ module Aquarium
   module Utils
     module MethodUtils
       
+      # The metaprogramming methods such as "public_instance_methods" require
+      # strings for 1.8, symbols for 1.9.
+      def self.to_name string_or_symbol
+        if RUBY_VERSION =~ /^1.8/
+          string_or_symbol.to_s
+        else
+          string_or_symbol.intern
+        end
+      end
+      
       def self.method_args_to_hash *args
         return {} if args.empty? || (args.size == 1 && args[0].nil?)
         hash = (args[-1] and args[-1].kind_of? Hash) ? args.pop : {}
@@ -37,7 +47,8 @@ module Aquarium
           %w[public protected private].each do |protection|
             meta_method = "#{protection}_#{suffix}"
             found_methods = type_or_instance.send(meta_method, include_ancestors)
-            if found_methods.include?(method_sym.to_s)
+            # Try both the symbol (ruby 1.9) and the string (1.8).
+            if found_methods.include?(method_sym) or found_methods.include?(method_sym.to_s)
               return yield(type_or_instance, method_sym, protection.intern)
             end
           end
@@ -61,7 +72,7 @@ module Aquarium
           object.ancestors
         else
           eigen = (class << object; self; end)
-          [eigen] + eigen.ancestors
+          eigen.ancestors + [eigen]
         end
       end
       

data/lib/aquarium/utils/options_utils.rb

@@ -125,6 +125,7 @@ module Aquarium
       def hashify options
         return options if options.kind_of?(Hash)
         new_options = {}
+        options = [options] unless options.kind_of?(Array)
         options.each do |x|
           if x.kind_of?(Hash)
             new_options.merge!(x)

data/lib/aquarium/utils/type_utils.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Aquarium
   module Utils
     module TypeUtils
@@ -6,10 +8,13 @@ module Aquarium
       end
 
       def self.descendents clazz
-        visited = [Class, Object, Module, clazz]
+        visited = Set.new([Class, Object, Module, clazz])
+        if RUBY_VERSION =~ /^1.9/
+          visited << BasicObject 
+        end
         result = [clazz]
         Module.constants.each do |const|
-          mod = Module.class_eval(const)
+          mod = Module.class_eval(const.to_s)
           if mod.respond_to?(:ancestors)
             result << mod if mod.ancestors.include?(clazz)
             do_descendents clazz, mod, visited, result
@@ -21,7 +26,7 @@ module Aquarium
       def self.nested clazz
         result = [clazz]
         clazz.constants.each do |const|
-          mod = clazz.class_eval(const)
+          mod = clazz.class_eval(const.to_s)
           next unless is_type?(mod)
           result << mod 
           result << nested(mod)
@@ -34,13 +39,16 @@ module Aquarium
       # For JRuby classes, we have to "__x__" forms of the reflection methods that don't end in '?'. 
       # That includes "send", so we do some ugly switching, rather than call "mod.send(method_name)"
       # or "mod.__send__(method_name)"!
+      # TODO: is this still true with the latest JRUBY versions?
       def self.do_descendents clazz, visiting_module, visited, result
         visited << visiting_module
         use_underscore_methods = use_underscore_methods? visiting_module
         nested_constants = use_underscore_methods ? visiting_module.__constants__ : visiting_module.constants
         nested_constants.each do |const|
           next unless visiting_module.const_defined?(const)
-          nested_module = use_underscore_methods ? visiting_module.__const_get__(const) : visiting_module.const_get(const)
+          nested_module = ignore_warning do
+            use_underscore_methods ? visiting_module.__const_get__(const) : visiting_module.const_get(const)
+          end
           next if visited.include?(nested_module)
           next unless responds_to_ancestors?(nested_module)
           use_underscore_methods2 = use_underscore_methods? nested_module
@@ -57,6 +65,14 @@ module Aquarium
       def self.responds_to_ancestors? mod
         mod.respond_to?(:ancestors) or mod.respond_to?(:__ancestors__)
       end
+
+      def self.ignore_warning
+        warning_orig = $-w
+        $-w = nil
+        res = yield
+        $-w = warning_orig
+        return res
+      end
     end
   end
-end
+end

data/lib/aquarium/version.rb

@@ -8,8 +8,8 @@ module Aquarium
 
     unless defined? MAJOR
       MAJOR  = 0
-      MINOR  = 4
-      TINY   = 4
+      MINOR  = 5
+      TINY   = 1
       RELEASE_CANDIDATE = nil
       
       # RANDOM_TOKEN: 0.598704893979657

data/spec/aquarium/aspects/advice_chain_node_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require 'aquarium/spec_example_types'
 require 'aquarium'
 
 include Aquarium::Aspects::Advice

data/spec/aquarium/aspects/advice_spec.rb

@@ -18,6 +18,19 @@ describe Advice, "#sort_by_priority_order" do
   end
 end
 
+def puts_advice_chain aspect, label
+    puts label
+    aspect.pointcuts.each do |pc|
+      pc.join_points_matched.each do |jp|
+        chain = Aspect.get_advice_chain(jp)
+        chain.each do |a|
+          puts "advice_node: #{a.inspect}"
+        end
+        puts "last: #{chain.last}"
+      end
+    end
+    puts ""
+end
 describe Advice, "#invoke_original_join_point" do
   class InvocationCounter
     def initialize; @counter = 0; end
@@ -62,28 +75,39 @@ def should_raise_expected_exception_with_message message
 end
 
 describe Advice, "that raises an exception" do
-  it "should add the kind of advice to the exception message." do
-    aspect = Aspect.new :before, :pointcut => {:type => Watchful, :methods => :public_watchful_method} do |jp, obj, *args| 
-      raise SpecExceptionForTesting.new("advice called with args: #{args.inspect}")
+  context "when debug_backtraces is true" do
+    before do
+      @debug_backtraces_orig = Aquarium::Aspects::Advice.debug_backtraces
+      Aquarium::Aspects::Advice.debug_backtraces = true
     end
-    should_raise_expected_exception_with_message("\"before\" advice") {Watchful.new.public_watchful_method(:a1, :a2)}
-    aspect.unadvise
-  end
 
-  it "should add the \"Class#method\" of the advised object's type and method to the exception message." do
-    aspect = Aspect.new :before, :pointcut => {:type => Watchful, :methods => :public_watchful_method} do |jp, obj, *args| 
-      raise "advice called with args: #{args.inspect}"
+    after do
+      Aquarium::Aspects::Advice.debug_backtraces = @debug_backtraces_orig
     end
-    should_raise_expected_exception_with_message("Watchful#public_watchful_method") {Watchful.new.public_watchful_method(:a1, :a2)}
-    aspect.unadvise
-  end
 
-  it "should add the \"Class.method\" of the advised type's class method to the exception message." do
-    aspect = Aspect.new :before, :pointcut => {:type => Watchful, :methods => :public_class_watchful_method, :method_options => [:class]} do |jp, obj, *args| 
-      raise "advice called with args: #{args.inspect}"
+    it "should add the kind of advice to the exception message." do
+      aspect = Aspect.new :before, :pointcut => {:type => Watchful, :methods => :public_watchful_method} do |jp, obj, *args| 
+        raise SpecExceptionForTesting.new("advice called with args: #{args.inspect}")
+      end
+      should_raise_expected_exception_with_message("\"before\" advice") {Watchful.new.public_watchful_method(:a1, :a2)}
+      aspect.unadvise
+    end
+
+    it "should add the \"Class#method\" of the advised object's type and method to the exception message." do
+      aspect = Aspect.new :before, :pointcut => {:type => Watchful, :methods => :public_watchful_method} do |jp, obj, *args| 
+        raise "advice called with args: #{args.inspect}"
+      end
+      should_raise_expected_exception_with_message("Watchful#public_watchful_method") {Watchful.new.public_watchful_method(:a1, :a2)}
+      aspect.unadvise
+    end
+
+    it "should add the \"Class.method\" of the advised type's class method to the exception message." do
+      aspect = Aspect.new :before, :pointcut => {:type => Watchful, :methods => :public_class_watchful_method, :method_options => [:class]} do |jp, obj, *args| 
+        raise "advice called with args: #{args.inspect}"
+      end
+      should_raise_expected_exception_with_message("Watchful.public_class_watchful_method") {Watchful.public_class_watchful_method(:a1, :a2)}
+      aspect.unadvise
     end
-    should_raise_expected_exception_with_message("Watchful.public_class_watchful_method") {Watchful.public_class_watchful_method(:a1, :a2)}
-    aspect.unadvise
   end
 
   it "should rethrow an exception of the same type as the original exception." do
@@ -126,45 +150,56 @@ describe Advice, "#invoke_original_join_point that raises an exception" do
       raise IOJPRException.new(":class_raise_exception called with args: #{args.inspect}")
     end
   end
-  
-  it "should add the kind of advice to the exception message." do
-    aspect = Aspect.new :before, 
-    :pointcut => {:type => InvokeOriginalJoinPointRaisingException, :methods => :raise_exception} do |jp, obj, *args| 
-      jp.invoke_original_join_point
+
+  context "when debug_backtraces is true" do
+    before do
+      @debug_backtraces_orig = Aquarium::Aspects::Advice.debug_backtraces
+      Aquarium::Aspects::Advice.debug_backtraces = true
     end
-    begin
-      InvokeOriginalJoinPointRaisingException.new.raise_exception(:a1, :a2) ; fail
-    rescue InvokeOriginalJoinPointRaisingException::IOJPRException => e
-      e.message.should include("\"before\" advice")
+
+    after do
+      Aquarium::Aspects::Advice.debug_backtraces = @debug_backtraces_orig
     end
-    aspect.unadvise
-  end
 
-  it "should add the \"Class#method\" of the advised object's type and method to the exception message." do
-    aspect = Aspect.new :before, 
+    it "should add the kind of advice to the exception message." do
+      aspect = Aspect.new :before, 
       :pointcut => {:type => InvokeOriginalJoinPointRaisingException, :methods => :raise_exception} do |jp, obj, *args| 
         jp.invoke_original_join_point
+      end
+      begin
+        InvokeOriginalJoinPointRaisingException.new.raise_exception(:a1, :a2) ; fail
+      rescue InvokeOriginalJoinPointRaisingException::IOJPRException => e
+        e.message.should include("\"before\" advice")
+      end
+      aspect.unadvise
     end
-    begin
-      InvokeOriginalJoinPointRaisingException.new.raise_exception(:a1, :a2) ; fail
-    rescue InvokeOriginalJoinPointRaisingException::IOJPRException => e
-      e.message.should include("InvokeOriginalJoinPointRaisingException#raise_exception")
+
+    it "should add the \"Class#method\" of the advised object's type and method to the exception message." do
+      aspect = Aspect.new :before, 
+      :pointcut => {:type => InvokeOriginalJoinPointRaisingException, :methods => :raise_exception} do |jp, obj, *args| 
+        jp.invoke_original_join_point
+      end
+      begin
+        InvokeOriginalJoinPointRaisingException.new.raise_exception(:a1, :a2) ; fail
+      rescue InvokeOriginalJoinPointRaisingException::IOJPRException => e
+        e.message.should include("InvokeOriginalJoinPointRaisingException#raise_exception")
+      end
+      aspect.unadvise
     end
-    aspect.unadvise
-  end
 
-  it "should add the \"Class.method\" of the advised type's class method to the exception message." do
-    aspect = Aspect.new :before, 
+    it "should add the \"Class.method\" of the advised type's class method to the exception message." do
+      aspect = Aspect.new :before, 
       :pointcut => {:type => InvokeOriginalJoinPointRaisingException, :methods => :class_raise_exception, 
-      :method_options => [:class]} do |jp, obj, *args| 
+        :method_options => [:class]} do |jp, obj, *args| 
         jp.invoke_original_join_point
+      end
+      begin
+        InvokeOriginalJoinPointRaisingException.class_raise_exception(:a1, :a2) ; fail
+      rescue InvokeOriginalJoinPointRaisingException::IOJPRException => e
+        e.message.should include("InvokeOriginalJoinPointRaisingException.class_raise_exception")
+      end
+      aspect.unadvise
     end
-    begin
-      InvokeOriginalJoinPointRaisingException.class_raise_exception(:a1, :a2) ; fail
-    rescue InvokeOriginalJoinPointRaisingException::IOJPRException => e
-      e.message.should include("InvokeOriginalJoinPointRaisingException.class_raise_exception")
-    end
-    aspect.unadvise
   end
 
   it "should rethrow an exception of the same type as the original exception." do

data/spec/aquarium/aspects/aspect_invocation_spec.rb

@@ -5,7 +5,7 @@ require 'aquarium/aspects/aspect'
 require 'aquarium/dsl'
 require 'aquarium/utils/array_utils'
 require 'aquarium/finders/pointcut_finder_spec_test_classes'
-
+require 'stringio'
 require 'profiler'
 
 include Aquarium::Aspects
@@ -156,6 +156,7 @@ describe Aspect, "methods" do
       aspect = Aspect.new(:after, :default_objects => object1, :object => object2, :method => :public_test_method) {true}
       aspect.join_points_matched.size.should == 1
       aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == object1}
+      aspect.unadvise
     end
 
     it "should ignore the :default_objects if at least one other :object is given and the :default_objects are types." do
@@ -164,6 +165,7 @@ describe Aspect, "methods" do
         :object => object, :method => :public_test_method) {true}
       aspect.join_points_matched.size.should == 1
       aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == Aquarium::AspectInvocationTestClass}
+      aspect.unadvise
     end
 
     it "should ignore the :default_objects if at least one :pointcut is given even if the :default_objects => object are given." do
@@ -172,6 +174,7 @@ describe Aspect, "methods" do
         :pointcut => {:type => Aquarium::AspectInvocationTestClass2, :method => :public_test_method}, :method => :public_test_method) {true}
       aspect.join_points_matched.size.should == 1
       aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == object}
+      aspect.unadvise
     end
 
     it "should ignore the :default_objects if at least one :pointcut is given even if the :default_objects => type are given." do
@@ -179,6 +182,7 @@ describe Aspect, "methods" do
         :pointcut => {:type => Aquarium::AspectInvocationTestClass2, :method => :public_test_method}, :method => :public_test_method) {true}
       aspect.join_points_matched.size.should == 1
       aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == Aquarium::AspectInvocationTestClass}
+      aspect.unadvise
     end
 
     it "should ignore the :default_objects if at least one :join_point is given and the :default_objects are objects." do
@@ -187,6 +191,7 @@ describe Aspect, "methods" do
       aspect = Aspect.new(:after, :default_objects => object, :join_point => join_point, :method => :public_test_method) {true}
       aspect.join_points_matched.size.should == 1
       aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == object}
+      aspect.unadvise
     end
 
     it "should ignore the :default_objects if at least one :join_point is given and the :default_objects are types." do
@@ -194,6 +199,7 @@ describe Aspect, "methods" do
       aspect = Aspect.new(:after, :default_objects => Aquarium::AspectInvocationTestClass, :join_point => join_point, :method => :public_test_method) {true}
       aspect.join_points_matched.size.should == 1
       aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == Aquarium::AspectInvocationTestClass}
+      aspect.unadvise
     end
 
     [:type, :type_and_descendents, :type_and_ancestors, :type_and_nested_types].each do |type_key|
@@ -202,18 +208,21 @@ describe Aspect, "methods" do
         aspect = Aspect.new(:after, :default_objects => object, type_key => Aquarium::AspectInvocationTestClass2, :method => :public_test_method, :method => :public_test_method) {true}
         aspect.join_points_matched.size.should == 1
         aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == object}
+        aspect.unadvise
       end
 
       it "should ignore the :default_objects if at least one :#{type_key} is given and the :default_objects are types." do
         aspect = Aspect.new(:after, :default_objects => Aquarium::AspectInvocationTestClass, type_key => Aquarium::AspectInvocationTestClass2, :method => :public_test_method, :method => :public_test_method) {true}
         aspect.join_points_matched.size.should == 1
         aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == Aquarium::AspectInvocationTestClass}
+        aspect.unadvise
       end
     end
 
     Aspect::CANONICAL_OPTIONS["default_objects"].each do |key|
       it "should accept :#{key} as a synonym for :default_objects." do
         aspect = Aspect.new(:after, key.intern => Aquarium::AspectInvocationTestClass.new, :method => :public_test_method, :noop => true) {true}
+        aspect.unadvise
       end
     end
   
@@ -234,17 +243,20 @@ describe Aspect, "methods" do
       aspect = Aspect.new(:after, :default_objects => object, :named_pointcut => {:types => Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1}) {true}
       aspect.join_points_matched.size.should == 1
       aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == object}
+      aspect.unadvise
     end
 
     it "should ignore the :default_objects if at least one :named_pointcut is given even if the :default_objects => type are given." do
       aspect = Aspect.new(:after, :default_objects => Aquarium::AspectInvocationTestClass, :named_pointcut => {:types => Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1}) {true}
       aspect.join_points_matched.size.should == 1
       aspect.join_points_matched.each {|jp| jp.type_or_object.should_not == Aquarium::AspectInvocationTestClass}
+      aspect.unadvise
     end
 
     Aspect::CANONICAL_OPTIONS["named_pointcuts"].each do |key|
       it "should accept :#{key} as a synonym for :named_pointcuts." do
-        lambda { Aspect.new :before, key.intern => {:types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes}, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, key.intern => {:types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes}, :noop => true do; end
+        aspect.unadvise
       end
     end
 
@@ -265,7 +277,8 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["types"].each do |key|
       it "should accept :#{key} as a synonym for :types." do
-        lambda { Aspect.new :before, key.intern => Aquarium::AspectInvocationTestClass, :method => :public_test_method, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, key.intern => Aquarium::AspectInvocationTestClass, :method => :public_test_method, :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -281,7 +294,8 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["pointcuts"].each do |key|
       it "should accept :#{key} as a synonym for :pointcuts." do
-        lambda { Aspect.new :before, key.intern => {:type => Aquarium::AspectInvocationTestClass, :method => :public_test_method}, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, key.intern => {:type => Aquarium::AspectInvocationTestClass, :method => :public_test_method}, :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -299,7 +313,8 @@ describe Aspect, "methods" do
     Aspect::CANONICAL_OPTIONS["objects"].each do |key|
       it "should accept :#{key} as a synonym for :objects." do
         object = Aquarium::AspectInvocationTestClass.new
-        lambda { Aspect.new :before, key.intern => object, :method => :public_test_method, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, key.intern => object, :method => :public_test_method, :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -315,7 +330,8 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["methods"].each do |key|
       it "should accept :#{key} as a synonym for :methods." do
-        lambda { Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, key.intern => :public_test_method, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, key.intern => :public_test_method, :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -1475,23 +1491,28 @@ describe Aspect, "methods" do
     end
 
     it "should accept an argument list matching |jp, object, *args|." do
-      lambda { Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do |jp, object, *args|; end }.should_not raise_error(Exception)
+      aspect = Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do |jp, object, *args|; end
+      aspect.unadvise
     end
 
     it "should accept an argument list matching |jp, object|." do
-      lambda { Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do |jp, object|; end }.should_not raise_error(Exception)
+      aspect = Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do |jp, object|; end
+      aspect.unadvise
     end
 
     it "should accept an argument list matching |jp|." do
-      lambda { Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do |jp|; end }.should_not raise_error(Exception)
+      aspect = Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do |jp|; end
+      aspect.unadvise
     end
 
     it "should accept an argument list matching ||." do
-      lambda { Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do ||; end }.should_not raise_error(Exception)
+      aspect = Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do ||; end
+      aspect.unadvise
     end
 
     it "should accept no argument list." do
-      lambda { Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do; end }.should_not raise_error(Exception)
+      aspect = Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method, :noop => true do; end
+      aspect.unadvise
     end
   end
   
@@ -1561,7 +1582,8 @@ describe Aspect, "methods" do
   
     Aspect::CANONICAL_OPTIONS["exclude_types"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_types." do
-        lambda { Aspect.new :before, :types => @all_types, key.intern => @excluded_types, :methods => :doit, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, :types => @all_types, key.intern => @excluded_types, :methods => :doit, :noop => true do; end
+        aspect.unadvise
       end
     end
 
@@ -1571,7 +1593,8 @@ describe Aspect, "methods" do
   
     Aspect::CANONICAL_OPTIONS["exclude_types_and_ancestors"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_types_and_ancestors." do
-        lambda { Aspect.new :before, :types => @all_types, key.intern => @excluded_types, :methods => :doit, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, :types => @all_types, key.intern => @excluded_types, :methods => :doit, :noop => true do; end
+        aspect.unadvise
       end
     end
 
@@ -1581,7 +1604,8 @@ describe Aspect, "methods" do
   
     Aspect::CANONICAL_OPTIONS["exclude_types_and_descendents"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_types_and_descendents." do
-        lambda { Aspect.new :before, :types => @all_types, key.intern => @excluded_types, :methods => :doit, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, :types => @all_types, key.intern => @excluded_types, :methods => :doit, :noop => true do; end
+        aspect.unadvise
       end
     end
 
@@ -1591,7 +1615,8 @@ describe Aspect, "methods" do
   
     Aspect::CANONICAL_OPTIONS["exclude_types_and_nested_types"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_types_and_nested_types." do
-        lambda { Aspect.new :before, :types => @all_types, key.intern => @excluded_types, :methods => :doit, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, :types => @all_types, key.intern => @excluded_types, :methods => :doit, :noop => true do; end
+        aspect.unadvise
       end
     end
 
@@ -1631,7 +1656,8 @@ describe Aspect, "methods" do
   
     Aspect::CANONICAL_OPTIONS["exclude_objects"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_objects." do
-        lambda { Aspect.new :before, :objects => @all_objects, key.intern => @excluded_objects, :methods => :doit, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, :objects => @all_objects, key.intern => @excluded_objects, :methods => :doit, :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -1674,7 +1700,8 @@ describe Aspect, "methods" do
   
     Aspect::CANONICAL_OPTIONS["exclude_join_points"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_join_points." do
-        lambda { Aspect.new :before, :objects => @all_objects, key.intern => @excluded_join_points, :methods => :doit, :noop => true do; end }.should_not raise_error
+        aspect = Aspect.new :before, :objects => @all_objects, key.intern => @excluded_join_points, :methods => :doit, :noop => true do; end
+        aspect.unadvise
       end
     end
   end  
@@ -1836,7 +1863,8 @@ describe Aspect, "methods" do
   
     Aspect::CANONICAL_OPTIONS["exclude_pointcuts"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_pointcuts." do
-        lambda {aspect = Aspect.new :before, :objects => @all_objects, key.intern => @excluded_pointcuts, :methods => :doit, :noop => true do; end}.should_not raise_error
+        aspect = Aspect.new :before, :objects => @all_objects, key.intern => @excluded_pointcuts, :methods => :doit, :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -1931,9 +1959,10 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["exclude_named_pointcuts"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_named_pointcuts." do
-        lambda {aspect = Aspect.new :before,  :pointcuts => Aquarium::PointcutFinderTestClasses.all_pointcuts, 
+        aspect = Aspect.new :before,  :pointcuts => Aquarium::PointcutFinderTestClasses.all_pointcuts, 
           key.intern => {:matching => /POINTCUT/, :in_types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes},
-          :noop => true do; end}.should_not raise_error
+          :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -1968,8 +1997,9 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["exclude_types"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_types." do
-        lambda {aspect = Aspect.new :before,  :pointcuts => [@pointcut1, @pointcut2], key.intern => @excluded_types,
-          :noop => true do; end}.should_not raise_error
+        aspect = Aspect.new :before,  :pointcuts => [@pointcut1, @pointcut2], key.intern => @excluded_types,
+          :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -1993,8 +2023,9 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["exclude_types_and_ancestors"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_types_and_ancestors." do
-        lambda {aspect = Aspect.new :before,  :pointcuts => @pointcut1, key.intern => @excluded_types,
-          :noop => true do; end}.should_not raise_error
+        aspect = Aspect.new :before,  :pointcuts => @pointcut1, key.intern => @excluded_types,
+          :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -2014,8 +2045,9 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["exclude_types_and_descendents"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_types_and_descendents." do
-        lambda {aspect = Aspect.new :before, :pointcuts => @pointcut1, key.intern => @excluded_types,
-          :ignore_no_matching_join_points => true, :noop => true do; end}.should_not raise_error
+        aspect = Aspect.new :before, :pointcuts => @pointcut1, key.intern => @excluded_types,
+          :ignore_no_matching_join_points => true, :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -2035,8 +2067,9 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["exclude_types_and_nested_types"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_types_and_nested_types." do
-        lambda {aspect = Aspect.new :before, :pointcuts => @pointcut1, key.intern => @excluded_types,
-          :ignore_no_matching_join_points => true, :noop => true do; end}.should_not raise_error
+        aspect = Aspect.new :before, :pointcuts => @pointcut1, key.intern => @excluded_types,
+          :ignore_no_matching_join_points => true, :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -2075,8 +2108,9 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["exclude_objects"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_objects." do
-        lambda {aspect = Aspect.new :before, :pointcuts => [@pointcut1, @pointcut2], key.intern => @excluded_objects,
-          :noop => true do; end}.should_not raise_error
+        aspect = Aspect.new :before, :pointcuts => [@pointcut1, @pointcut2], key.intern => @excluded_objects,
+          :noop => true do; end
+        aspect.unadvise
       end
     end
   end
@@ -2135,7 +2169,8 @@ describe Aspect, "methods" do
 
     Aspect::CANONICAL_OPTIONS["exclude_methods"].each do |key|
       it "should accept :#{key} as a synonym for :exclude_methods." do
-        lambda { Aspect.new :before, :pointcuts => [@pointcut1, @pointcut2, @pointcut3, @pointcut4], key.intern => :doit3, :noop => true }.should_not raise_error
+        aspect = Aspect.new :before, :pointcuts => [@pointcut1, @pointcut2, @pointcut3, @pointcut4], key.intern => :doit3, :noop => true
+        aspect.unadvise
       end
     end