testability-driver 1.3.1 → 1.3.2

data/lib/tdriver/base/test_object/behaviours/test_object.rb

@@ -102,7 +102,7 @@ module MobyBehaviour
 =end
 
     # == description
-    # Return all test object attributes
+    # Return all test object attributes. Please see [link="#GenericTestObject:[]"][][/link] method for alternative approach.
     # == returns
     # Hash
     #  description: Test object attributes
@@ -160,12 +160,12 @@ module MobyBehaviour
     end
 
     # == description
-    # Function returns a attribute of test object 
+    # Function returns a attribute of test object. Please see [link="#GenericTestObject:[]"][][/link] method for alternative approach.
     #
     # == arguments
     # name
     #  String
-    #   description: String definig the name of the attribute to get
+    #   description: String defining the name of the attribute to get
     #   example: "name"
     #
     # == returns
@@ -198,6 +198,41 @@ module MobyBehaviour
 
     end
 
+    # == description
+    # Wrapper method to returns one or all test object attributes. This method calls [link="#GenericTestObject:attribute"]attribute[/link] or [link="#GenericTestObject:attributes"]attributes[/link] depending on the given argument.
+    #
+    # == arguments
+    # name
+    #  String
+    #   description: Attribute name
+    #   example: "attribute_name"
+    #  NilClass
+    #   description: Return all attributes
+    #   example: nil
+    #
+    # == returns
+    # String
+    #   description: Value of the attribute
+    #   example: "value"
+    #
+    # Hash
+    #   description: Hash of all attributes
+    #   example: {:x=>"0", :y=>"0"}
+    #
+    def []( name = nil )
+
+      if name.nil?
+
+        attributes
+
+      else
+
+        attribute( name )
+
+      end  
+
+    end
+
     # == description
     # Returns the parent test object for the current object in question, according to the UI object hierarchy. For getting the test object that was actually used 
     # as the parent when the test object instance was created, see [link="#GenericTestObject:parent"]parent[/link] method.
@@ -221,7 +256,7 @@ module MobyBehaviour
       # retrieve parent element attributes
       parent_attributes = @test_object_adapter.test_object_element_attributes( parent_element )
 
-      if self.get_application_id && parent_attributes[ 'type' ] != 'application'
+      if get_application_id && parent_attributes[ 'type' ] != 'application'
 
         parent = @sut.child( 
 
@@ -288,7 +323,7 @@ module MobyBehaviour
       )
 
       # update childs if required, returns true or false
-      update( xml_data )
+      update( xml_data ) unless @sut.use_find_objects
 
       nil
 
@@ -586,7 +621,7 @@ module MobyBehaviour
             #test_object.update( _xml_data ) 
             test_object.send( :update, _xml_data ) 
             
-          }
+          } unless @sut.use_find_objects
         
         #end
                 
@@ -605,9 +640,9 @@ module MobyBehaviour
       # disable optimizer for this call since it will not work
       @_enable_optimizer = false
 
-      if sut_parameters[ :use_find_object, 'false' ] == 'true' and @sut.respond_to?( 'find_object' )
+      if @sut.use_find_objects == true
 
-        sut_parameters[ :use_find_object ] = 'false'
+        @sut.use_find_objects = false
 
         @_enable_optimizer = true
 
@@ -620,7 +655,7 @@ module MobyBehaviour
     # TODO: document me
     def enable_optimizer
 
-      sut_parameters[ :use_find_object ] = 'true' if @_enable_optimizer
+      @sut.use_find_objects = true if @_enable_optimizer
 
       @_enable_optimizer = false
 
@@ -804,25 +839,27 @@ module MobyBehaviour
     # ?
     def deactivate
 
-      return if !@_active
+      if @_active
 
-      @_active = false
+        @_active = false
 
-      # iterate through all test objects child test objects
-      @child_object_cache.each_object{ | test_object |
-      
-        # deactivate test object
-        #test_object.deactivate
- 
-        test_object.instance_exec{ deactivate }
-              
-      }
+        # iterate through all test objects child test objects
+        @child_object_cache.each_object{ | test_object |
+        
+          # deactivate test object 
+          test_object.__send__( :deactivate )
+          
+        }
+        
+        # remove test objects from cache
+        @child_object_cache.remove_objects  
+        
+        # remove from parent objects children objects cache
+        @parent.instance_variable_get( :@child_object_cache ).remove_object( self )
 
-      # remove test objects from children objects cache
-      @child_object_cache.remove_objects
+        nil
 
