testability-driver 1.0.2 → 1.0.3

data/lib/tdriver/base/sut/generic/behaviours/sut.rb

@@ -862,7 +862,7 @@ module MobyBehaviour
   # 
   # lengthvariant
   #  String
-  #   description: Optional LENGTHVAR search argument for the translation (1-9)
+  #   description: Optional argument to specify a length variant with its priority number (1-9). Translations with no length variants are considered a variant of priority "1". The default 'nil' value will retrieve all variants available.
   #   example: "1"
   #   default: nil
   #

data/lib/tdriver/base/sut/sut.rb

@@ -40,9 +40,14 @@ module MobyBase
       @_sutController = sut_controller
       
       @test_object_factory = test_object_factory || TDriver::TestObjectFactory.new( :test_object_adapter => TDriver::TestObjectAdapter )
-
+      
       @id = sut_id
-      @input = :key
+
+      # reference to self; easier to access (parent) SUT in shared behaviours applied to test object/sut/application 
+      @sut = self
+      
+      # default values
+      @input = :key      
       @type = "sut"
 
     end  

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

@@ -555,18 +555,25 @@ module MobyBase
       # verify given identification directives, only documented end-user directives is checked
       identification_directives.each{ | key, value |
       
+        # do not verify type by default
+        type = nil
+      
         case key
 
           # Fixnum          
-          when :__index, :__timeout, :__logging 
-            value.check_type( Fixnum, "Wrong variable type $1 for #{ key.inspect } test object identification directive (expected $2)" )
+          when :__index, :__timeout
+          
+            type = Fixnum
+                    
+          when :__logging, :__xy_sorting
           
-          # TrueClass, FalseClass
-          when :__xy_sorting
-            value.check_type( [ TrueClass, FalseClass ], "Wrong variable type $1 for #{ key.inspect } test object identification directive (expected $2)" )
+            type = [ TrueClass, FalseClass ]
           
         end
-      
+
+        # verify hash value if type defined 
+        value.check_type( type, "Wrong variable type $1 for #{ key.inspect } test object identification directive (expected $2)" ) unless type.nil?
+
       }
       
       # get parent object

data/lib/tdriver/util/localisation/localisation.rb

@@ -541,9 +541,10 @@ module MobyUtil
 							priority += 1					
 						end
 					else
+            # When no lengthvar is provided we now assign priority '1' by default
 						# puts ">>> Translation"
 						nodeTranslation = node.xpath('.//translation').inner_text()
-						data << [ fname, nodeId, nodeTranslation, nodePlurality, nodeLengthVar ]
+						data << [ fname, nodeId, nodeTranslation, nodePlurality, nodeLengthVar = '1' ]
 					end
 				rescue Exception # ignores bad elements or elements with empty translations for now
 				end
@@ -571,8 +572,9 @@ module MobyUtil
       while line = io.gets
         if line.match(/#define ([a-zA-Z1-9\_]*) \"(.*)\"/)
           lname = $1
-          translation = $2 
-          data <<  [ fname, lname, translation, plurality = "", lengthvariant = "0" ]
+          translation = $2
+          # When no lengthvar is provided we now assign priority '1' by default          
+          data <<  [ fname, lname, translation, plurality = "", lengthvariant = "1" ]
         end
       end
       io.close
@@ -604,14 +606,15 @@ module MobyUtil
 			sql_file = File.open(table_name + ".#{db_connection.db_type}.sql", 'a') if record_sql
 
 			# CREATE TABLE if doesn't exist (language columns to be created as needed)
+      # When no lengthvar is provided we now assign priority '1' by default
 			case db_connection.db_type
 				when "mysql"
 					query_string = "CREATE TABLE IF NOT EXISTS " + table_name + " ( 
 									`ID` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 									`FNAME` VARCHAR(150) NOT NULL COLLATE latin1_general_ci,
 									`LNAME` VARCHAR(150) NOT NULL COLLATE latin1_general_ci,
-									`PLURALITY` VARCHAR(50) COLLATE latin1_general_ci,
-									`LENGTHVAR` INT(10),
+									`PLURALITY` VARCHAR(50) NULL DEFAULT NULL COLLATE latin1_general_ci,
+									`LENGTHVAR` INT(10) NULL DEFAULT '1',
 									PRIMARY KEY (`ID`),
 									UNIQUE INDEX `FileLogicNameIndex` (`FNAME`,`LNAME`, `PLURALITY`, `LENGTHVAR`),
 									INDEX `LNameIndex` (`LNAME`)
@@ -623,8 +626,8 @@ module MobyUtil
 									`ID` INTEGER PRIMARY KEY AUTOINCREMENT,
 									`FNAME` VARCHAR(150) NOT NULL,
 									`LNAME` VARCHAR(150) NOT NULL,
-									`PLURALITY` VARCHAR(50),
-									`LENGTHVAR` INT(10));"
+									`PLURALITY` VARCHAR(50) DEFAULT NULL,
+									`LENGTHVAR` INT(10) DEFAULT '1');"
 					MobyUtil::DBAccess.query( db_connection, query_string )
 					sql_file.write( query_string + "\n" ) if record_sql
 					

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Testability Driver team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin/
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +02:00
+date: 2011-01-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency