testability-driver 1.3.1 → 1.3.2

data/lib/tdriver/util/parameter/parameter.rb

@@ -25,7 +25,7 @@ module TDriver
 
       def new
       
-        warn_caller "$1:$2 warning: #{ self.to_s } is static class; unable initialize new instance of it"
+        warn_caller "$1:$2 warning: #{ to_s } is static class; unable initialize new instance of it"
       
         nil
       
@@ -130,7 +130,7 @@ module TDriver
 
         if default.empty?
 
-          raise MobyUtil::ParameterNotFoundError, "Parameter #{ key } not found" unless block_given?
+          raise MobyUtil::ParameterNotFoundError, "Parameter #{ key.inspect } not found" unless block_given?
 
           # yield with key if block given
           yield key
@@ -161,6 +161,19 @@ module TDriver
 
     end
     
+    # TODO: document me
+    def apply_template( name )
+        
+      recursive_merge!( 
+        TDriver::Parameter.templates.fetch( name.to_s ){ 
+        
+          raise MobyUtil::TemplateNotFoundError, "Template #{ name.inspect } not found"
+        
+        }
+      )
+    
+    end
+    
     # for backwards compatibility
     def kind_of?( klass )
     
@@ -200,7 +213,7 @@ module TDriver
 
       def new
       
-        warn_caller "$1:$2 warning: #{ self.to_s } is static class; unable initialize new instance of it"
+        warn_caller "$1:$2 warning: #{ to_s } is static class; unable initialize new instance of it"
       
         nil
       
@@ -899,6 +912,24 @@ module TDriver
       
       end
 
+      # TODO: document me
+      def has_template?( name )
+      
+        @templates.has_key?( name.to_s )
+      
+      end
+      
+      # TODO: document me
+      def apply_template( name )
+        
+        @parameters.recursive_merge!( 
+          @templates.fetch( name.to_s ){           
+            raise MobyUtil::TemplateNotFoundError, "Template #{ name.inspect } not found"
+          }
+        )
+
+      end
+
       # TODO: document me
       def has_key?( key )
       
@@ -912,7 +943,7 @@ module TDriver
         @parameters.has_value?( key )
       
       end
-
+      
       # TODO: document me
       def keys
       
@@ -1041,7 +1072,7 @@ module MobyUtil
             
       def new
       
-        warn_caller "$1:$2 warning: #{ self.to_s } is deprecated; use TDriver::ParameterHash instead"
+        warn_caller "$1:$2 warning: #{ to_s } is deprecated; use TDriver::ParameterHash instead"
       
         TDriver::ParameterHash.new
       
@@ -1059,7 +1090,7 @@ module MobyUtil
             
       def new
       
-        warn_caller "$1:$2 warning: #{ self.to_s } is static class; unable initialize new instance of it"
+        warn_caller "$1:$2 warning: #{ to_s } is static class; unable initialize new instance of it"
       
         nil
       
@@ -1094,7 +1125,7 @@ module MobyUtil
 
       def new
       
-        warn_caller "$1:$2 warning: #{ self.to_s } is static class; unable initialize new instance of it"
+        warn_caller "$1:$2 warning: #{ to_s } is static class; unable initialize new instance of it"
       
         nil
       

data/lib/tdriver/util/xml/abstraction.rb

@@ -47,49 +47,49 @@ module MobyUtil
       # TODO: document me
       def comment?
 
-        self.kind_of?( MobyUtil::XML::Comment )
+        kind_of?( MobyUtil::XML::Comment )
 
       end
 
       # TODO: document me
       def text?
 
-        self.kind_of?( MobyUtil::XML::Text )
+        kind_of?( MobyUtil::XML::Text )
 
       end
 
       # TODO: document me
       def attribute?
 
-        self.kind_of?( MobyUtil::XML::Attribute )
+        kind_of?( MobyUtil::XML::Attribute )
 
       end
 
       # TODO: document me
       def nodeset?
 
-        self.kind_of?( MobyUtil::XML::Nodeset )
+        kind_of?( MobyUtil::XML::Nodeset )
 
       end
 
       # TODO: document me
       def element?
 
-        self.kind_of?( MobyUtil::XML::Element )
+        kind_of?( MobyUtil::XML::Element )
 
       end
 
       # TODO: document me
       def document?
 
-        self.kind_of?( MobyUtil::XML::Document )
+        kind_of?( MobyUtil::XML::Document )
 
       end
 
       # TODO: document me
       def nil?
 
-        self.kind_of?( MobyUtil::XML::NilNode )
+        kind_of?( MobyUtil::XML::NilNode )
 
       end
 
