testability-driver 1.1.1 → 1.2.1

data/lib/tdriver/util/plugin/service.rb

@@ -252,7 +252,7 @@ module TDriver
       rescue 
 
         # raise all other exceptions as PluginError
-        raise PluginError, "Error occured during calling #{ method_name } method for #{ plugin_name } (#{ $!.class }: #{ $!.message })"
+        raise MobyUtil::PluginError, "Error occured during calling #{ method_name } method for #{ plugin_name } (#{ $!.class }: #{ $!.message })"
 
       end
 

data/lib/tdriver/util/recorder/recorder.rb

@@ -53,7 +53,13 @@ module MobyUtil
 
       app.stop_recording
       
-      MobyUtil::Scripter.new( sut.id, object_identificators ).write_fragment( MobyBase::StateObject.new( xml_source ), app.name )
+      MobyUtil::Scripter.new( sut.id, object_identificators ).write_fragment( 
+
+        #MobyBase::StateObject.new( :source_data => xml_source ), 
+        sut.state_object( xml_source ), 
+        app.name 
+
+      )
 
     end
 

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

@@ -26,12 +26,24 @@ module MobyUtil
       attr_accessor :xml
 
       # TODO: document me
-      def initialize( xml = nil )
+      def initialize( xml = nil, options = {} )
+
+        @options = options
+
+        @cache = Hash.new{ | hash, key | hash[ key ] = {} }
 
         @xml = xml
 
       end
 
+      # TODO: document me
+      def clone!
+
+        # create a clone of self object, also xml object is cloned; note that all references (e.g. parent) will be disconnected
+        self.class.new( @xml.clone )
+
+      end
+
       # TODO: document me
       def comment?
 

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

@@ -23,40 +23,93 @@ module MobyUtil
 
     module Nokogiri
 
+      module Cache
+      
+        private
+      
+        # TODO: document me
+        def initialize_cache
+                
+          @cache = Hash.new{ | hash, key | hash[ key ] = {} }
+
+        end
+      
+        # TODO: document me
+        def clear_cache
+        
+          @cache.clear
+        
+        end
+      
+        # TODO: document me
+        def cache( key, value )
+
+          yield
+
+# JKo: disable xml caching for now, need more investigation why tests starts to fail
+=begin
+          if @options[ :cache_enabled ] == true
+          
+            @cache[ key ].fetch( value ){
+
+              @cache[ key ][ value ] = yield
+
+            }
+
+          else
+
+            yield
+              
+          end
+=end
+                
+        end
+      
+        # TODO: document me
+        def no_cache( *args )
+        
+          yield
+        
+        end
+      
+      end
+  
       module Abstraction
 
+        include Cache
+
         # TODO: Documentation
         def empty?
 
-          @xml.nil?
+          cache( :is_nil, :value ){ @xml.nil? }
 
         end
 
         # TODO: Documentation
         def name
 
-          @xml.name
+          cache( :name, :value ){ @xml.name }
 
         end
 
         # TODO: Documentation
         def nil?
 
-          @xml.nil?
+          cache( :is_nil, :value ){ @xml.nil? }
 
         end
 
         # TODO: Documentation
         def size
 
-          @xml.size
+          cache( :size, :value ){ @xml.size }
 
         end
 
         # TODO: Documentation
         def to_s
 
-          @xml.to_s
+          cache( :to_s, :value ){ @xml.to_s }
 
         end
 
@@ -69,23 +122,23 @@ module MobyUtil
 
             when ::Nokogiri::XML::Element
 
-              XML::Element.new( object )
+              XML::Element.new( object, @options )
 
             when ::Nokogiri::XML::NodeSet
 
-              XML::Nodeset.new( object )
+              XML::Nodeset.new( object, @options )
 
             when ::Nokogiri::XML::Text
 
-              XML::Text.new( object )
+              XML::Text.new( object, @options )
 
             when ::Nokogiri::XML::Attr
 
-              XML::Attribute.new( object )
+              XML::Attribute.new( object, @options )
 
             when ::Nokogiri::XML::Comment
 
-              XML::Comment.new( object )
+              XML::Comment.new( object, @options )
 
             when ::NilClass
 

data/lib/tdriver/util/xml/parsers/nokogiri/attribute.rb

@@ -30,13 +30,19 @@ module MobyUtil
         # TODO: document me
         def value
 
