testability-driver 0.9.2 → 1.0.0

data/lib/tdriver/version.rb

@@ -18,4 +18,4 @@
 ############################################################################
 
 
-ENV['TDRIVER_VERSION'] = '0.9.2'
+ENV['TDRIVER_VERSION'] = '1.0.0'

data/lib/tdriver-devtools/behaviour/xml/rdoc_behaviour_xml_generator.rb

@@ -419,9 +419,6 @@ EXAMPLE
 
       }
 
-      # TODO: some other format for writing the hash to file...
-      #open("#{ $output_results_name }.hash", "w" ){ | file | file << @found_modules_and_methods.inspect }
-
     end
 
     def process_file( file )
@@ -719,11 +716,11 @@ EXAMPLE
         # new table
         if nesting == 0
 
-          # break if for some reason first character is "="
-          return result if line[0].chr == "=" 
-
           unless line.empty?
           
+            # break if for some reason first character is "="            
+            return result if line[0].chr == "=" 
+            
             line =~ /^(\w+)/i
 
             result << { "name" => $1, "content" => [] }
@@ -1069,9 +1066,6 @@ EXAMPLE
 
         method_header = process_comment( method.comment )
 
-        ## TODO: remember to verify that there are documentation for each argument!
-        ## TODO: verify that there is a tag for visualizer example
-
         arguments_found = 0
 
         method_header = Hash[ method_header.collect{ | key, value |
@@ -1590,41 +1584,57 @@ EXAMPLE
         #return "" if features.last[:tables]["content"] == []
         
         tables = features.last[:tables].collect{ | table |
+  
+          if table["content"] == []
+
+            raise_error("Warning: Table format incorrect in '#{ features.first }' ($MODULE)", 'table_format')
 
-          header = table[ "content" ].first.collect{ | header_item |
-            apply_macros!( @templates["behaviour.xml.table.item"].clone, {
-                "ITEM" => encode_string( header_item )
+            apply_macros!( @templates["behaviour.xml.table"].clone, {
+                "TABLE_NAME" => encode_string( '[!!] ERROR' ),
+                "TABLE_TITLE" => encode_string( '[!!] ERROR' || "" ),
+                "TABLE_DESCRIPTION" => encode_string( '[!!] ERROR' || "" )
               }
             )
-          }
 
-          rows = table[ "content" ][ 1 .. -1 ].collect{ | row |
+          else          
 
-            row_items = row.collect{ | row_item |
-            
+            header = table[ "content" ].first.collect{ | header_item |
               apply_macros!( @templates["behaviour.xml.table.item"].clone, {
-                  "ITEM" => encode_string( row_item )
+                  "ITEM" => encode_string( header_item )
                 }
               )
             }
 
-            apply_macros!( @templates["behaviour.xml.table.row"].clone, {
+            rows = table[ "content" ][ 1 .. -1 ].collect{ | row |
 
-              "TABLE_ROW_ITEMS" => row_items.join("") 
-            
+              row_items = row.collect{ | row_item |
+              
+                apply_macros!( @templates["behaviour.xml.table.item"].clone, {
+                    "ITEM" => encode_string( row_item )
+                  }
+                )
               }
-            )
-                        
-          }
 
-          apply_macros!( @templates["behaviour.xml.table"].clone, {
-              "TABLE_NAME" => encode_string( table[ "name" ] ),
-              "TABLE_TITLE" => encode_string( table[ "title" ] || "" ),
-              "TABLE_DESCRIPTION" => encode_string( table[ "description" ] || "" ),
-              "TABLE_HEADER_ITEMS" => header.join(""),
-              "TABLE_ROWS" => rows.join("")
+              apply_macros!( @templates["behaviour.xml.table.row"].clone, {
+
+                "TABLE_ROW_ITEMS" => row_items.join("") 
+              
+                }
+              )
+                          
             }
-          )
+
+            apply_macros!( @templates["behaviour.xml.table"].clone, {
+                "TABLE_NAME" => encode_string( table[ "name" ] ),
+                "TABLE_TITLE" => encode_string( table[ "title" ] || "" ),
+                "TABLE_DESCRIPTION" => encode_string( table[ "description" ] || "" ),
+                "TABLE_HEADER_ITEMS" => header.join(""),
+                "TABLE_ROWS" => rows.join("")
+              }
+            )
+
+          end
+
         }
 
       end
@@ -1690,10 +1700,7 @@ EXAMPLE
         feature_set.collect{ | feature |
                   
           @processing = feature.last[:__type]
-            
-          # TODO: tarkista lähdekoodista että onko argument optional vai ei
-          # TODO: tarkista että onko kaikki argumentit dokumentoitu
-          
+                      
           arguments = generate_arguments_element( header, feature )
 
           returns = generate_return_values_element( header, feature )

data/lib/tdriver-devtools/doc/generate.rb

@@ -15,7 +15,7 @@ def process_result_file( content )
   result = { "__file" => @current_file }
   
   # convert linefeeds to whitespace
-  content.gsub!( "\n", ' ' )
+  #content.gsub!( "\n", ' ' )
 
   # convert double whitespaces to one whitespace
   content.gsub!( '  ', ' ' )
@@ -87,9 +87,17 @@ def process_behaviour_file( content )
 
   # TODO: recursive method to parse documentation?
 
-  doc = Nokogiri::XML::parse( content )
+  begin
+
+    doc = Nokogiri::XML::parse( content )
+
+    behaviour_config = Hash[ doc.root.attributes.collect{ | attribute | [ attribute.first, attribute.last.value ] } ] # ] = attribute.last.value.split(";") }          
+
+  rescue Exception => exception 
 
-  behaviour_config = Hash[ doc.root.attributes.collect{ | attribute | [ attribute.first, attribute.last.value ] } ] # ] = attribute.last.value.split(";") }          
+    abort("Error while parsing behaviour:\n#{ content }")
+
+  end
 
   result = { "behaviours" => [], "__config" => behaviour_config }
 
@@ -342,6 +350,8 @@ def read_test_result_files( folder )
 
     @current_file = file
 
+    
+
     @feature_tests << process_result_file( open( file, 'r' ).read )
 
   }
@@ -459,6 +469,9 @@ def collect_feature_tests
         # collect step status
         step_results = ( scenario[ "step" ] || [] ).collect{ | step |
         
+          # do not process commented lines
+          next if /^#/.match( step )
+
           #p scenario
         
           if /^.*\s{1}(\w+)$/.match( step )
@@ -474,14 +487,24 @@ def collect_feature_tests
           #( /^.*\s{1}(\w+)$/.match( step ).captures || [] ).first
         
         }
+
+        # remove nils (skipped lines comment lines)
+        step_results.compact! unless step_results.nil?
         
+        unless scenario["example_step"].nil?
+
+          scenario["example_step"] = [ scenario["example_step"].join( "\n" ) ]
+
+        end
+
         ( scenario["example_step"] || [] ).collect{ | example |
 
           begin
 
-            code = /\"(.*)\"/m.match( example ).captures.first
+            code = /"([^\"]*)"\s/m.match( example ).captures.first
+            #code = /\"(.*)\"\s/m.match( example ).captures.first
 
-            status = /^.*\s{1}(\w+)$/m.match( example ).captures.first
+            status = /^.*\s{1}(\w+)$/m.match( example ).captures.to_a
 
             if status.first.to_s.downcase == 'passed'
 
@@ -505,7 +528,9 @@ def collect_feature_tests
               
             end
 
-          rescue
+          rescue Exception => exception
+
+            warn("Ambiguous 'example_step': %s (%s: %s)" % [ example.inspect, exception.class, exception.message ])
 
             code = "Error while extracting the code from test"
             status_literal = "unknown"

data/lib/tdriver-devtools/doc/xslt/template.xsl

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-
 <xsl:stylesheet version="1.0" 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   xmlns:str="http://exslt.org/strings" 
@@ -14,8 +13,8 @@
   <head>
     <style  TYPE="text/css">
 
-     body
-       {
+      body
+      {
          padding: 10px;
          border: #e7e7e7 1px solid;
          background: #ffffff;
@@ -23,40 +22,39 @@
          font-size: 13px;
          cursor: default;
          text-shadow: #909090 1px 1px 4px;
-       }
+      }
      
       div.feature_title
       {
 
-        background: #c1c1c1;
+        padding: 8px;
 
-        border-top: 1px solid #c9c9c9;
-        border-left: 1px solid #c9c9c9;
+        background: #404040;
 
-        border-bottom: 1px solid #aaaaaa;
-        border-right: 1px solid #aaaaaa;
+        border-top: 1px solid #484848;
+        border-left: 1px solid #484848;
 
-        padding: 8px;
+        border-bottom: 1px solid #2a2a2a;
+        border-right: 1px solid #2a2a2a;
 
-        -moz-box-shadow: 1px 1px 4px #818181;
-        -webkit-box-shadow: 1px 1px 4px #818181;
+        -moz-box-shadow: 1px 1px 4px #010101;
+        -webkit-box-shadow: 1px 1px 4px #010101;
  
       }
 
       span.feature_title_text, a.feature_name_link
       {
         text-decoration: none;
-        font-size: 14px; 
-        color: #606060;
-
-        text-shadow: gray 2px 2px 3px;
+        font-size: 20px; 
+        color: #FFFFFF;
+        text-shadow: #101010 2px 2px 3px;
         font-weight: bold;
       }
   
       span.feature_title_text:hover
       { 
 
-        color: #404040; 
+
 
       }
 
@@ -134,6 +132,14 @@
 
         background: #f0a646;
 
+        border-top: 1px solid #707070;
+        border-left: 1px solid #707070;
+
+        background: #606260;
+
+        border-bottom: 1px solid #595959;
+        border-right: 1px solid #595959;
+
       }
 
       <!-- table-style: cellpadding -->
@@ -149,14 +155,15 @@
       td.header
       {
 
-        background: #96E066;
-
         font-size: 11px;      
-        border-top: 1px solid #a6f076;
-        border-left: 1px solid #a6f076;
+        border-top: 1px solid #a0a0a0;
+        border-left: 1px solid #a0a0a0;
+
+        background: #909290;
+
+        border-bottom: 1px solid #797979;
+        border-right: 1px solid #797979;
 
-        border-bottom: 1px solid #7fc94f;
-        border-right: 1px solid #7fc94f;
 
       }
 
@@ -200,7 +207,11 @@
 
       td.tablebg_disabled
       {
-        background: #c5c5c5;
+
+        background: #d5d5d5;
+
+        background-image:url('images/bg_disabled.png');
+        background-repeat: repeat;
 
         border-top: 1px solid #cdcdcd;
         border-left: 1px solid #cdcdcd;
@@ -230,6 +241,10 @@
       
         font-family: monospace;
         font-size: 11px;
+
+        white-space: pre-wrap;       
+        word-wrap: break-word;
+        break-word: break-all;
       
       }
 
@@ -338,8 +353,13 @@
         text-decoration: none;
 
         color: #d15131;
+
+        color: #a06060;
+
         text-shadow: #ff8f6f 1px 1px 4px;
 
+        text-shadow: #b0a0a0 1px 1px 4px;
+
         border-bottom: 1px dotted #515151;
         font-weight: bold;
 
@@ -1064,7 +1084,8 @@
             </xsl:when>
 
             <xsl:when test="string(example/text())='-'">
-              <td class="tablebg_disabled" rowspan="{ $argument_types }"><xsl:value-of select="$default"/></td>
+              <!-- <td class="tablebg_disabled" rowspan="{ $argument_types }"><xsl:value-of select="$default"/></td> -->
+              <td class="tablebg_disabled"><xsl:value-of select="example/text()"/></td>
             </xsl:when>
 
             <xsl:when test="string-length(example/text())>0">

data/lib/tdriver-devtools/tests/feature_tests/example/behaviour_example.rb

@@ -0,0 +1,100 @@
+############################################################################
+## 
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+## All rights reserved. 
+## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
+## 
+## This file is part of TDriver. 
+## 
+## 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 MobyBehaviour
+
+    # == description
+    # Example description
+    #
+    # == behaviour
+    # ExampleBehaviour
+    #
+    # == requires
+    # *
+    #
+    # == input_type
+    # *
+    #
+    # == sut_type
+    # *
+    #
+    # == sut_version
+    # *
+    #
+    # == objects
+    # *;sut
+    #
+    module Gesture
+      
+    attr_accessor :attribute_accessor_example
+
+    attr_reader :attribute_reader_example
+
+    attr_writer :attribute_writer_example
+      
+    # overwrite attribute_reader_example 
+    def overwrite attribute_reader_example
+    end
+
+    # overwrite attribute_accessor_example writer
+    def attribute_accessor_example=(value)
+    end
+ 
+    # == description
+    # Cause a example_method operation on the screen. 
+    #
+    # == arguments
+    # argument1
+    #  Integer
+    #    description:  Example argument1
+    #    example:    10
+    #    default:          
+    #  Hash
+    #    description:  Example argument 1 type 2
+    #    example:  { :optional_1 => "value_1", :optional_2 => "value_2" }
+    #    default:
+    #
+    # argument2
+    #  String
+    #    description:  Example argument2
+    #    example:    "Hello"
+    #    default:    
+    #
+    # == returns
+    # String
+    #  description:  Return value type
+    #   example:    "World"
+    # 
+    # == exceptions
+    # RuntimeError
+    #   description:  example exception
+    #
+    # ArgumentError
+    #   description:  example exception
+    #    
+    # == example
+    # example_method( :Down, :Value, { :optional_1 => "value_1", :optional_2 => "value_2" } )
+    #
+    # == info
+    # See method X, table at Y
+    #
+    def example_method( direction, value = :Value, z = ',', optional_params = {}, y = ',' )
+    end
+
+end