cosmos 3.4.2 → 3.5.0

data/lib/cosmos/tools/replay/replay.rb

@@ -48,7 +48,7 @@ module Cosmos
       end
 
       # Initialize variables
-      @packet_log_reader  = System.default_packet_log_reader.new
+      @packet_log_reader = System.default_packet_log_reader.new
       @log_directory = System.paths['LOGS']
       @log_directory << '/' unless @log_directory[-1..-1] == '\\' or @log_directory[-1..-1] == '/'
       @log_filename = nil
@@ -225,6 +225,7 @@ module Cosmos
             progress_dialog.set_overall_progress(0.0)
             progress_dialog.cancel_callback = method(:cancel_callback)
             progress_dialog.enable_cancel_button
+            Cosmos.check_log_configuration(@packet_log_reader, selection)
             @packet_offsets = @packet_log_reader.packet_offsets(selection, lambda {|percentage| progress_dialog.set_overall_progress(percentage); @cancel})
             @playback_index = 0
             update_slider_and_current_time(nil)
@@ -393,55 +394,60 @@ module Cosmos
     end
 
     def handle_packet(packet)
-      interface = nil
-
-      # Identify and update packet
-      if packet.identified?
-        # Preidentifed packet - place it into the current value table
-        identified_packet = System.telemetry.update!(packet.target_name,
-                                                     packet.packet_name,
-                                                     packet.buffer)
-      else
-        # Packet needs to be identified
-        identified_packet = System.telemetry.identify!(packet.buffer)
-      end
+      # For replay we will try our best here but not crash on errors
+      begin
+        interface = nil
+
+        # Identify and update packet
+        if packet.identified?
+          # Preidentifed packet - place it into the current value table
+          identified_packet = System.telemetry.update!(packet.target_name,
+                                                       packet.packet_name,
+                                                       packet.buffer)
+        else
+          # Packet needs to be identified
+          identified_packet = System.telemetry.identify!(packet.buffer)
+        end
 
-      if identified_packet and packet.target_name != 'UNKNOWN'
-        identified_packet.received_time = packet.received_time
-        packet = identified_packet
-        target = System.targets[packet.target_name.upcase]
-        interface = target.interface if target
-      else
-        unknown_packet = System.telemetry.update!('UNKNOWN', 'UNKNOWN', packet.buffer)
-        unknown_packet.received_time = packet.received_time
-        packet = unknown_packet
-        data_length = packet.length
-        string = "Unknown #{data_length} byte packet starting: "
-        num_bytes_to_print = [UNKNOWN_BYTES_TO_PRINT, data_length].min
-        data_to_print = packet.buffer(false)[0..(num_bytes_to_print - 1)]
-        data_to_print.each_byte do |byte|
-          string << sprintf("%02X", byte)
+        if identified_packet and packet.target_name != 'UNKNOWN'
+          identified_packet.received_time = packet.received_time
+          packet = identified_packet
+          target = System.targets[packet.target_name.upcase]
+          interface = target.interface if target
+        else
+          unknown_packet = System.telemetry.update!('UNKNOWN', 'UNKNOWN', packet.buffer)
+          unknown_packet.received_time = packet.received_time
+          packet = unknown_packet
+          data_length = packet.length
+          string = "Unknown #{data_length} byte packet starting: "
+          num_bytes_to_print = [UNKNOWN_BYTES_TO_PRINT, data_length].min
+          data_to_print = packet.buffer(false)[0..(num_bytes_to_print - 1)]
+          data_to_print.each_byte do |byte|
+            string << sprintf("%02X", byte)
+          end
+          time_string = ''
+          time_string = packet.received_time.formatted << '  ' if packet.received_time
+          puts "#{time_string}ERROR:  #{string}"
         end
-        time_string = ''
-        time_string = packet.received_time.formatted << '  ' if packet.received_time
-        puts "#{time_string}ERROR:  #{string}"
-      end
 
