uttk 0.3.6.1 → 0.4.5.0

data/lib/uttk/strategies/Package.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/Package.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Package.rb 24394 2006-07-10T07:38:58.276210Z ertai  $
 
 
 module Uttk
@@ -54,14 +54,13 @@ module Uttk
 
         make = {}
 
-        [ Make::Check, Make::DistCheck, Make::Install ].each do |step|
-          step_name = step.target
-          next if skip_step? step_name
+        %w[ check distcheck install ].each do |step|
+          next if skip_step? step
           create(Make) do |build|
-            build.name = "Building #{step_name}"
+            build.name = "Building #{step}"
             build.target = step
             build.fatal = true
-            make[step_name.to_sym] = build
+            make[step.to_sym] = build
           end
         end
 

data/lib/uttk/strategies/PackageCollection.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/PackageCollection.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/PackageCollection.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/Pass.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/Pass.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Pass.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/RUnit.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/RUnit.rb 22102 2006-02-21T23:03:39.538964Z pouillar  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/RUnit.rb 24394 2006-07-10T07:38:58.276210Z ertai  $
 
 
 require 'yaml'
@@ -55,64 +55,80 @@ module Uttk
     # strategy into the YAML input file of Uttk, there is another way that is
     # used in test/unit-suite.yml.
     #
-    class RUnit < CmdBase
+    class RUnit < Strategy
       include Concrete
 
-      protected
       def prologue
-        @command = '<<ruby>> -- <<uttk-unit>> '
+        super
+        @runner = mk_system_runner
+        @command = '<<ruby>>'.to_ocmd << '--' << '<<uttk-unit>>'
         if @verbose
-          @command += '--verbose '
+          @command << '--verbose'
         else
-          @command += '--no-verbose '
-        end
-        @load_path.each { |x| @command += "-I #{x} " }
-        @requires = [@requires] unless @requires.respond_to? :each
-        @requires.each { |x| @command += "-r #{x} " }
-        unless @uttk_unit_options.empty?
-          opts = @uttk_unit_options
-          opts = [opts] unless opts.respond_to? :each
-          opts.each { |x| @command += "#{x} " }
+          @command << '--no-verbose'
         end
-        @command += '-- %i -- --runner yaml -- %a'
-        @quiet_print = true
-        super
+        @load_path.each { |x| @command << '-I' << x }
+        @requires.to_ocmd_args.each { |x| @command << '-r' << x }
+        @command += @uttk_unit_options.to_ocmd_args
+        @command << '--' << @input << '--' << '--runner' << 'yaml'
+        @command.dir = @dir
       end
+      protected :prologue
+
+      def run_impl
+        @data = @command.run @runner
+      end
+      protected :run_impl
 
-      protected
       def assertion
-        result = nil
-        if @error.my.zero?  #FIXME: Shouldn't need to use my here !!
-          if @output.my.zero?
-            skip('No result has been collected probably because no test ' +
-                 'suite has been run')
-          else
-            result = YAML.load(@output.my.read)
-            r = OpenStruct.new(result)
-            @log[:result] = result
-            if r.tests_number == 0
-              skip PassStatus.new.weight, 'No test suite in this file'
-            end
-            if r.failures_number != 0 or r.errors_number != 0
-              rpath = '/^failures$/^default_test/No tests were specified'
-              if r.failures_number == 1 and result.rpath_find :first, rpath
-                skip 'No tests were specified'
-              elsif r.failures_number.zero?
-                fail 'There are errors'
-              elsif r.errors_number.zero?
-                fail 'There are failures'
-              else
-                fail 'There are failures and errors'
-              end
-            end
-            pass
-          end
-        else
-          @error.my.open { |io| result = io.read }
-          raise "Some error occures while running the unit test:\n" + result
+        matcher_result = command_matcher[UM::StreamMatcher, {:error => ''}, @data]
+        @log << matcher_result
+        raise_error('Error output not empty') if matcher_result.failure?
+
+        if @data.output.zero?
+          skip('No result has been collected probably because no test ' +
+               'suite has been run')
+        end
+
+        output = YAML.load @data.output.read
+        @log[:result] = output
+        o = OpenStruct.new output
+
+        if o.tests_number.zero?
+          skip_pass 'No test suite in this file'
+        end
+
+        pass if o.failures_number.zero? and o.errors_number.zero?
+
+        rpath = '/^failures$/^default_test/No tests were specified'
+        if o.failures_number == 1 and output.rpath_find :first, rpath
+          skip 'No tests were specified'
+        elsif o.failures_number.zero?
+          fail 'There are errors'
+        elsif o.errors_number.zero?
+          fail 'There are failures'
         end