-      # remove from parent objects children objects cache
-      @parent.instance_variable_get( :@child_object_cache ).remove_object( self )
+      end
 
     end
 

data/lib/tdriver/base/test_object/cache.rb

@@ -95,7 +95,9 @@ module TDriver
       test_object_hash = test_object.hash
 
       if @objects.has_key?( test_object_hash )
+      
         warn( "warning: Test object (#{ test_object_hash }) already exists in cache" )
+        
       end
     
       @objects[ test_object_hash ] = test_object
@@ -106,13 +108,13 @@ module TDriver
 
     # TODO: document me  
     def remove_object( test_object )
-    
+        
       test_object_hash = test_object.hash
     
-      raise ArgumentError, "Test object (#{ value.hash }) not found from cache" unless @objects.has_key?( test_object_hash )
-    
       @objects.delete( test_object_hash )
-    
+        
+      #raise ArgumentError, "Test object (#{ test_object_hash }) not found from cache" unless @objects.has_key?( test_object_hash )
+      
       self
     
     end

data/lib/tdriver/base/test_object/factory.rb

@@ -633,11 +633,13 @@ module TDriver
 
     end
 
-    def self.set_timeout( new_timeout )
+    def self.set_timeout( value )
 
       warn "warning: deprecated method TDriver::TestObjectFactory#set_timeout( value ); please use TDriver::TestObjectFactory#timeout=( value ) instead"
 
-      self.timeout = new_timeout
+      value.check_type( Numeric, "Wrong argument type $1 for timeout value (expected $2)" )
+
+      @timeout = value
 
     end
 

data/lib/tdriver/base/test_object/loader.rb

@@ -17,26 +17,35 @@
 ## 
 ############################################################################
 
-# load test object abstract class
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'abstract' ) )
+[ 
 
-# load test object identificator
-#require File.expand_path( File.join( File.dirname( __FILE__ ), 'identificator' ) )
+  # load test object abstract class
+  'abstract',
 
-# load test object factory
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'factory' ) )
+  # load test object factory
+  'factory',
 
-# load test object cache
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'cache' ) )
+  # load test object cache
+  'cache',
 
-# load test object adapter
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'adapter' ) )
+  # load test object adapter abstraction
+  'xml/abstraction',
 
-# load test object adapter
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'xml/adapter' ) )
+  # load test object adapter
+  'xml/adapter',
 
-# load verify ui module
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'verification' ) )
+  # load test object adapter
+  'adapter',
+
+  # load verify ui module
+  'verification'
+
+].each{ | filename |
+
+  require File.expand_path( File.join( File.dirname( __FILE__ ), filename ) )
+
+}
 
 # load test object behaviours
 MobyUtil::FileHelper.load_modules( File.expand_path( File.join( File.dirname( __FILE__ ), 'behaviours' ) ) )
+

data/lib/tdriver/base/test_object/xml/abstraction.rb

@@ -0,0 +1,63 @@
+############################################################################
+## 
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+## All rights reserved. 
+## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
+## 
+## This file is part of Testability Driver. 
+## 
+## If you have questions regarding the use of this file, please contact 
+## Nokia at testabilitydriver@nokia.com . 
+## 
+## This library is free software; you can redistribute it and/or 
+## modify it under the terms of the GNU Lesser General Public 
+## License version 2.1 as published by the Free Software Foundation 
+## and appearing in the file LICENSE.LGPL included in the packaging 
+## of this file. 
+## 
+############################################################################
+
+module TDriver
+
+  module Abstraction
+  
+    module TestObjectAdapter
+
+      # TODO: document me
+      def identify_test_object_adapter_from_data( source )
+   
+        # verify check that source data is given in correct format
+        source.check_type [ String, MobyUtil::XML::Element ], 'wrong argument type $1 for XML data source (expected $2)'
+
+        # parse if given source is type of string    
+        source = MobyUtil::XML.parse_string( source ).root if source.kind_of?( String )
+
+        # determine xml format        
+        if source.kind_of?( MobyUtil::XML::Element )
+
+          # detect optimized xml format
+          if source.xpath('.//obj[1]').count > 0
+
+            TDriver::OptimizedXML::TestObjectAdapter
+          
+          # or deprecated xml format
+          elsif source.xpath('.//object[1]').count > 0
+
+            TDriver::TestObjectAdapter
+          
+          # or raise exception if format was not detected
+          else
+          
+            raise RuntimeError, 'Unsupported XML data format'
+
+          end
+                  
+        end # if
+      
+      end # identify_test_object_adapter
+
+    end # TestObjectAdapter
+  
+  end # Abstraction
+
+end # TDriver