-      target = System.targets[packet.target_name]
-      target.tlm_cnt += 1 if target
-      packet.received_count += 1
-      packet.check_limits(System.limits_set)
-      ReplayServer.instance.post_packet(packet)
-
-      # Write to routers
-      if interface
-        interface.routers.each do |router|
-          begin
-            router.write(packet) if router.write_allowed? and router.connected?
-          rescue => err
-            Logger.error "Problem writing to router #{router.name} - #{err.class}:#{err.message}"
+        target = System.targets[packet.target_name]
+        target.tlm_cnt += 1 if target
+        packet.received_count += 1
+        packet.check_limits(System.limits_set)
+        ReplayServer.instance.post_packet(packet)
+
+        # Write to routers
+        if interface
+          interface.routers.each do |router|
+            begin
+              router.write(packet) if router.write_allowed? and router.connected?
+            rescue => err
+              Logger.error "Problem writing to router #{router.name} - #{err.class}:#{err.message}"
+            end
           end
         end
+      rescue Exception => err
+        Logger.error "Problem handling packet #{packet.target_name} #{packet.packet_name} - #{err.class}:#{err.message}"
       end
     end
 

data/lib/cosmos/tools/script_runner/script_runner.rb

@@ -159,31 +159,39 @@ module Cosmos
       @search_find_keyseq = Qt::KeySequence.new(tr('Ctrl+F'))
       @search_find.shortcut  = @search_find_keyseq
       @search_find.statusTip = tr('Find text')
-      @search_find.connect(SIGNAL('triggered()')) { active_script_runner_frame.find() }
+      @search_find.connect(SIGNAL('triggered()')) do
+        FindReplaceDialog.show_find(active_script_runner_frame().script)
+      end
 
       @search_find_next = Qt::Action.new(tr('Find &Next'), self)
       @search_find_next_keyseq = Qt::KeySequence.new(tr('F3'))
       @search_find_next.shortcut  = @search_find_next_keyseq
       @search_find_next.statusTip = tr('Find next instance')
-      @search_find_next.connect(SIGNAL('triggered()')) { active_script_runner_frame.find_next() }
+      @search_find_next.connect(SIGNAL('triggered()')) do
+        FindReplaceDialog.find_next(active_script_runner_frame().script)
+      end
 
       @search_find_previous = Qt::Action.new(tr('Find &Previous'), self)
       @search_find_previous_keyseq = Qt::KeySequence.new(tr('Shift+F3'))
       @search_find_previous.shortcut  = @search_find_previous_keyseq
       @search_find_previous.statusTip = tr('Find previous instance')
-      @search_find_previous.connect(SIGNAL('triggered()')) { active_script_runner_frame.find_previous() }
+      @search_find_previous.connect(SIGNAL('triggered()')) do
+        FindReplaceDialog.find_previous(active_script_runner_frame().script)
+      end
 
       @search_replace = Qt::Action.new(tr('&Replace'), self)
       @search_replace_keyseq = Qt::KeySequence.new(tr('Ctrl+H'))
       @search_replace.shortcut  = @search_replace_keyseq
       @search_replace.statusTip = tr('Replace')
-      @search_replace.connect(SIGNAL('triggered()')) { active_script_runner_frame.replace() }
+      @search_replace.connect(SIGNAL('triggered()')) do
+        FindReplaceDialog.show_replace(active_script_runner_frame().script)
+      end
 
       # Script Actions
       @script_syntax_all = Qt::Action.new(tr('&Ruby Syntax Check'), self)
       @script_syntax_all.statusTip = tr('Check ruby syntax of this script')
       @script_syntax_all.connect(SIGNAL('triggered()')) do