+
+        fail 'There are failures and errors'
+      end
+      protected :assertion
+
+      def abort_hook
+        @runner.abort @data if @runner and defined? @data
+        super
       end
+      protected :abort_hook
 
+      def epilogue
+        @data.clean if defined? @data
+        super
+      end
+      protected :epilogue
+
+      attribute :input,     'the input ruby unit test file',
+                            nil, :invisible
+      attribute :dir,       'the directory where to launch the command',
+                            [String, Pathname]
       attribute :load_path, 'directories to add to the $LOAD_PATH variable',
                             :invisible do [] end
       attribute :requires,  'features to require before load the input',
@@ -128,5 +144,3 @@ module Uttk
 
 end # module Uttk
 
-
-

data/lib/uttk/strategies/SignalCmd.rb

@@ -1,7 +1,7 @@
 # Author::    Vincent CUISSARD  <cuissa_v@epita.fr>.
 # Copyright:: Copyright (c) 2005 Uttk Team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/SignalCmd.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/SignalCmd.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/Sleep.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/Sleep.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Sleep.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/SqlQuery.rb

@@ -1,7 +1,7 @@
 # Author::    Vincent Cuissard  <cuissa_v@epita.fr>
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/SqlQuery.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/SqlQuery.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/Strategy.rb

@@ -1,7 +1,7 @@
 # Author::    The Uttk Team.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Strategy.rb 22184 2006-02-23T16:12:25.225774Z pouillar  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Strategy.rb 24392 2006-07-10T07:36:43.181560Z ertai  $
 
 
 require 'set'
@@ -463,6 +463,152 @@ module Uttk
       protected :check_post_assertion
 
 