-          @xml.value
-
+          cache( :value, :value ){ 
+          
+            @xml.value
+          
+          }
+          
         end
 
         # TODO: document me
         def value=( content )
 
+          clear_cache
+
           @xml.value = content
 
         end

data/lib/tdriver/util/xml/parsers/nokogiri/document.rb

@@ -28,16 +28,29 @@ module MobyUtil
         include Node
 
         # TODO: document me
-        def parse( xml_string )
+        def initialize( xml, options = {} )
 
-          ::Nokogiri::XML.parse( xml_string, nil, 'UTF-8', ::Nokogiri::XML::ParseOptions::STRICT )
+          @options = options
 
+          initialize_cache
+          
+          @xml = parse( xml )
+        
         end
 
         # TODO: document me
         def root
+  
+          cache( :root, :value ){ node_object( @xml.root ) }
+        
+        end
 
-          node_object( @xml.root )
+      private
+      
+        # TODO: document me
+        def parse( xml_string )
+
+          ::Nokogiri::XML.parse( xml_string, nil, 'UTF-8', ::Nokogiri::XML::ParseOptions::STRICT )
 
         end
 

data/lib/tdriver/util/xml/parsers/nokogiri/node.rb

@@ -30,13 +30,15 @@ module MobyUtil
         # TODO: document me
         def []( value )
 
-          @xml[ value ]
+          cache( __method__, value ){ @xml[ value ] }
 
         end
 
         # TODO: document me
         def []=( name, value )
 
+          clear_cache
+
           @xml[ name ] = value
 
         end
@@ -44,8 +46,8 @@ module MobyUtil
         # TODO: document me
         def ==( object )
 
-          @xml.content == object.xml.content
-
+          cache( __method__, object.object_id ){ @xml.content == object.xml.content }
+          
         end
 
         # aliases for ==
@@ -54,13 +56,15 @@ module MobyUtil
         # TODO: document me
         def <=>( object )
 
-          @xml <=> object.xml
+          cache( __method__, object.object_id ){ @xml <=> object.xml }
 
         end
 
         # TODO: document me
         def add_previous_sibling( other )
 
+          clear_cache
+
           @xml.add_previous_sibling( other.xml )
 
         end
@@ -68,44 +72,40 @@ module MobyUtil
         # TODO: document me
         def attribute( attr_name )
 
-          unless ( value = @xml.attribute( attr_name ) ).nil?
-
-            value.to_s
-
-          end
+          cache( :attribute, attr_name ){ _attribute( @xml.attribute( attr_name ) ) }
 
         end
 
         # TODO: document me
         def attributes
 
-          # return hash of attributes
-          Hash[ @xml.attribute_nodes.collect{ | node | 
-
-            [ node.node_name, node.value.to_s ] }
-
-          ]
+          cache( :attributes, :value ){
+            # return hash of attributes
+            Hash[ @xml.attribute_nodes.collect{ | node | 
+              [ node.node_name, node.value.to_s ] }
+            ]
+          }
 
         end
 
         # TODO: document me
         def blank?
 
-          @xml.blank?
+          cache( :is_blank, :value ){ @xml.blank? }
 
         end
 
         # TODO: document me
         def children
 
-          node_object( @xml.children )
+          cache( :children, :value ){ node_object( @xml.children ) }
 
         end
 
         # TODO: document me
         def content
 
-          @xml.content
+          cache( :content, :value ){ @xml.content }
 
         end
 
@@ -119,7 +119,7 @@ module MobyUtil
           # iterate each attribute
           @xml.each{ | element | 
 
-            yield( node_object( element ) ) 
+            yield( cache( :each, element ){ node_object( element ) } )
 
           }
 
@@ -130,7 +130,7 @@ module MobyUtil
         # TODO: document me
         def inner_html
 
-          @xml.inner_html
+          cache( :inner_html, :value ){ @xml.inner_html }
 
         end
 
@@ -139,21 +139,23 @@ module MobyUtil
 
         # TODO: document me
         def to_s
-  
-          @xml.to_s
+
+          cache( :to_s, :value ){ @xml.to_s }
 
         end
 
         # TODO: document me
         def parent
         
-          node_object( @xml.parent )
+          cache( :parent, :value ){ node_object( @xml.parent ) }
         
         end
 
         # TODO: document me
         def remove
 
