origen_testers 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd766d675c5dc9794ac28a826929bd9ddca1c602
-  data.tar.gz: 6a892c83abbc5fafda9b09cc6a25ff143d704d51
+  metadata.gz: f682217ab30f290fbde9388a14b9c7e63f00d7bb
+  data.tar.gz: 87288b479896b7e11d09b815f86339141f0a46ae
 SHA512:
-  metadata.gz: fed7f00ff4816dc84fa81d977617bad88812e6acdef1bf71c0599e3362077c5f27008f226d1b9aaf4aefb0eb74123f78a63c22eec2c16d8896576a444f7c5546
-  data.tar.gz: fa32ef3cec160f14984c94a22f7e2a8b3f2d2790b74582eec54ae4dda37d0c877b84dce979e99189e26e2794b6f7986134c66b07fd6200e61f8732f4234c39e0
+  metadata.gz: bb4f04a3f01c882aa949740d9caf1e9c684aa63a1f7e64c2ea81083be05419fbfbf8df399a560128fffaf8fdc25d346779c853b9c15e13442a54bf9995a6ee05
+  data.tar.gz: 4a02c66488678badc29a9cfcc2c972ab514071276a18dd6edece67eadd55b1a1951854b083c200d9942ae3952b89985e0d954929fd32cc7156859e8f8665e2e2

data/config/version.rb

@@ -1,6 +1,6 @@
 module OrigenTesters
   MAJOR = 0
-  MINOR = 17
+  MINOR = 18
   BUGFIX = 0
   DEV = nil
 

data/lib/origen_testers/api.rb

@@ -142,7 +142,17 @@ module OrigenTesters
     def c1(msg, options = {})
       prefix = comment_char + ' '
       prefix += step_comment_prefix + ' ' if @step_comment_on
-      push_comment(prefix + msg.to_s)
+      if Origen.tester.generating == :program
+        cc_coms = OrigenTesters::Flow.cc_comments
+        # cc call must be on line directly before test method
+        line_number = caller_locations(2, 1)[0].lineno + 1
+        unless cc_coms[line_number]
+          cc_coms[line_number] = []
+        end
+        cc_coms[line_number] << msg
+      else
+        push_comment(prefix + msg.to_s)
+      end
     end
 
     def c2(msg, options = {})

data/lib/origen_testers/flow.rb

@@ -48,6 +48,38 @@ module OrigenTesters
       @lines
     end
 
+    # @api private
+    def self.ht_comments
+      unless @ht_comments.is_a? Hash
+        @ht_comments = {}
+      end
+      @ht_comments
+    end
+
+    # @api private
+    def self.ht_comments=(val)
+      unless @ht_comments.is_a? Hash
+        @ht_comments = {}
+      end
+      @ht_comments = val
+    end
+
+    # @api private
+    def self.cc_comments
+      unless @cc_comments.is_a? Hash
+        @cc_comments = {}
+      end
+      @cc_comments
+    end
+
+    # @api private
+    def self.cc_comments=(val)
+      unless @cc_comments.is_a? Hash
+        @cc_comments = {}
+      end
+      @cc_comments = val
+    end
+
     # Returns the abstract test program model, this is shared by all
     # flow created together in a generation run
     def program
@@ -173,14 +205,17 @@ module OrigenTesters
       # e.g. a POR, in that case they will not want the description to be attached to the POR, but to
       # the test that follows it
       unless options[:inhibit_description_consumption]
-        comments = OrigenTesters::Flow.comment_stack.last
-        if options[:source_line_number]
-          while comments.first && comments.first.first < options[:source_line_number]
-            options[:description] ||= []
-            c = comments.shift
-            if c[0] + c[1].size == options[:source_line_number]
-              options[:description] += c[1]
-            end
+        ht_coms = OrigenTesters::Flow.ht_comments
+        cc_coms = OrigenTesters::Flow.cc_comments
+        line_no = options[:source_line_number]
+        # options[:then] only present on the second iteration of the same test same loop (not sure what this is really)
+        # This method is called twice per test method in a loop but the second call should not consume a comment
+        if line_no && !options[:then]
+          if ht_coms[line_no]
+            options[:description] ||= ht_coms[line_no]
+          end
+          if cc_coms[line_no] && cc_coms[line_no].first
+            options[:description] ||= [cc_coms[line_no].shift]
           end
         end
       end

data/lib/origen_testers/origen_ext/generator/flow.rb

@@ -24,6 +24,11 @@ module Origen
         OrigenTesters::Flow.callstack << file
         flow_comments, comments = *_extract_comments(OrigenTesters::Flow.callstack.last, line.to_i)
         OrigenTesters::Flow.comment_stack << comments
+        OrigenTesters::Flow.ht_comments = {}
+        comments.each do |src_line, com_array|
+          flow_src_line = src_line + com_array.size
+          OrigenTesters::Flow.ht_comments[flow_src_line] = com_array
+        end
         if OrigenTesters::Flow.flow_comments
           top = false
           name = options[:name] || Pathname.new(file).basename('.rb').to_s.sub(/^_/, '')

data/lib/origen_testers/smartest_based_tester/base/test_method.rb

@@ -15,6 +15,7 @@ module OrigenTesters
         attr_reader :parameters
         attr_accessor :class_name
         attr_accessor :abs_class_name
+        attr_accessor :limits_id
 
         def initialize(options)
           @type = options[:type]
@@ -25,6 +26,7 @@ module OrigenTesters
           define_singleton_method('limits') do
             @limits
           end
+          @limits_id = options[:methods].delete(:limits_id)
           @limits = TestMethods::Limits.new(self)
           # Add any methods
           if options[:methods][:methods]

data/lib/origen_testers/smartest_based_tester/base/test_methods/limits.rb

@@ -55,8 +55,12 @@ module OrigenTesters
           private
 
           def test_name
-            name = test_method.test_name if test_method.respond_to?(:test_name)
-            name || 'Functional'
+            if test_method.limits_id.nil?
+              name = test_method.try(:test_name) || test_method.try(:_test_name) || test_method.try('TestName')
+              name || 'Functional'
+            else
+              test_method.limits_id
+            end
           end
         end
       end

data/program/components/_prb1_main.rb

@@ -221,5 +221,10 @@ Flow.create do |options|
     bin 13, unless_enable: "AlarmEnabled"
   end
 
+  3.times do |k|
+    cc "cc test #{k}"
+    func "cc_test_#{k}".to_sym
+  end
+
   pass 1, description: "Good die!", softbin: 1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: 
 email:
 - stephen.f.mcginty@gmail.com