+      # FIXME move them to separate files
+      def mk_system_runner env={}
+        hooker = StrategyHooker.new @symtbl, @log, env
+        OCmd::Runners::System.new.hooker_subscribe hooker
+      end
+
+      class StrategyHooker
+        include Hooker
+
+        attr_reader :env, :symtbl, :log
+
+        def initialize symtbl, log, env={}
+          @env, @symtbl, @log = env, symtbl, log
+        end
+
+        def display_command cmd
+          cmd.do_symtbl_gsub! @symtbl
+          @log[:running] = cmd.to_sh
+        end
+
+        def before_exec cmd, data
+          env_sub = proc do |k,v|
+            ENV[k.to_s] = v.do_symtbl_gsub(@symtbl).gsub(/\$(\w+)/) { ENV[$1] }
+          end
+          @env.each(&env_sub)
+          @symtbl[:env].each(&env_sub) if @symtbl[:env]
+        end
+
+        def exception_raised_during_exec
+          @data.status = 127
+          fail 'exception raised during exec'
+        end
+
+        def already_killed data
+          @log.already_killed = data.pid
+        end
+
+      end # class StrategyHooker
+
+
+      class CommandMatcher < UM::UnifiedMatcher
+        make Concrete
+        cattr_accessor :stream_matcher
+
+        rule :to_ocmd
+
+        final(Hash, OCmd::Datas::Data) do |ref, my|
+          raise ArgumentError, 'ref is empty' if ref.empty?
+          result = UM::MatcherResults.new
+          for k,v in ref do
+            result << stream_matcher[v, my.send(k), k]
+          end
+          result
+        end
+
+        final(OCmd::Datas::Data, OCmd::Datas::Data) do |ref, my|
+          result = UM::MatcherResults.new
+          result << stream_matcher[ref.status, my.status, 'status']
+          result << stream_matcher[ref.output, my.output, 'output']
+          result << stream_matcher[ref.error, my.error,   'error']
+          result
+        end
+
+        def [] matcher, ref, my, name=nil
+          matcher = matcher.new if matcher.is_a? Class
+          self.stream_matcher = matcher
+          super(ref, my, name)
+        end
+
+      end
+
+      ::UM::StreamMatcher.class_eval do
+        final(NilClass, Object, :message => '') { |ref, my| [ true, nil ] }
+      end
+
+      ::UM::GnuDiffMatcher.runner = OCmd::Runners::System.new
+
+      ::UM::MatcherResults.class_eval do
+        def to_uttk_log log
+          each do |r|
+            log << r
+          end
+        end
+      end
+
+      ::UM::MatcherResult.class_eval do
+        if true
+          def to_uttk_log log
+            raise ArgumentError, "no name for this matcher result" if @name.nil?
+            log.new_node @name do
+              log.reason = message unless message.empty?
+              if data.nil? or data.is_a? MatchData
+                log.my = my.to_s_for_uttk_log unless my.nil?
+                log.ref = ref.to_s_for_uttk_log unless ref.nil?
+              else
+                log.diff = data.output.read
+              end
+            end
+          end
+        else
+          def to_uttk_log log
+            raise ArgumentError, "no name for this matcher result" if @name.nil?
+            log["#{@name}_reason"] = message unless message.empty?
+            if data.nil? or data.is_a? MatchData
+              log["my_#@name"] = my.to_s_for_uttk_log unless my.nil?
+              log["ref_#@name"] = ref.to_s_for_uttk_log unless ref.nil?
+            else
+              log["#{@name}_diff"] = data.output.read
+            end
+          end
+        end
+      end
+
+      ::OCmd::Commands::Command.class_eval do
+        def symtbl_gsub! symtbl
+          res = @command.symtbl_gsub!(symtbl)
+          res = @args.symtbl_gsub!(symtbl) || res
+          res = @dir.symtbl_gsub!(symtbl) || res
+          (res)? self : nil
+        end
+        def symtbl_gsub symtbl
+          command = @command.symtbl_gsub symtbl
+          args = @args.symtbl_gsub symtbl
+          dir = @dir.symtbl_gsub symtbl
+          if command || args || dir
+            self.class.new(command || @command, args || @args, dir || @dir)
+          else
+            nil
+          end
+        end
+      end
+
+      cattr_accessor :command_matcher
+      self.command_matcher ||= CommandMatcher.new
+
+      # Examples:
+      #   assert_cmd @matcher, @data, :output => /foo*/, :error => '', :exit => 0
+      #   assert_cmd UM::StreamMatcher, @data, :output => 'foo.txt'.to_path
+      # The given matcher is used to match command data contents.
+      def assert_cmd matcher, my, ref
+        matcher_result = command_matcher[matcher, ref, my]
+        @log << matcher_result
+        fail if matcher_result.failure?
+        return matcher_result
+      end
+
       # Display conclusions.
       # Here you can finish some tasks even when the test fails.
       # Exceptions are absolutly forbidden in this method.
@@ -500,7 +646,6 @@ module Uttk
       protected :pass_hook
 
 
-
       #
       # Assertions
       #
@@ -524,11 +669,16 @@ module Uttk
         raise_status PassStatus.new
       end
 
-      # Skip the test
+      # Skip the test (by default the weight is 0%)
       def skip ( *args )
         raise_status_custom SkipStatus, *args
       end
 
+      # Skip the test: the weight is 100%.
+      def skip_pass ( message=nil )
+        raise_status SkipStatus.new(PassStatus.new.weight, message)
+      end
+
       # Force an Error status
       def raise_error ( message=nil )
         @symtbl[:flow] << :error