-        active_script_runner_frame().ruby_syntax_check_text(active_script_runner_frame().text)
+        active_script_runner_frame().ruby_syntax_check_text()
       end
 
       @script_mnemonic_all = Qt::Action.new(tr('&Mnemonic Check'), self)

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -37,11 +37,9 @@ module Cosmos
   class ScriptRunnerDialog < Qt::Dialog
     attr_reader :script_runner_frame
 
-    # Constructor
     def initialize(parent,
                    title,
                    default_tab_text = 'Untitled')
-      # Call base class constructor
       super(parent)
       setWindowTitle(title)
       setMinimumWidth(parent.width * 0.8)
@@ -52,7 +50,7 @@ module Cosmos
       layout = Qt::VBoxLayout.new
       layout.addWidget(@script_runner_frame)
       setLayout(layout)
-    end # def initialize
+    end
 
     # Executes the given text and closes when complete
     def execute_text_and_close_on_complete(text, text_binding = nil)
@@ -102,6 +100,7 @@ module Cosmos
     attr_reader   :script_class
     attr_reader   :top_level_instrumented_cache
     attr_accessor :stdout_max_lines
+    attr_reader   :script
 
     @@instance = nil
     @@run_thread = nil
@@ -650,7 +649,7 @@ module Cosmos
     # Implement the breakpoint callbacks from the RubyEditor
     ######################################
     def breakpoint_set(line)
-      ScriptRunnerFrame.breakpoint(current_tab_filename(), line)
+      ScriptRunnerFrame.set_breakpoint(current_tab_filename(), line)
     end
 
     def breakpoint_cleared(line)
@@ -692,107 +691,6 @@ module Cosmos
       @script.comment_or_uncomment_lines unless running?()
     end
 
-    ##################################################################
-    # Implement Search functionality in the frame (find, replace, etc)
-    ##################################################################
-    def find
-      unless @find_dialog
-        @find_dialog = FindReplaceDialog.new(@script)
-        @find_dialog.connect(SIGNAL('find_next()')) { dialog_find(@find_dialog) }
-      end
-      @find_dialog.show
-      @find_dialog.raise
-      @find_dialog.activateWindow
-    end
-
-    def find_next
-      flags = FindReplaceDialog.find_flags
-      flags &= ~Qt::TextDocument::FindBackward.to_i
-      found = @script.find(FindReplaceDialog.find_text, flags)
-      if not found and FindReplaceDialog.wrap_around?
-        cursor = @script.textCursor
-        cursor.movePosition(Qt::TextCursor::Start)
-        @script.setTextCursor(cursor)
-        @script.find(FindReplaceDialog.find_text, flags)
-      end
-    end
-
-    def find_previous
-      flags = FindReplaceDialog.find_flags
-      flags |= Qt::TextDocument::FindBackward.to_i
-      found = @script.find(FindReplaceDialog.find_text, flags)
-      if not found and FindReplaceDialog.wrap_around?
-        cursor = @script.textCursor
-        cursor.movePosition(Qt::TextCursor::End)
-        @script.setTextCursor(cursor)
-        @script.find(FindReplaceDialog.find_text, flags)
-      end
-    end
-
-    def replace
-      unless @replace_dialog
-        @replace_dialog = FindReplaceDialog.new(@script, true)
-        @replace_dialog.connect(SIGNAL('find_next()')) { dialog_find(@replace_dialog) }
-        @replace_dialog.connect(SIGNAL('replace()')) { dialog_replace(@replace_dialog) }
-        @replace_dialog.connect(SIGNAL('replace_all()')) { dialog_replace_all(@replace_dialog) }
-      end
-      @replace_dialog.show
-      @replace_dialog.raise
-      @replace_dialog.activateWindow
-    end
-
-    def dialog_find(dialog)
-      found = @script.find(dialog.find_text, dialog.find_flags)
-      if not found and dialog.wrap_around?
-        cursor = @script.textCursor
-        if dialog.find_up?
-          cursor.movePosition(Qt::TextCursor::End)
-        else
-          cursor.movePosition(Qt::TextCursor::Start)
-        end
-        @script.setTextCursor(cursor)
-        @script.find(dialog.find_text, dialog.find_flags)
-      end
-    end
-
-    def dialog_replace(dialog)
-      if @script.textCursor.hasSelection &&
-        @script.textCursor.selectedText == dialog.find_text
-        found = true
-      else
-        found = @script.find(dialog.find_text, dialog.find_flags)
-        if not found and dialog.wrap_around?
-          cursor = @script.textCursor
-          if dialog.find_up?
-            cursor.movePosition(Qt::TextCursor::End)
-          else
-            cursor.movePosition(Qt::TextCursor::Start)
-          end
-          @script.setTextCursor(cursor)
-          found = @script.find(dialog.find_text, dialog.find_flags)
-        end
-      end
-      if found
-        @script.textCursor.removeSelectedText
-        @script.textCursor.insertText(dialog.replace_text)
-        cursor = @script.textCursor
-        cursor.setPosition(cursor.position-1)
-        cursor.select(Qt::TextCursor::WordUnderCursor)
-        @script.setTextCursor(cursor)
-      end
-    end
-
-    def dialog_replace_all(dialog)
-      cursor = @script.textCursor
-      cursor.movePosition(Qt::TextCursor::Start)
-      @script.setTextCursor(cursor)
-
-      while (@script.find(dialog.find_text, dialog.find_flags) == true)
-        @script.textCursor.removeSelectedText
-        @script.textCursor.insertText(dialog.replace_text)
-      end
-    end
-
     ##################################################################################
     # Implement Script functionality in the frame (run selection, run from cursor, etc
     ##################################################################################