@@ -103,7 +103,7 @@ module MobyUtil
       # print only object type and id hex
       def inspect
       
-        "#<#{ self.class }:0x#{ ( "%x" % ( self.object_id.to_i << 1 ) )[ 3 .. -1 ] }>"
+        "#<#{ self.class }:0x#{ ( "%x" % ( object_id.to_i << 1 ) )[ 3 .. -1 ] }>"
             
       end
 

data/lib/tdriver/util/xml/builder.rb

@@ -34,7 +34,7 @@ module MobyUtil
           $stderr.puts "#{ file }:#{ line } warning: deprecated method #{ self.class }#new, use MobyUtil::XML#build instead"
 
           # extend builder behaviour of current parser
-          self.extend( ( MobyUtil::XML.current_parser )::Builder )
+          extend( ( ::MobyUtil::XML.current_parser )::Builder )
 
           # create builder object
           build( &block )

data/lib/tdriver/util/xml/xml.rb

@@ -26,6 +26,8 @@ module MobyUtil
     private
     
       def initialize_class
+
+        @parser = nil
       
         # empty xml cache hash
         @document_cache = { :cache => [], :objects => {} }
@@ -33,8 +35,8 @@ module MobyUtil
         # default xml cache buffer size
         @document_cache_buffer_size = 10
 
-        # set used parser module
-        self.current_parser = MobyUtil::XML::Nokogiri        
+        # configure parser module to be used
+        __send__(:current_parser=, MobyUtil::XML::Nokogiri)
       
       end
     
@@ -47,7 +49,7 @@ module MobyUtil
     # == raises
     def self.current_parser
 
-      @@parser
+      @parser
 
     end
 
@@ -83,12 +85,10 @@ module MobyUtil
     # nil
     # Document:: XML document object
     # == raises
-    def self.current_parser=( value )
-
-      #raise RuntimeError, "Parser can be set only once per session" unless defined?( @@parser )
+    def self.current_parser=( parser )
 
       # set current parser
-      @@parser = value
+      @parser = parser
 
       # apply parser implementation to abstraction modules
       [ 
@@ -107,13 +107,13 @@ module MobyUtil
           begin      
 
             # include parser behaviour
-            include @@parser.const_get( _module ) 
+            include parser.const_get( _module ) 
 
           rescue NameError
 
             # raise proper exception if behaviour module not found
-            raise NotImplementedError, "Required behaviour module #{ @@parser.name }::#{ _module } not found"
-            
+            raise NotImplementedError, "Required behaviour module #{ parser.name }::#{ _module } not found"
+
           end
         
         }
@@ -121,7 +121,7 @@ module MobyUtil
       end
 
       # return current parser as result
-      value
+      parser
 
     end
 

data/lib/tdriver/verify/verify.rb

@@ -162,7 +162,7 @@ module TDriverVerify
       
       end
 
-      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify;"
+      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify;"
 
       # raise the exception
       raise MobyBase::VerificationError, error_message
@@ -177,7 +177,7 @@ module TDriverVerify
     
     end
 
-    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify;"
+    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify;"
 
     nil
   
@@ -294,7 +294,7 @@ module TDriverVerify
       
       end
 
-      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_not;"
+      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_not;"
 
       # raise the exception
       raise MobyBase::VerificationError, error_message
@@ -309,7 +309,7 @@ module TDriverVerify
     
     end
 
-    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_not;"
+    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_not;"
 
     nil
   
@@ -433,7 +433,7 @@ module TDriverVerify
       
       end
 
-      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_true;"
+      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_true;"
 
       # raise the exception
       raise MobyBase::VerificationError, error_message
@@ -448,7 +448,7 @@ module TDriverVerify
     
     end
 
-    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_true;"
+    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_true;"
 
     nil
   
@@ -572,7 +572,7 @@ module TDriverVerify
       
       end
 
-      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_false;"
+      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_false;"
 
       # raise the exception
       raise MobyBase::VerificationError, error_message
@@ -587,7 +587,7 @@ module TDriverVerify
     
     end
 
-    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_false;"
+    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_false;"
 
     nil
   
@@ -709,7 +709,7 @@ module TDriverVerify
       
       end
 
-      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_equal;"
+      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_equal;"
 
       # raise the exception
       raise MobyBase::VerificationError, error_message
@@ -724,7 +724,7 @@ module TDriverVerify
     
     end
 
-    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_equal;"
+    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_equal;"
 
     nil
   
@@ -846,7 +846,7 @@ module TDriverVerify
       
       end
 
-      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_less;"
+      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_less;"
 
       # raise the exception
       raise MobyBase::VerificationError, error_message