data/lib/uttk/strategies/SubCmd.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/SubCmd.rb 22112 2006-02-22T08:30:11.236459Z pouillar  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/SubCmd.rb 24394 2006-07-10T07:38:58.276210Z ertai  $
 
 
 module Uttk
@@ -9,66 +9,86 @@ module Uttk
   module Strategies
 
     # I run a sub Uttk or an another program that can behave like it.
-    class SubCmd < CmdBase
+    class SubCmd < Strategy
       include Concrete
 
       def prologue
-        @command = @symtbl[:uttk]
-        @dir = @symtbl[:pwd]
-        @quiet_print = true
         super
+        hooker = StrategyHooker.new @symtbl, @log, @env
+        @runner = OCmd::Runners::Popen.new.hooker_subscribe hooker
+        @command = @symtbl[:uttk].to_ocmd
+        @command.dir = @symtbl[:pwd]
+        @command.input = @input
+        @command += @args.to_ocmd_args
+        @command << '-F' << 'Path' << '--dump-status'
       end
       protected :prologue
 
 
       def run_impl
-        super
-        raise_error 'no uttk output' unless @output.my.exist?
-        status = nil
+        @data = @command.run @runner
+        @run_impl_status = nil
         root_path = @log.path
-        @output.my.open do |out|
-          YAML::each_node(out) do |node|
-            notification = node.symbol_safe_transform
-            case notification
-            when Array
-              path, leaf = notification
-              @log.update(:new_leaf, root_path + path, leaf)
-            when Status
-              status = notification
-            else
-              raise_error 'bad sub commad output' if stream.nil?
-            end
+        YAML.load_from_io @data.output do |notification|
+          case notification
+          when Array
+            path, leaf = notification
+            @log.update(:new_leaf, root_path + path, leaf)
+          when Status
+            @run_impl_status = notification
+          else
+            raise_error 'bad sub commad output'
           end
         end
-        raise_error 'bad status output' unless status.is_a? Status
-        raise_error 'uttk stderr not empty' unless @error.my.zero?
-        @status = status
-        raise_status @status
+        @data.waitpid
       end
       protected :run_impl
 
 
       def assertion
-        raise_error "bad exit status #@my_exit" unless [0, 2].include? @my_exit
-        super
+        @data_error_contents = @data.error.read
+        ref = { :exit => (/^[02]$/) }
+        matcher_result = command_matcher[UM::StreamMatcher, ref, @data]
+        raise_error 'bad exit status' if matcher_result.failure?
+        raise_error 'bad status output' unless @run_impl_status.is_a? Status
+        raise_error 'uttk stderr not empty' unless @data_error_contents.empty?
+        @status = @run_impl_status
+        raise_status @status
       end
       protected :assertion
 
 
+      def abort_hook
+        @runner.abort @data if @runner and defined? @data
+        super
+      end
+      protected :abort_hook
+
+
       def error_hook
-        @log.my_stdout = @output.my.read if @output and @output.my.exist?
-        @log.my_stderr = @error.my.read if @error and @error.my.exist?
+        if defined? @data
+          @log.my_stdout = @data.output.to_s_for_uttk_log unless @data.output.nil?
+          if defined? @data_error_contents and not @data_error_contents.empty?
+            @log.my_stderr = @data_error_contents.to_s_for_uttk_log
+          end
+          @log.my_exit = @data.status.exitstatus unless @data.status.nil?
+        end
         super
       end
       protected :error_hook
 
 
-      def mk_command
-        @args = "#@args -F Path --dump-status"
+      def epilogue
+        @data.clean if defined? @data
         super
       end
-      protected :mk_command
+      protected :epilogue
+
 
+      attribute :args,    'the arguments for the command',
+                          [Array, String, Numeric]
+      attribute :input,   'the input reference',  :invisible, nil
+      attribute :env,     'environment variables', Hash do {} end
 
     end # class SubCmd