aquarium 0.4.1 → 0.4.2

data/spec/aquarium/aspects/pointcut_spec.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_types'
+require File.dirname(__FILE__) + '/../utils/type_utils_sample_nested_types'
 require 'aquarium/utils/invalid_options'
 require 'aquarium/extensions/hash'
 require 'aquarium/aspects/join_point'
@@ -95,7 +96,7 @@ end
 
 def ignored_join_point jp
   # Ignore any types introduced by RSpec, other Aquarium types, and the "pretty printer" module (which Rake uses?)
-  jp.target_type.name =~ /^Spec/ or jp.target_type.name =~ /^Aquarium::(Aspects|Extras|Utils)/ or jp.target_type.name =~ /^PP/
+  jp.target_type.name =~ /^Spec/ or jp.target_type.name =~ /^Aquarium::(Aspects|Extras|Utils|PointcutFinderTestClasses)/ or jp.target_type.name =~ /^PP/
 end
 
 describe Pointcut, "methods" do
@@ -313,6 +314,28 @@ describe Pointcut, "methods" do
     end
   end
   
+  describe Pointcut, ".new (types and their nested types)" do
+    before(:each) do
+      before_pointcut_module_spec
+    end
+
+    it "should match types specified and their nested types." do
+      pc = Pointcut.new :types_and_nested_types => Aquarium::NestedTestTypes, :methods => :all, :method_options => :exclude_ancestor_methods
+      expected_types = Aquarium::NestedTestTypes.nested_in_NestedTestTypes[Aquarium::NestedTestTypes]
+      pc.join_points_matched.size.should == expected_types.size
+      pc.join_points_matched.each do |jp|
+        expected_types.should include(jp.target_type)
+      end
+      pc.join_points_not_matched.size.should == 0
+    end
+
+    Aspect::CANONICAL_OPTIONS["types_and_nested_types"].reject{|key| key.eql?("types_and_nested_types")}.each do |key|
+      it "should accept :#{key} as a synonym for :types_and_nested_types." do
+        lambda {Pointcut.new key.intern => /^Module.*Method/, :methods => :all, :noop => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+      end
+    end
+  end
+  
   describe Pointcut, ".new (objects specified)" do
     before(:each) do
       before_pointcut_class_spec

data/spec/aquarium/dsl/aspect_dsl_spec.rb

@@ -559,25 +559,25 @@ describe "Aquarium::DSL" do
       PC2::POINTCUT.join_points_not_matched.should == pointcut2.join_points_not_matched
     end
   end
-  
-  class OldDSLClass
-    include Aquarium::Aspects::DSL::AspectDSL
+end
+
+class OldDSLClass
+  include Aquarium::Aspects::DSL::AspectDSL
+end
+describe "DSL methods available through the old package Aquarium::Aspects::DSL::AspectDSL" do    
+  before :each do
+    @dsl = OldDSLClass.new
+    @advice = proc {|jp, obj, *args| "advice"}
+    @aspects = []
+  end
+  after :each do
+    @aspects.each {|a| a.unadvise}
   end
-  describe "DSL methods available through the old package Aquarium::Aspects::DSL::AspectDSL" do    
-    before :each do
-      @dsl = OldDSLClass.new
-      @advice = proc {|jp, obj, *args| "advice"}
-      @aspects = []
-    end
-    after :each do
-      @aspects.each {|a| a.unadvise}
-    end
 
-    it "should be equivalent to advice kind :around." do
-      @aspects << OldDSLClass.advise(:around, :noop => true, :pointcut => @pointcut_opts, &@advice)
-      @aspects << OldDSLClass.around(         :noop => true, :pointcut => @pointcut_opts, &@advice)
-      @aspects[1].should == @aspects[0]
-    end
+  it "should be equivalent to advice kind :around." do
+    @aspects << OldDSLClass.advise(:around, :noop => true, :pointcut => @pointcut_opts, &@advice)
+    @aspects << OldDSLClass.around(         :noop => true, :pointcut => @pointcut_opts, &@advice)
+    @aspects[1].should == @aspects[0]
   end
 end
 

data/spec/aquarium/finders/method_finder_spec.rb

@@ -79,6 +79,7 @@ end
 
 describe Aquarium::Finders::MethodFinder, "#find (synonymous input parameters)" do
   before(:each) do
+    @logger_stream = StringIO.new
     before_method_finder_spec
   end
   
@@ -109,11 +110,16 @@ describe Aquarium::Finders::MethodFinder, "#find (synonymous input parameters)"
   
   Aquarium::Finders::MethodFinder::CANONICAL_OPTIONS["method_options"].each do |key|
     it "should accept :#{key} as a synonym for :method_options." do
-      expected = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mder/, /^mmod/], :method_options => [:exclude_ancestor_methods]
-      actual   = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mder/, /^mmod/], key.intern => [:exclude_ancestor_methods]
+      expected = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mder/, /^mmod/], :method_options => [:exclude_ancestor_methods], :logger_stream => @logger_stream
+      actual   = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mder/, /^mmod/], key.intern => [:exclude_ancestor_methods], :logger_stream => @logger_stream
       actual.should == expected
     end
   end