@@ -840,10 +738,11 @@ module Cosmos
       end
     end
 
-    def ruby_syntax_check_text(text)
+    def ruby_syntax_check_text(selection = nil)
       unless self.class.running?()
+        selection = text() unless selection
         check_process = IO.popen("ruby -c -rubygems 2>&1", 'r+')
-        check_process.write("require 'cosmos'; require 'cosmos/script'; " + text)
+        check_process.write("require 'cosmos'; require 'cosmos/script'; " + selection)
         check_process.close_write
         results = check_process.gets
         check_process.close
@@ -1060,7 +959,7 @@ module Cosmos
       @debug_frame = nil
     end
 
-    def self.breakpoint(filename, line_number)
+    def self.set_breakpoint(filename, line_number)
       filename = File.basename(filename)
       @@breakpoints[filename] ||= {}
       @@breakpoints[filename][line_number] = true
@@ -1645,7 +1544,7 @@ module Cosmos
       breakpoints = @@breakpoints[File.basename(filename)]
       if breakpoints
         breakpoints.each do |line_number, present|
-          @active_script.breakpoint(line_number) if present
+          @active_script.add_breakpoint(line_number) if present
         end
       end
     end

data/lib/cosmos/tools/test_runner/test.rb

@@ -48,21 +48,30 @@ module Cosmos
   class TestResult
     attr_accessor :test
     attr_accessor :test_case
+    attr_accessor :test_suite
     attr_accessor :output
     attr_accessor :exceptions
     attr_accessor :stopped
     attr_accessor :result
     attr_accessor :message
 
+    @@test_suite = nil
+
     def initialize
       @test = nil
       @test_case = nil
+      @test_suite = nil
+      @test_suite = @@test_suite.clone if @@test_suite
       @output = nil
       @exceptions = nil
       @stopped = false
       @result = :SKIP
       @message = nil
     end
+
+    def self.test_suite= (test_suite)
+      @@test_suite = test_suite
+    end
   end # class TestResult
 
   # TestGroup class
@@ -104,7 +113,7 @@ module Cosmos
     # Name of the test
     def name
       if self.class != Test
-        self.class.to_s
+        self.class.to_s.split('::')[-1]
       else
         'UnnamedTest'
       end
