lib/lemon/test/suite.rb in lemon-0.6 vs lib/lemon/test/suite.rb in lemon-0.7.0

@@ -6,10 +6,13 @@
 
   # Test Suites encapsulate a set of test cases.
   #
   class Suite
 
+    # Files from which the suite is loaded.
+    attr :files
+
     # Test cases in this suite.
     attr :testcases
 
     # List of concern procedures that apply suite-wide.
     attr :when_clauses
@@ -18,50 +21,124 @@
     attr :before_clauses
 
     # List of post-test procedures that apply suite-wide.
     attr :after_clauses
 
+    ## A snapshot of the system before the suite is loaded.
+    #attr :canonical
+
+    # List of files to be covered. This primarily serves
+    # as a means for allowing one test to load another
+    # and ensuring converage remains accurate.
+    #attr :subtest
+
+    def coverage
+      @final_coveage ||= @coverage - @canonical
+    end
+
     #
-    def initialize(*files)
+    #attr :options
+
+    #
+    def initialize(files, options={})
+      @files          = files.flatten
+      @options        = options
+
+      #@subtest        = []
       @testcases      = []
       @before_clauses = {}
       @after_clauses  = {}
       @when_clauses   = {}
 
-      loadfiles(*files)
+      #load_helpers
+
+      @coverage  = Snapshot.new
+      @canonical = Snapshot.capture
+
+      load_files
+      #load_subtest_helpers
     end
 
     #
-    def loadfiles(*files)
-      Lemon.suite = self
+    def cover?
+      @options[:cover]
+    end
 
-      # directories glob *.rb files
-      files = files.flatten.map do |file|
-        if File.directory?(file)
-          Dir[File.join(file, '**', '*.rb')]
-        else
-          file
-        end
-      end.flatten.uniq
+    #
+    #def load_helpers(*files)
+    #  helpers = []
+    #  filelist.each do |file|
+    #    dir = File.dirname(file)
+    #    hlp = Dir[File.join(dir, '{test_,}helper.rb')]
+    #    helpers.concat(hlp)
+    #  end
+    #
+    #  helpers.each do |hlp|
+    #    require hlp
+    #  end
+    #end
 
-      files.each do |file|
+    #def load_subtest_helpers
+    #  helpers = []
+    #  @subtest.each do |file|
+    #    dir = File.dirname(file)
+    #    hlp = Dir[File.join(dir, '{test_,}helper.rb')]
+    #    helpers.concat(hlp)
+    #  end
+    #
+    #  #s = Snapshot.capture
+    #  helpers.each do |hlp|
+    #    require hlp
+    #  end
+    #  #z = Snapshot.capture
+    #  #d = z - s
+    #  #@canonical << d
+    #end
+
+    #
+    def load_files #(*files)
+      #if cover?
+      #  $stdout << "Load: "
+      #end
+
+      Lemon.suite = self
+      filelist.each do |file|
+        #@current_file = file
         #file = File.expand_path(file)
         #instance_eval(File.read(file), file)
-        load(file)
+        require(file) #load(file)
       end
 
+      #if cover?
+      #  $stdout << "\n"
+      #  $stdout.flush
+      #end
+
       return Lemon.suite
     end
 
-    # Load a helper. This method must be used when loading local
-    # suite support. The usual #require or #load can only be used
-    # for extenal support libraries (such as a test mock framework).
-    # This is so because suite code is not evaluated at the toplevel.
-    def helper(file)
-      instance_eval(File.read(file), file)
+    # Directories glob *.rb files.
+    def filelist
+      @filelist ||= (
+        @files.flatten.map do |file|
+          if File.directory?(file)
+            Dir[File.join(file, '**', '*.rb')]
+          else
+            file
+          end
+        end.flatten.uniq
+      )
     end
 
+    ## Load a helper. This method must be used when loading local
+    ## suite support. The usual #require or #load can only be used
+    ## for extenal support libraries (such as a test mock framework).
+    ## This is so because suite code is not evaluated at the toplevel.
+    #def helper(file)
+    #  instance_eval(File.read(file), file)
+    #end
+
     #
     #def load(file)
     #  instance_eval(File.read(file), file)
     #end
 
@@ -72,17 +149,16 @@
       end
     end
 
     # Define a test case belonging to this suite.
     def Case(target_class, &block)
+      raise "lemon: case target must be a class or module" unless Module === target_class
       testcases << Case.new(self, target_class, &block)
     end
 
     #
     alias_method :TestCase, :Case
-
-    #
     #alias_method :testcase, :Case
 
     # Define a pre-test procedure to apply suite-wide.
     def Before(match=nil, &block)
       @before_clauses[match] = block #<< Advice.new(match, &block)
@@ -99,9 +175,39 @@
 
     # Define a concern procedure to apply suite-wide.
     def When(match=nil, &block)
       @when_clauses[match] = block #<< Advice.new(match, &block)
     end
+
+    # TODO: need require_find() to avoid first snapshot
+    def Covers(file)
+      if cover?
+        #return if $".include?(file)
+        s = Snapshot.capture
+        if require(file)
+          z = Snapshot.capture
+          @coverage << (z - s)
+        end
+      else
+        require file
+      end
+    end
+
+    #
+    def Helper(file)
+      local = File.join(File.dirname(caller[1]), file.to_str + '.rb')
+      if File.exist?(local)
+        require local
+      else
+        require file
+      end
+    end
+
+    #
+    #def Subtest(file)
+    #  @subtest << file
+    #  require file
+    #end
 
     # Iterate through this suite's test cases.
     def each(&block)
       @testcases.each(&block)
     end