+
+  it "should warn that :options as a synonym for :method_options is deprecated." do
+    expected = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mder/, /^mmod/], :options => [:exclude_ancestor_methods], :logger_stream => @logger_stream
+    @logger_stream.to_s.grep(/WARN.*deprecated/).should_not be_nil
+  end
   
 end
   

data/spec/aquarium/finders/pointcut_finder_spec.rb

@@ -0,0 +1,193 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'aquarium/dsl'
+require 'aquarium/finders/pointcut_finder'
+require File.dirname(__FILE__) + '/pointcut_finder_spec_test_classes'
+
+describe Aquarium::Finders::PointcutFinder, "#find with invalid invocation parameters" do
+  it "should raise if no options are specified." do
+    lambda { Aquarium::Finders::PointcutFinder.new.find}.should raise_error(Aquarium::Utils::InvalidOptions)
+  end
+  it "should raise if no type options are specified." do
+    lambda { Aquarium::Finders::PointcutFinder.new.find :matching => :foo}.should raise_error(Aquarium::Utils::InvalidOptions)
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with valid type invocation parameters" do
+  it "should accept :types with a single type." do
+    lambda { Aquarium::Finders::PointcutFinder.new.find :types => Aquarium::PointcutFinderTestClasses::PointcutConstantHolder1, :noop => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+  end
+  it "should accept :types with an array of types." do
+    lambda { Aquarium::Finders::PointcutFinder.new.find :types => [Aquarium::PointcutFinderTestClasses::PointcutConstantHolder1, Aquarium::PointcutFinderTestClasses::PointcutConstantHolder2], :noop => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+  end
+  it "should accept :types with a regular expression for types." do
+    lambda { Aquarium::Finders::PointcutFinder.new.find :types => /Aquarium::PointcutFinderTestClasses::PointcutConstantHolder/, :noop => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+  end
+  Aquarium::Finders::PointcutFinder::CANONICAL_OPTIONS["types"].each do |synonym|
+    it "should accept :#{synonym} as a synonym for :types." do
+      lambda { Aquarium::Finders::PointcutFinder.new.find synonym.intern => /Aquarium::PointcutFinderTestClasses::PointcutConstantHolder/, :noop => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+    end
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with nonexistent types specified" do
+  it "should return an empty FinderResult." do
+    found = Aquarium::Finders::PointcutFinder.new.find :types => /UndefinedType/
+    found.matched.should be_empty
+    found.not_matched.keys.should eql([/UndefinedType/])
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with no pointcut name parameter" do
+  it "should return all constant and class variable pointcuts in the specified types." do
+    found = Aquarium::Finders::PointcutFinder.new.find :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_pointcuts
+  end
+end
+
+variants = {'constant and class variable ' => '', 'constant ' => 'constants_', 'class variable ' => 'class_variables_'}.each do |name, prefix|
+  describe Aquarium::Finders::PointcutFinder, "#find with valid #{name}name invocation parameters" do
+    it "should accept :#{prefix}matching => :all and match all #{name} pointcuts in the specified types." do
+      found = Aquarium::Finders::PointcutFinder.new.find "#{prefix}matching".intern => :all, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+      Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, eval("Aquarium::PointcutFinderTestClasses.all_#{prefix}pointcuts")
+    end
+    it "should accept :#{prefix}matching with a single pointcut name." do
+      lambda { Aquarium::Finders::PointcutFinder.new.find "#{prefix}matching".intern => :POINTCUT1, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes, :noop => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+    end
+    it "should accept :#{prefix}matching with an array of pointcut names." do
+      lambda { Aquarium::Finders::PointcutFinder.new.find "#{prefix}matching".intern => [:POINTCUT1, :POINTCUT2], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes, :noop => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+    end
+    it "should accept :#{prefix}matching with a regular expression for pointcut names." do
+      lambda { Aquarium::Finders::PointcutFinder.new.find "#{prefix}matching".intern => /POINTCUT/, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes, :noop => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+    end
+    Aquarium::Finders::PointcutFinder::CANONICAL_OPTIONS["#{prefix}matching"].each do |synonym|
+      it "should accept :#{synonym} as a synonym for :#{prefix}matching." do
+        lambda { Aquarium::Finders::PointcutFinder.new.find synonym.intern => /POINTCUT/, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes, :noop => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+      end
+    end
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with :matching => single pointcut name" do
+  it "should return all constant and class variable pointcuts that match the specified name exactly." do
+    found = Aquarium::Finders::PointcutFinder.new.find :matching => :POINTCUT1, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, [Aquarium::PointcutFinderTestClasses::PointcutConstantHolder1::POINTCUT1]
+    found = Aquarium::Finders::PointcutFinder.new.find :matching => :pointcut1, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, [Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1.pointcut1]
+  end
+end
+describe Aquarium::Finders::PointcutFinder, "#find with :constants_matching => single pointcut name" do
+  it "should return all constant pointcuts and no class variable pointcuts that match the specified name exactly." do
+    found = Aquarium::Finders::PointcutFinder.new.find :constants_matching => :POINTCUT1, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, [Aquarium::PointcutFinderTestClasses::PointcutConstantHolder1::POINTCUT1]
+    found = Aquarium::Finders::PointcutFinder.new.find :constants_matching => :pointcut1, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, []
+  end
+end
+describe Aquarium::Finders::PointcutFinder, "#find with :class_variables_matching => single pointcut name" do
+  it "should return all class variable pointcuts and no constant pointcuts that match the specified name exactly." do
+    found = Aquarium::Finders::PointcutFinder.new.find :class_variables_matching => :POINTCUT1, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, []
+    found = Aquarium::Finders::PointcutFinder.new.find :class_variables_matching => :pointcut1, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, [Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1.pointcut1]
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with :matching => /pointcut regexps/" do
+  it "should return all constant and class variable pointcuts that match the specified regular expressions." do
+    found = Aquarium::Finders::PointcutFinder.new.find :matching => /POINTCUT(1+|2)/, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_constants_pointcuts    
+    found = Aquarium::Finders::PointcutFinder.new.find :matching => /pointcut1/, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_class_variables_pointcuts
+  end
+end
+describe Aquarium::Finders::PointcutFinder, "#find with :constants_matching => /pointcut regexps/" do
+  it "should return all constant pointcuts and no class variable pointcuts that match the specified regular expressions." do
+    found = Aquarium::Finders::PointcutFinder.new.find :constants_matching => /POINTCUT(1+|2)/, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_constants_pointcuts    
+    found = Aquarium::Finders::PointcutFinder.new.find :constants_matching => /pointcut1/, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, []
+  end
+end
+describe Aquarium::Finders::PointcutFinder, "#find with :class_variables_matching => /pointcut regexps/" do
+  it "should return all class variable pointcuts and no constant pointcuts that match the specified regular expressions." do
+    found = Aquarium::Finders::PointcutFinder.new.find :class_variables_matching => /POINTCUT(1+|2)/, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, []
+    found = Aquarium::Finders::PointcutFinder.new.find :class_variables_matching => /pointcut1/, :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_class_variables_pointcuts
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with :matching => [pointcut names]" do
+  it "should return all constant and class variable pointcuts that match the specified names exactly." do
+    found = Aquarium::Finders::PointcutFinder.new.find :matching => [:POINTCUT1, :POINTCUT11, :POINTCUT2], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_constants_pointcuts    
+    found = Aquarium::Finders::PointcutFinder.new.find :matching => [:pointcut1, :pointcut11], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_class_variables_pointcuts
+  end
+end
+describe Aquarium::Finders::PointcutFinder, "#find with :constants_matching => [pointcut names]" do
+  it "should return all constant pointcuts and no class variable pointcuts that match the specified names exactly." do
+    found = Aquarium::Finders::PointcutFinder.new.find :constants_matching => [:POINTCUT1, :POINTCUT11, :POINTCUT2], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_constants_pointcuts    
+    found = Aquarium::Finders::PointcutFinder.new.find :constants_matching => [:pointcut1, :pointcut11], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, []
+  end
+end
+describe Aquarium::Finders::PointcutFinder, "#find with :class_variables_matching => [pointcut names]" do
+  it "should return all class variable pointcuts and no constant pointcuts that match the specified names and regular expressions." do
+    found = Aquarium::Finders::PointcutFinder.new.find :class_variables_matching => [:POINTCUT1, :POINTCUT11, :POINTCUT2], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, []
+    found = Aquarium::Finders::PointcutFinder.new.find :class_variables_matching => [:pointcut1, :pointcut11], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_class_variables_pointcuts
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with :matching => [pointcut names and regular expressions]" do
+  it "should return all constant and class variable pointcuts that match the specified names exactly." do
+    found = Aquarium::Finders::PointcutFinder.new.find :matching => [:POINTCUT1, :POINTCUT11, /CUT2/], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_constants_pointcuts    
+    found = Aquarium::Finders::PointcutFinder.new.find :matching => [:pointcut1, /cut11$/], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_class_variables_pointcuts
+  end
+end
+describe Aquarium::Finders::PointcutFinder, "#find with :constants_matching => [pointcut names and regular expressions]" do
+  it "should return all constant pointcuts and no class variable pointcuts that match the specified names and regular expressions." do
+    found = Aquarium::Finders::PointcutFinder.new.find :constants_matching => [:POINTCUT1, :POINTCUT11, /CUT2/], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_constants_pointcuts    
+    found = Aquarium::Finders::PointcutFinder.new.find :constants_matching => [:pointcut1, /cut11$/], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, []
+  end
+end
+describe Aquarium::Finders::PointcutFinder, "#find with :class_variables_matching => [pointcut names and regular expressions]" do
+  it "should return all class variable pointcuts and no constant pointcuts that match the specified names and regular expressions." do
+    found = Aquarium::Finders::PointcutFinder.new.find :class_variables_matching => [:POINTCUT1, :POINTCUT11, /CUT2/], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, []
+    found = Aquarium::Finders::PointcutFinder.new.find :class_variables_matching => [:pointcut1, /cut11$/], :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_class_variables_pointcuts
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with any combination of :matching, :constant_matching, and/or :class_variables_matching" do
+  it "should return the union of all matching pointcuts." do
+    found = Aquarium::Finders::PointcutFinder.new.find :types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes,
+      :matching => [:POINTCUT1], 
+      :constants_matching => /CUT[12]/, 
+      :class_variables_matching => /pointcut/
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, Aquarium::PointcutFinderTestClasses.all_pointcuts
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with :types_and_descendents." do
+  it "should return the matching pointcuts in the hierarchy." do
+    found = Aquarium::Finders::PointcutFinder.new.find :types_and_descendents => Aquarium::PointcutFinderTestClasses::ParentOfPointcutHolder
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, [Aquarium::PointcutFinderTestClasses::PointcutConstantHolderChild::POINTCUT]
+  end
+end
+
+describe Aquarium::Finders::PointcutFinder, "#find with :types_and_ancestors." do
+  it "should return the matching pointcuts in the hierarchy." do
+    found = Aquarium::Finders::PointcutFinder.new.find :types_and_ancestors => Aquarium::PointcutFinderTestClasses::DescendentOfPointcutConstantHolderChild
+    Aquarium::PointcutFinderTestClasses.found_pointcuts_should_match found, [Aquarium::PointcutFinderTestClasses::PointcutConstantHolderChild::POINTCUT]
+  end
+end
+

data/spec/aquarium/finders/pointcut_finder_spec_test_classes.rb

@@ -0,0 +1,90 @@
+
+module Aquarium
+  module PointcutFinderTestClasses
+    class PointcutConstantHolder1
+      include Aquarium::DSL
+      def mc1; end
+      def doit; mc1; end
+      POINTCUT1 = pointcut :calls_to => :mc1 unless const_defined?("POINTCUT1") 
+    end
+    class PointcutConstantHolder2
+      include Aquarium::DSL
+      def mc2; end
+      def doit; mc2; end
+      POINTCUT2 = pointcut :calls_to => :mc2 unless const_defined?("POINTCUT2")
+    end
+    class PointcutClassVariableHolder1
+      include Aquarium::DSL
+      def mcv1; end
+      def doit; mcv1; end
+      @@pointcut1 = pointcut :calls_to => :mcv1
+      def self.pointcut1; @@pointcut1; end
+    end
+    class OuterPointcutHolder
+      class NestedPointcutConstantHolder1
+        include Aquarium::DSL
+        def mc11; end
+        def doit; mc11; end
+        POINTCUT11 = pointcut :calls_to => :mc11 unless const_defined?("POINTCUT11")
+      end
+      class NestedPointcutClassVariableHolder1
+        include Aquarium::DSL
+        def mcv11; end
+        def doit; mcv11; end
+        @@pointcut11 = pointcut :calls_to => :mcv11
+        def self.pointcut11; @@pointcut11; end
+      end
+    end
+    class ParentOfPointcutHolder; end
+    class PointcutConstantHolderChild < ParentOfPointcutHolder
+      include Aquarium::DSL
+      def mc; end
+      def doit; mc; end
+      POINTCUT = pointcut :calls_to => :mc unless const_defined?("POINTCUT")
+    end
+    class DescendentOfPointcutConstantHolderChild < PointcutConstantHolderChild; end
+  
+    def self.sort_pc_array pc_array
+      pc_array.sort{|x,y| x.object_id <=> y.object_id}
+    end
+    def self.found_pointcuts_should_match found_result_set, expected_found_pc_array, expected_not_found_type_array = []
+      found_result_set.matched.size.should == expected_found_pc_array.size
+      found_result_set.not_matched.size.should == expected_not_found_type_array.size
+      self.sort_pc_array(found_result_set.found_pointcuts).should == expected_found_pc_array
+    end
+
+    def self.all_pointcut_classes
+      [Aquarium::PointcutFinderTestClasses::PointcutConstantHolder1, 
+       Aquarium::PointcutFinderTestClasses::PointcutConstantHolder2,
+       Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1,  
+       Aquarium::PointcutFinderTestClasses::OuterPointcutHolder::NestedPointcutConstantHolder1, 
+       Aquarium::PointcutFinderTestClasses::OuterPointcutHolder::NestedPointcutClassVariableHolder1]
+    end
+    def self.all_constants_pointcut_classes
+      [Aquarium::PointcutFinderTestClasses::PointcutConstantHolder1, 
+       Aquarium::PointcutFinderTestClasses::PointcutConstantHolder2,
+       Aquarium::PointcutFinderTestClasses::OuterPointcutHolder::NestedPointcutConstantHolder1]
+    end
+    def self.all_class_variables_pointcut_classes
+      [Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1,  
+       Aquarium::PointcutFinderTestClasses::OuterPointcutHolder::NestedPointcutClassVariableHolder1]
+    end
+
+    def self.all_pointcuts
+      sort_pc_array [Aquarium::PointcutFinderTestClasses::PointcutConstantHolder1::POINTCUT1, 
+       Aquarium::PointcutFinderTestClasses::PointcutConstantHolder2::POINTCUT2,
+       Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1.pointcut1,  
+       Aquarium::PointcutFinderTestClasses::OuterPointcutHolder::NestedPointcutConstantHolder1::POINTCUT11, 
+       Aquarium::PointcutFinderTestClasses::OuterPointcutHolder::NestedPointcutClassVariableHolder1.pointcut11]
+    end
+    def self.all_constants_pointcuts
+      sort_pc_array [Aquarium::PointcutFinderTestClasses::PointcutConstantHolder1::POINTCUT1, 
+       Aquarium::PointcutFinderTestClasses::PointcutConstantHolder2::POINTCUT2,
+       Aquarium::PointcutFinderTestClasses::OuterPointcutHolder::NestedPointcutConstantHolder1::POINTCUT11]
+    end
+    def self.all_class_variables_pointcuts
+      sort_pc_array [Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1.pointcut1,  
+       Aquarium::PointcutFinderTestClasses::OuterPointcutHolder::NestedPointcutClassVariableHolder1.pointcut11]
+    end
+  end
+end

data/spec/aquarium/finders/type_finder_spec.rb

@@ -229,6 +229,23 @@ describe Aquarium::Finders::TypeFinder, "#find with :types_and_ancestors" do
   end  
 end
 
+describe Aquarium::Finders::TypeFinder, "#each returns found types" do
+  it "should return only types that were found" do
+    expected_found_types  = [Class, Kernel, Module, Object]
+    expected_unfound_exps = %w[TestCase Unknown1 Unknown2]
+    actual = Aquarium::Finders::TypeFinder.new.find :types=> %w[Kernel Module Object Class TestCase Unknown1 Unknown2]
+    actual.each {|t| expected_found_types.include?(t) and not expected_unfound_exps.include?(t.name)}
+  end
+
+  it "should return the same types returned by #matched_keys" do
+    expected_found_types  = [Class, Kernel, Module, Object]
+    expected_unfound_exps = %w[TestCase Unknown1 Unknown2]
+    actual = Aquarium::Finders::TypeFinder.new.find :types=> %w[Kernel Module Object Class TestCase Unknown1 Unknown2]
+    actual.each {|t| actual.matched_keys.include?(t)}
+    count = actual.inject(0) {|count, t| count += 1}
+    count.should == actual.matched_keys.size 
+  end
+end
 
 # This is a spec for a protected method. It's primarily to keep the code coverage 100%, because there is rarely-invoked error handling code...
 describe Aquarium::Finders::TypeFinder, "#get_type_from_parent should" do

data/spec/aquarium/finders/type_finder_with_descendents_and_ancestors_spec.rb

@@ -5,14 +5,14 @@ require 'aquarium/finders/type_finder'
 include Aquarium::Utils
   
 def purge_actuals actuals
-  # Remove extra stuff inserted by RSpec, Aquarium, and "pretty printer" (rake?), possibly in other specs! (TODO undo those when finished...)
+  # Remove extra stuff inserted by RSpec, Aquarium, and "pretty printer" (rake?), possibly in other specs! 
   actuals.matched_keys.reject do |t2| 
-    t2.name.include?("Spec::") or t2.name =~ /Aquarium::(Utils|Extras|Examples|Aspects)/ or t2.name =~ /^PP/
+    t2.name.include?("Spec::") or t2.name =~ /Aquarium::(Utils|Extras|Examples|Aspects|PointcutFinderTestClasses)/ or t2.name =~ /^PP/
   end
 end
 
 describe TypeUtils, "#find types and their descendents, using :types_and_descendents" do
-  it "should find the matching types and their descendent subclasses, even in different nested modules." do
+  it "should find the matching types and their descendent subtypes, even in different nested modules." do
     TypeUtils.sample_types.each do |t|
       actual = Aquarium::Finders::TypeFinder.new.find :types_and_descendents => (t.name)
       actual_keys = purge_actuals actual
@@ -29,7 +29,7 @@ describe TypeUtils, "#find types and their descendents, using :types_and_descend
 end
 
 describe TypeUtils, "#find types subtracting out excluded types and descendents, using :exclude_types_and_descendents" do
-  it "should find the matching types and their descendent subclasses, minus the excluded type hierarchies." do
+  it "should find the matching types and their descendent subtypes, minus the excluded type hierarchies." do
     actual = Aquarium::Finders::TypeFinder.new.find :types_and_descendents => ModuleForDescendents, :exclude_types_and_descendents => D1ForDescendents
     actual_keys = purge_actuals actual
     expected = TypeUtils.sample_types_descendents[ModuleForDescendents].reject do |c|