@@ -160,7 +169,7 @@ module Cosmos
         $stdout.add_stream(@output_io)
         $stderr.add_stream(@output_io)
 
-        result.test      = object.class.to_s
+        result.test = object.class.to_s.split('::')[-1]
         result.test_case = method_name.to_s
         begin
           if defined? ScriptRunnerFrame
@@ -273,6 +282,38 @@ module Cosmos
         @@current_test_result.message << "\n"
       end
     end
+
+    def self.current_test_suite
+      if @@current_test_result
+        @@current_test_result.test_suite
+      else
+        nil
+      end
+    end
+
+    def self.current_test_group
+      if @@current_test_result
+        @@current_test_result.test
+      else
+        nil
+      end
+    end
+
+    def self.current_test
+      if @@current_test_result
+        @@current_test_result.test
+      else
+        nil
+      end
+    end
+
+    def self.current_test_case
+      if @@current_test_result
+        @@current_test_result.test_case
+      else
+        nil
+      end
+    end
   end # class Test
 
   class TestSuite
@@ -291,7 +332,7 @@ module Cosmos
     # Name of the test suite
     def name
       if self.class != TestSuite
-        self.class.to_s
+        self.class.to_s.split('::')[-1]
       else
         'UnassignedTestSuite'
       end
@@ -327,6 +368,7 @@ module Cosmos
 
     # Run all the tests
     def run(&block)
+      TestResult.test_suite = name()
       TestStatus.instance.total = get_num_tests()
       results = []
 
@@ -370,11 +412,14 @@ module Cosmos
         raise StopScript if result.stopped
       end
 
+      TestResult.test_suite = nil
       results
     end
 
     # Run a specific test
     def run_test(test_class, internal = false, &block)
+      TestResult.test_suite = name() unless internal
+
       # Determine if this test_class is in the plan and the number of tests associated with this test_class
       in_plan = false
       num_tests = 0
@@ -422,43 +467,57 @@ module Cosmos
         end
       end
 
+      TestResult.test_suite = nil unless internal
       return results
     end
 
     # Run a specific test case
     def run_test_case(test_class, test_case, internal = false)
+      TestResult.test_suite = name() unless internal
       TestStatus.instance.total = 1 unless internal
-      @tests[test_class].run_test_case(test_case)
+      result = @tests[test_class].run_test_case(test_case)
+      TestResult.test_suite = nil unless internal
+      result
     end
 
     def run_setup(internal = false)
+      TestResult.test_suite = name() unless internal
       result = nil
       if self.class.method_defined?(:setup) and @tests.length > 0
         TestStatus.instance.total = 1 unless internal
         TestStatus.instance.status = "#{self.class} : setup"
         result = @tests[@tests.keys[0]].run_function(self, :setup)
       end
+      TestResult.test_suite = nil unless internal
       result
     end
 
     def run_teardown(internal = false)
+      TestResult.test_suite = name() unless internal
       result = nil
       if self.class.method_defined?(:teardown) and @tests.length > 0
         TestStatus.instance.total = 1 unless internal
         TestStatus.instance.status = "#{self.class} : teardown"
         result = @tests[@tests.keys[0]].run_function(self, :teardown)
       end
+      TestResult.test_suite = nil unless internal
       result
     end
 
     def run_test_setup(test_class, internal = false)
+      TestResult.test_suite = name() unless internal
       TestStatus.instance.total = 1 unless internal
-      @tests[test_class].run_setup
+      result = @tests[test_class].run_setup
+      TestResult.test_suite = nil unless internal
+      result
     end
 
     def run_test_teardown(test_class, internal = false)
+      TestResult.test_suite = name() unless internal
       TestStatus.instance.total = 1 unless internal
-      @tests[test_class].run_teardown
+      result = @tests[test_class].run_teardown
+      TestResult.test_suite = nil unless internal
+      result
     end
 
     def get_num_tests