+          clear_cache
+
           @xml.remove
 
           self
@@ -163,6 +165,8 @@ module MobyUtil
         # TODO: document me
         def replace( other )
 
+          clear_cache
+
           @xml.replace( other.xml )
 
           self
@@ -172,23 +176,23 @@ module MobyUtil
         # TODO: document me
         def xpath( xpath_query, *args, &block )
 
-          node_object( 
-
-            @xml.xpath( xpath_query, *args, &block ) 
-
-          )
+          cache( :xpath, xpath_query ){ node_object( @xml.xpath( xpath_query, *args, &block ) ) }
 
         end
 
         # TODO: document me
         def at_xpath( xpath_query, *args, &block )
 
-          node_object( 
+          cache( :at_xpath, xpath_query ){ node_object( @xml.at_xpath( xpath_query, *args, &block ) ) }
 
-            @xml.at_xpath( xpath_query, *args, &block ) 
-
-          )
+        end
 
+      private
+      
+        def _attribute( value )
+        
+          value.to_s unless value.nil?
+        
         end
 
         # enable hooking for performance measurement & debug logging

data/lib/tdriver/util/xml/parsers/nokogiri/nodeset.rb

@@ -25,23 +25,23 @@ module MobyUtil
 
       module Nodeset # behaviour
 
-        include Abstraction 
+        include Abstraction
 
         def []( node )
 
-          node_object( @xml[ node ] )
+          cache( :at_index, node ){ node_object( @xml[ node ] ) }
 
         end
 
         def first
 
-          node_object( @xml.first )
+          cache( :first, :vaue ){ node_object( @xml.first ) }
 
         end
 
         def last
 
-          node_object( @xml.last )
+          cache( :last, :value ){ node_object( @xml.last ) }
 
         end
 
@@ -49,7 +49,7 @@ module MobyUtil
 
           @xml.each{ | node | 
 
-            yield( node_object( node ) ) 
+            yield( cache( :each, node ){ node_object( node ) } ) 
 
           }
 
@@ -61,7 +61,7 @@ module MobyUtil
 
           @xml.each_with_index{ | node, index | 
 
-            yield( node_object( node ), index ) 
+            yield( cache( :each, node ){ node_object( node ) }, index )
 
           }
 
@@ -72,12 +72,13 @@ module MobyUtil
         def collect( &block )
 
           _collect( &block )
-          #nodeset_object( _collect( &block ) )
 
         end
 
         def collect!( &block )
 
+          clear_cache
+
           @xml = _collect( &block )
 
           self
@@ -86,13 +87,13 @@ module MobyUtil
 
         def compact
 
-          nodeset_object( @xml.compact )
+          cache( :compact, :value ){ nodeset_object( @xml.compact ) }
 
         end
 
         def compact!
 
-          @xml = @xml.compact
+          @xml = cache( :compact_, :value ){ @xml.compact }
 
           self
 
@@ -106,6 +107,8 @@ module MobyUtil
 
         def sort!( &block )
 
+          clear_cache
+
           @xml = _sort( &block )
 
           self
@@ -114,29 +117,27 @@ module MobyUtil
 
         def empty?
 
-          @xml.empty?
+          cache( :is_empty, :value ){ @xml.empty? }
 
         end
         
         def length
 
-          @xml.length
+          cache( :length, :value ){ @xml.length }
 
         end
     
     
         def to_a
 
-          @xml.collect{ | node | 
-
-            node_object( node ) 
-
-          }
+          cache( :to_a, :value ){ @xml.collect{ | node | node_object( node ) } }
           
         end
         
         def delete( node )
 
+          clear_cache
+
           @xml.each do | nodeset_node |
 
             if ( node.xml.content == nodeset_node.content )
@@ -160,11 +161,7 @@ module MobyUtil
 
         def _collect( &block )
 
-          @xml.collect{ | node | 
-
-            yield( node_object( node ) ) 
-
-          } 
+          @xml.collect{ | node | yield( cache( :each, node ){ node_object( node ) } ) }
 
         end
 
@@ -174,7 +171,7 @@ module MobyUtil
         
             if block_given?
 
-              yield( node_object( node_a ), node_object( node_b ) ) 
+              yield( cache( :each, node_a ){ node_object( node_a ) }, cache( :each, node_b ){ node_object( node_b ) } )
 
             else