@@ -861,7 +861,7 @@ module TDriverVerify
     
     end
 
-    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_less;"
+    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_less;"
 
     nil
   
@@ -983,7 +983,7 @@ module TDriverVerify
       
       end
 
-      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_greater;"
+      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_greater;"
 
       # raise the exception
       raise MobyBase::VerificationError, error_message
@@ -998,7 +998,7 @@ module TDriverVerify
     
     end
 
-    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_greater;"
+    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_greater;"
 
     nil
   
@@ -1124,7 +1124,7 @@ module TDriverVerify
       
       end
 
-      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_regexp;"
+      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s }.\n #{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_regexp;"
 
       # raise the exception
       raise MobyBase::VerificationError, error_message
@@ -1139,7 +1139,7 @@ module TDriverVerify
     
     end
 
-    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_regexp;"
+    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_regexp;"
 
     nil
   
@@ -1188,7 +1188,7 @@ module TDriverVerify
       # wait for the signal
       begin
 
-        self.wait_for_signal( timeout, signal_name, &block )
+        wait_for_signal( timeout, signal_name, &block )
 
       rescue
 
@@ -1205,7 +1205,7 @@ module TDriverVerify
 
       $logger.enabled = logging_enabled
 
-      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s } using timeout '#{ timeout }.;#{ self.kind_of?(MobyBase::SUT) ? self.id.to_s + ';sut' : ';' };{};verify_signal;#{ signal_name }"
+      $logger.behaviour "FAIL;Verification #{ message }failed: #{ $!.to_s } using timeout '#{ timeout }.;#{ kind_of?(MobyBase::SUT) ? id.to_s + ';sut' : ';' };{};verify_signal;#{ signal_name }"
 
       raise
 
@@ -1215,7 +1215,7 @@ module TDriverVerify
       
     end
 
-    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ self.kind_of?( MobyBase::SUT ) ? self.id.to_s + ';sut' : ';' };{};verify_signal;#{ signal_name }"
+    $logger.behaviour "PASS;Verification #{ message }at #{ verify_caller } was successful#{ timeout.nil? ? '' : ' using timeout ' + timeout.to_s }.;#{ kind_of?( MobyBase::SUT ) ? id.to_s + ';sut' : ';' };{};verify_signal;#{ signal_name }"
     
     nil
 
@@ -1223,11 +1223,12 @@ module TDriverVerify
 
   private
 
+  # TODO: remove me?
   def get_end_time( timeout )
 
-    if self.kind_of?( MobyBase::SUT )
+    if kind_of?( MobyBase::SUT )
 
-      Time.now + ( timeout.nil? ? $parameters[ self.sut ][ :synchronization_timeout, '10' ].to_i : timeout.to_i )
+      Time.now + ( timeout.nil? ? $parameters[ sut ][ :synchronization_timeout, '10' ].to_i : timeout.to_i )
 
     else
 
@@ -1238,20 +1239,16 @@ module TDriverVerify
   end
 
   def get_timeout( timeout )
-  
-    #if timeout.nil?
-  
-      if self.kind_of?( MobyBase::SUT )
 
-        timeout = $parameters[ self.sut ][ :synchronization_timeout, '10' ].to_i if timeout.nil?
+    if kind_of?( MobyBase::SUT )
 
-      else
+      timeout = $parameters[ sut ][ :synchronization_timeout, '10' ] if timeout.nil?
 
-        timeout = $parameters[ :synchronization_timeout, '10' ].to_i if timeout.nil?
+    else
 
-      end
+      timeout = $parameters[ :synchronization_timeout, '10' ] if timeout.nil?
 
-    #end
+    end
     
     timeout.to_i
       
@@ -1260,8 +1257,8 @@ module TDriverVerify
   # Current count of combined sut refresh calls to all suts
   def ref_counter
     counter = 0
-    if self.kind_of? MobyBase::SUT
-      counter = self.dump_count
+    if kind_of?( MobyBase::SUT )
+      counter = dump_count
     else
       TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
         counter += sut_attributes[:sut].dump_count
@@ -1271,16 +1268,16 @@ module TDriverVerify
   end
 
   def verify_refresh(b_use_id=true)
-    if self.kind_of? MobyBase::SUT
+    if kind_of?( MobyBase::SUT )
         begin
-          appid = self.get_application_id
+          appid = get_application_id
         rescue
           appid='-1'
         end
         if appid != "-1" && b_use_id
-          self.refresh({:id => appid})
+          refresh({:id => appid})
         else
-          self.refresh
+          refresh
         end
       else
         #refresh all connected suts