data/lib/tdriver/base/test_object/xml/adapter.rb

@@ -25,7 +25,10 @@ module TDriver
 
       # private methods and variables
       class << self
-      
+
+        # include abstraction module      
+        include TDriver::Abstraction::TestObjectAdapter
+        
         private
 
           # TODO: document me

data/lib/tdriver/report/report_test_run.rb

@@ -949,7 +949,7 @@ module TDriverReportCreator
 
 
           xml_data.root.add_child(test)
-          File.open(file, 'w') {|f| f.write(xml_data.to_xml) }
+          File.open(file, 'wb') {|f| f.write(xml_data) }
           test=nil
           xml_data=nil
         else

data/lib/tdriver/report/report_writer.rb

@@ -507,10 +507,10 @@ display: block;
 
   def reporter_link_to_code(log_line,folder=nil)
     begin
-      t = Time.now
-      time_stamp=t.strftime( "%Y%m%d%H%M%S" )
-
+      stackno=0
       log_line.gsub(/([\w \*\/\w\/\.-]+)\:(\d+)/) do |match|
+        t = Time.now
+        time_stamp="#{t.strftime( "%Y%m%d%H%M%S" )}#{stackno}"
         line=match[/\:(\d+)/]
         f=match[/([\w \*\/\w\/\.-]+)/]
         file="#{File.dirname(f.strip)}/#{File.basename(f.strip)}"
@@ -523,6 +523,7 @@ display: block;
             '">'+match+'</a>'
           log_line=log_line.gsub(match,link_to_stack)
         end
+        stackno+=1
       end
     rescue Exception => e
       puts e.message

data/lib/tdriver/util/common/boolean.rb

@@ -17,35 +17,32 @@
 ## 
 ############################################################################
 
-# extend Ruby TrueClass and FalseClass class functionality
+# extend Ruby TrueClass class functionality
 class TrueClass
 
+  # TODO: document me
   def true?
-
-    /^true$/i.match( self.to_s ) != nil
-  
+    true
   end
-  
+
+  # TODO: document me  
   def false?
-  
     false
-  
   end
 
 end
 
+# extend Ruby FalseClass class functionality
 class FalseClass
 
-  def true?
-  
+  # TODO: document me
+  def true? 
     false
-  
   end
   
+  # TODO: document me
   def false?
-  
-    /^false$/i.match( self.to_s ) != nil
-  
+    true    
   end
 
 end

data/lib/tdriver/util/common/environment.rb

@@ -21,13 +21,14 @@ module MobyUtil
 
   class EnvironmentHelper
 
-    UNKNOWN = :unknown
-    
-    LINUX = :linux
-    SOLARIS = :solaris
-    WINDOWS = :windows
-    OSX = :osx
-    CYGWIN = :cygwin
+    unless defined?( UNKNOWN )    
+      LINUX = :linux
+      SOLARIS = :solaris
+      WINDOWS = :windows
+      OSX = :osx
+      CYGWIN = :cygwin
+      UNKNOWN = :unknown # keep this as last constant
+    end
     
     def self.java?
     

data/lib/tdriver/util/common/hash.rb

@@ -63,7 +63,7 @@ class Hash
 
   end
 
-  # verify that receiver object contains all of given keys. Raises exception is key not found.
+  # verify that receiver object contains given key. Raises exception is key not found.
   def require_key( key, message = 'required key $1 not found from hash' )
   
     # store caller backtrace before calling fetch
@@ -149,7 +149,7 @@ class Hash
 
   end
 
-  # store key and avalue to hash if not already defined
+  # store key and value to hash if not already defined
   def default_value( key, value )
 
     self[ key ] = value unless has_key?( key )
@@ -204,7 +204,7 @@ class Hash
   # TODO: document me
   def to_attributes
   
-    self.collect{ | key, value |
+    collect{ | key, value |
 
       "#{ key.to_s }=\"#{ value.to_s.encode_to_xml }\"" 
   
@@ -215,7 +215,7 @@ class Hash
   # TODO: document me
   def recursive_merge( other )
   
-    self.merge( other ){ | key, old_value, new_value |
+    merge( other ){ | key, old_value, new_value |
 
       new_value
 
@@ -243,7 +243,7 @@ class Hash
   # TODO: document me
   def recursive_merge!( other )
   
-    self.replace( 
+    replace( 
     
       recursive_merge( other )