cosmos 4.1.1-java → 4.2.0-java

data/spec/script/telemetry_spec.rb

@@ -10,13 +10,17 @@
 
 require 'spec_helper'
 require 'cosmos'
-require 'cosmos/script/script'
+require 'cosmos/script'
 require 'tempfile'
 
 module Cosmos
   describe Script do
     before(:all) do
+      # Save cmd_tlm_server.txt
       @cts = File.join(Cosmos::USERPATH,'config','tools','cmd_tlm_server','cmd_tlm_server.txt')
+      FileUtils.mv @cts, Cosmos::USERPATH
+
+      # Recreate cmd_tlm_server.txt with a PROTOCOL
       FileUtils.mkdir_p(File.dirname(@cts))
       File.open(@cts,'w') do |file|
         file.puts 'INTERFACE INST_INT interface.rb'
@@ -28,8 +32,10 @@ module Cosmos
     end
 
     after(:all) do
-      clean_config()
-      FileUtils.rm_rf File.join(Cosmos::USERPATH,'config','tools')
+      # Restore cmd_tlm_server.txt
+      FileUtils.mv File.join(Cosmos::USERPATH, 'cmd_tlm_server.txt'),
+      File.join(Cosmos::USERPATH,'config','tools','cmd_tlm_server')
+      System.class_eval('@@instance = nil')
     end
 
     before(:each) do
@@ -163,11 +169,10 @@ module Cosmos
 
       it "subscribes and gets packets" do
         id = subscribe_packet_data([["SYSTEM","META"]])
-        inject_tlm("SYSTEM", "META")
         packet = get_packet(id)
+        inject_tlm("SYSTEM", "META")
         expect(packet.target_name).to eql "SYSTEM"
         expect(packet.packet_name).to eql "META"
-        expect(packet.received_time).to be_within(1).of Time.now
         expect(packet.received_count).to eql 0
         packet = get_packet(id)
         expect(packet.target_name).to eql "SYSTEM"

data/spec/script/tools_spec.rb

@@ -10,30 +10,11 @@
 
 require 'spec_helper'
 require 'cosmos'
-require 'cosmos/script/script'
+require 'cosmos/script'
 require 'tempfile'
 
 module Cosmos
-
   describe Script do
-
-    before(:all) do
-      cts = File.join(Cosmos::USERPATH,'config','tools','cmd_tlm_server','cmd_tlm_server.txt')
-      FileUtils.mkdir_p(File.dirname(cts))
-      File.open(cts,'w') do |file|
-        file.puts 'INTERFACE INST_INT interface.rb'
-        file.puts 'TARGET INST'
-      end
-      System.class_eval('@@instance = nil')
-
-      require 'cosmos/script'
-    end
-
-    after(:all) do
-      clean_config()
-      FileUtils.rm_rf File.join(Cosmos::USERPATH,'config','tools')
-    end
-
     before(:each) do
       allow_any_instance_of(Interface).to receive(:connected?).and_return(true)
       allow_any_instance_of(Interface).to receive(:disconnect)
@@ -118,9 +99,7 @@ module Cosmos
         get_line_delay
         get_scriptrunner_message_log_filename
         start_new_scriptrunner_message_log
-        disable_instrumentation do
-          value = 1
-        end
+        disable_instrumentation { }
         set_stdout_max_lines(1000)
         insert_return
         step_mode
@@ -131,4 +110,3 @@ module Cosmos
 
   end
 end
-

data/spec/spec_helper.rb

@@ -38,10 +38,13 @@ if !ENV['COSMOS_NO_SIMPLECOV']
     add_group 'GUI', 'gui'
     add_group 'Tools', 'tools'
     root = File.dirname(__FILE__)
+    root.to_s
   end
   SimpleCov.at_exit do
-    Encoding.default_external = Encoding::UTF_8
-    Encoding.default_internal = nil
+    Cosmos.disable_warnings do
+      Encoding.default_external = Encoding::UTF_8
+      Encoding.default_internal = nil
+    end
     SimpleCov.result.format!
   end
 end
@@ -73,8 +76,11 @@ RSpec.configure do |config|
   end
 
   config.after(:all) {
-    def Object.exit(*args)
-      old_exit(*args)
+    clean_config()
+    Cosmos.disable_warnings do
+      def Object.exit(*args)
+        old_exit(*args)
+      end
     end
   }
 
@@ -101,7 +107,7 @@ end
 
 # Clean up the spec configuration directory
 def clean_config
-  %w(outputs/logs outputs/saved_config outputs/tmp outputs/tables outputs/handbooks).each do |dir|
+  %w(outputs/logs outputs/saved_config outputs/tmp outputs/tables outputs/handbooks procedures).each do |dir|
     FileUtils.rm_rf(Dir.glob(File.join(Cosmos::USERPATH, dir, '*')))
   end
 end

data/spec/system/system_spec.rb

@@ -34,6 +34,7 @@ module Cosmos
       # Restore system.txt
       FileUtils.mv File.join(Cosmos::USERPATH, 'system.txt'),
         File.join(Cosmos::USERPATH,'config','system')
+      System.class_eval('@@instance = nil')
     end
 
     after(:each) do
@@ -44,12 +45,12 @@ module Cosmos
     describe "instance" do
       it "creates default ports" do
         # Don't check the actual port numbers but just that they exist
-        expect(System.ports.keys).to eql %w(CTS_API TLMVIEWER_API CTS_PREIDENTIFIED CTS_CMD_ROUTER REPLAY_API REPLAY_PREIDENTIFIED REPLAY_CMD_ROUTER)
+        expect(System.ports.keys).to eql %w(CTS_API TLMVIEWER_API CTS_PREIDENTIFIED CTS_CMD_ROUTER REPLAY_API REPLAY_PREIDENTIFIED REPLAY_CMD_ROUTER DART_DECOM DART_STREAM)
       end
 
       it "creates default paths" do
         # Don't check the actual paths but just that they exist
-        expect(System.paths.keys).to eql %w(LOGS TMP SAVED_CONFIG TABLES HANDBOOKS PROCEDURES SEQUENCES)
+        expect(System.paths.keys).to eql %w(LOGS TMP SAVED_CONFIG TABLES HANDBOOKS PROCEDURES SEQUENCES DART_DATA DART_LOGS)
       end
 
       context "initializing SYSTEM META" do
@@ -67,12 +68,14 @@ module Cosmos
           expect(tlm.read("COSMOS_VERSION")).to_not be_nil
           expect(tlm.read("RUBY_VERSION")).to_not be_nil
           expect(tlm.read("USER_VERSION")).to_not be_nil
+          expect(tlm.received_time.to_f).to be_within(1).of(Time.now.to_f)
           cmd = System.commands.packet("SYSTEM", "META")
           expect(cmd.read("PKTID")).to eql tlm.read("PKTID")
           expect(cmd.read("CONFIG")).to eql tlm.read("CONFIG")
           expect(cmd.read("COSMOS_VERSION")).to eql tlm.read("COSMOS_VERSION")
           expect(cmd.read("RUBY_VERSION")).to eql tlm.read("RUBY_VERSION")
           expect(cmd.read("USER_VERSION")).to eql tlm.read("USER_VERSION")
+          expect(cmd.received_time.to_f).to be_within(1).of(Time.now.to_f)
         end
 
         it "defaults badly defined TELEMETRY SYSTEM META" do
@@ -94,6 +97,9 @@ module Cosmos
           System.class_variable_set(:@@instance, nil)
           System.new(tf.path)
           tlm = System.telemetry.packet("SYSTEM", "META")
+          expect(tlm.read("RECEIVED_TIMESECONDS")).to_not be_nil
+          expect(tlm.read("RECEIVED_TIMEFORMATTED")).to_not be_nil
+          expect(tlm.read("RECEIVED_COUNT")).to_not be_nil
           expect(tlm.read("PKTID")).to_not be_nil
           expect(tlm.read("CONFIG")).to_not be_nil
           expect(tlm.read("COSMOS_VERSION")).to_not be_nil
@@ -203,7 +209,7 @@ module Cosmos
        capture_io do |stdout|
          allow(Zip::File).to receive(:open) { raise "Error" }
          System.commands
-         expect(stdout.string).to match "Problem saving configuration"
+         expect(stdout.string).to match("Problem saving configuration")
        end
        File.open(@config_file, 'w') { |file| file.puts "# Comment" }
       end
@@ -263,7 +269,7 @@ module Cosmos
             expect(System.telemetry.target_names).to eql ['INST', 'SYSTEM']
             expect(System.commands.target_names).to eql ['INST', 'SYSTEM']
 
-            expect(stdout.string).to match "Marshal file does not exist"
+            expect(stdout.string).to match("Marshal file does not exist")
 
             # Reset stdout for another go at the processing
             stdout.rewind
@@ -273,7 +279,7 @@ module Cosmos
             expect(System.telemetry.target_names).to eql ['INST', 'SYSTEM']
             expect(System.commands.target_names).to eql ['INST', 'SYSTEM']
 
-            expect(stdout.string).to match "Marshal load success"
+            expect(stdout.string).to match("Marshal load success")
           end
         end
 
@@ -283,7 +289,7 @@ module Cosmos
             # This line actually does the work of reading the configuration
             expect { System.telemetry.target_names }.to raise_error("ProcessError")
 
-            expect(stdout.string).to match "Problem processing"
+            expect(stdout.string).to match("Problem processing")
           end
         end
       end
@@ -312,7 +318,7 @@ module Cosmos
           original_config_name, err = System.load_configuration
           expect(err).to eql nil
           expect(System.telemetry.target_names).to eql %w(OVERRIDE SYSTEM)
-          original_pkts = System.telemetry.packets('SYSTEM').keys
+          System.telemetry.packets('SYSTEM').keys
 
           # Create a new configuration by writing another telemetry file
           File.open(File.join(@config_targets,'SYSTEM','cmd_tlm','test1_tlm.txt'),'w') do |file|
@@ -336,10 +342,9 @@ module Cosmos
             file.puts "  APPEND_ITEM DATA 240 STRING"
           end
           System.instance.process_file(@config_file)
-          names = []
           # Verify the new telemetry packet is there as well as the second one
           expect(System.telemetry.packets('SYSTEM').keys).to include("TEST1", "TEST2")
-          third_config_name = System.configuration_name
+          #third_config_name = System.configuration_name
 
           # Try loading something that doesn't exist
           # It should fail and reload the original configuration
@@ -529,7 +534,7 @@ module Cosmos
           tf.close
           capture_io do |stdout|
             System.instance.process_file(tf.path)
-            expect(stdout.string).to match /WARN: Unknown port name given: MYPORT/
+            expect(stdout.string).to match(/WARN: Unknown port name given: MYPORT/)
           end
           tf.unlink
         end
@@ -566,7 +571,7 @@ module Cosmos
           tf.close
           capture_io do |stdout|
             System.instance.process_file(tf.path)
-            expect(stdout.string).to match /WARN: Unknown path name given: MYPATH/
+            expect(stdout.string).to match(/WARN: Unknown path name given: MYPATH/)
           end
           tf.unlink
         end
@@ -576,7 +581,7 @@ module Cosmos
             tf = Tempfile.new('unittest')
             tf.puts("PATH LOGS C:/mylogs")
             tf.close
-            expect(System.paths['LOGS']).to match 'outputs/logs'
+            expect(System.paths['LOGS']).to match('outputs/logs')
             System.instance.process_file(tf.path)
             expect(System.paths['LOGS']).to eql 'C:/mylogs'
             tf.unlink

data/spec/tools/cmd_tlm_server/api_spec.rb

@@ -18,9 +18,12 @@ module Cosmos
   describe Api do
 
     before(:all) do
-      cts = File.join(Cosmos::USERPATH,'config','tools','cmd_tlm_server','cmd_tlm_server.txt')
-      FileUtils.mkdir_p(File.dirname(cts))
-      File.open(cts,'w') do |file|
+      # Save cmd_tlm_server.txt
+      @cts = File.join(Cosmos::USERPATH,'config','tools','cmd_tlm_server','cmd_tlm_server.txt')
+      FileUtils.mv @cts, Cosmos::USERPATH
+
+      FileUtils.mkdir_p(File.dirname(@cts))
+      File.open(@cts,'w') do |file|
         file.puts 'INTERFACE INST_INT interface.rb'
         file.puts '  TARGET INST'
         file.puts '  PROTOCOL READ_WRITE OverrideProtocol'
@@ -38,9 +41,13 @@ module Cosmos
       super()
       @name = 'Example Background Task1'
       @status = "This is example one"
+      @sleeper = Sleeper.new
     end
     def call
-      sleep 0.3
+      return if @sleeper.sleep(0.3)
+    end
+    def stop
+      @sleeper.cancel
     end
   end
 end
@@ -56,12 +63,16 @@ module Cosmos
       super()
       @name = 'Example Background Task2'
       @status = "This is example two"
+      @sleeper = Sleeper.new
     end
     def call
       loop do
-        sleep 1
+        return if @sleeper.sleep(1)
       end
     end
+    def stop
+      @sleeper.cancel
+    end
   end
 end
 DOC
@@ -69,10 +80,11 @@ DOC
     end
 
     after(:all) do
-      clean_config()
-      FileUtils.rm_rf File.join(Cosmos::USERPATH,'config','tools')
       FileUtils.rm_rf @background1
       FileUtils.rm_rf @background2
+      # Restore cmd_tlm_server.txt
+      FileUtils.mv File.join(Cosmos::USERPATH, 'cmd_tlm_server.txt'),
+      File.join(Cosmos::USERPATH,'config','tools','cmd_tlm_server')
     end
 
     before(:each) do
@@ -523,7 +535,6 @@ DOC
       end
 
       it "returns special values for time if time isn't set" do
-        time = Time.now
         packet = System.commands.packet("INST", "COLLECT")
         packet.received_time = nil
         packet.restore_defaults
@@ -752,7 +763,7 @@ DOC
         @api.inject_tlm("INST","HEALTH_STATUS",{TEMP1: 50, TEMP2: 50, TEMP3: 50, TEMP4: 50}, :CONVERTED)
         allow_any_instance_of(Interface).to receive(:write_allowed?).and_raise("PROBLEM!")
         expect(Logger).to receive(:error) do |msg|
-          expect(msg).to match /Problem writing to router/
+          expect(msg).to match(/Problem writing to router/)
         end
         @api.inject_tlm("INST","HEALTH_STATUS")
       end
@@ -773,7 +784,7 @@ DOC
 
         allow_any_instance_of(Interface).to receive(:write_allowed?).and_raise("PROBLEM!")
         expect(Logger).to receive(:error) do |msg|
-          expect(msg).to match /Problem writing to router/
+          expect(msg).to match(/Problem writing to router/)
         end
 
         @api.inject_tlm("SYSTEM","LIMITS_CHANGE")

data/spec/tools/cmd_tlm_server/background_tasks_spec.rb

@@ -34,7 +34,6 @@ module Cosmos
     end
 
     after(:all) do
-      clean_config()
       4.times.each { |i| File.delete(File.join(Cosmos::USERPATH,'lib',"my_bg_task#{i}.rb")) }
     end
 
@@ -56,22 +55,22 @@ module Cosmos
           sleep 0.2
           expect(running_threads.length).to eql(3)
           expect(bt.instance_variable_get("@threads").compact.length).to eq 2
-          expect(stdout.string).to match "BG0 START"
-          expect(stdout.string).to match "BG2 START"
+          expect(stdout.string).to match("BG0 START")
+          expect(stdout.string).to match("BG2 START")
 
           bt.start(1)
           sleep 0.1
           expect(running_threads.length).to eql(4)
           expect(bt.instance_variable_get("@threads").compact.length).to eq 3
-          expect(stdout.string).to match "BG1 START"
+          expect(stdout.string).to match("BG1 START")
 
           bt.stop_all
           sleep 0.2
           expect(running_threads.length).to eql(1)
           expect(bt.instance_variable_get("@threads").compact.length).to eq 0
-          expect(stdout.string).to match "BG0 STOP"
-          expect(stdout.string).to match "BG1 STOP"
-          expect(stdout.string).to match "BG2 STOP"
+          expect(stdout.string).to match("BG0 STOP")
+          expect(stdout.string).to match("BG1 STOP")
+          expect(stdout.string).to match("BG2 STOP")
         end
         tf.unlink
       end
@@ -97,54 +96,54 @@ module Cosmos
           expect(running_threads.length).to eql(2)
           expect(bt.instance_variable_get("@threads")[2].alive?).to eq true
           expect(bt.instance_variable_get("@threads").compact.length).to eq 1
-          expect(stdout.string).to match "BG2 START"
+          expect(stdout.string).to match("BG2 START")
 
           bt.start(1)
           sleep 0.1
           expect(running_threads.length).to eql(3)
           expect(bt.instance_variable_get("@threads")[1].alive?).to eq true
           expect(bt.instance_variable_get("@threads").compact.length).to eq 2
-          expect(stdout.string).to match "BG1 START"
+          expect(stdout.string).to match("BG1 START")
 
           bt.start(0)
           sleep 0.1
           expect(running_threads.length).to eql(4)
           expect(bt.instance_variable_get("@threads")[0].alive?).to eq true
           expect(bt.instance_variable_get("@threads").compact.length).to eq 3
-          expect(stdout.string).to match "BG0 START"
+          expect(stdout.string).to match("BG0 START")
 
           bt.start(2) # Should do nothing since the task is already started
           sleep 0.1
           expect(running_threads.length).to eql(4)
           expect(bt.instance_variable_get("@threads").compact.length).to eq 3
-          expect(stdout.string).to match "BG0 START" # No change
+          expect(stdout.string).to match("BG0 START") # No change
 
           bt.stop(1)
           sleep 0.2
           expect(running_threads.length).to eql(3)
           expect(bt.instance_variable_get("@threads")[1]).to be_nil
           expect(bt.instance_variable_get("@threads").compact.length).to eq 2
-          expect(stdout.string).to match "BG1 STOP"
+          expect(stdout.string).to match("BG1 STOP")
 
           bt.stop(0)
           sleep 0.2
           expect(running_threads.length).to eql(2)
           expect(bt.instance_variable_get("@threads")[0]).to be_nil
           expect(bt.instance_variable_get("@threads").compact.length).to eq 1
-          expect(stdout.string).to match "BG0 STOP"
+          expect(stdout.string).to match("BG0 STOP")
 
           bt.stop(2)
           sleep 0.2
           expect(running_threads.length).to eql(1)
           expect(bt.instance_variable_get("@threads")[2]).to be_nil
           expect(bt.instance_variable_get("@threads").compact.length).to eq 0
-          expect(stdout.string).to match "BG2 STOP"
+          expect(stdout.string).to match("BG2 STOP")
 
           bt.stop(0) # Should be safe to stop something already stopped
           sleep 0.2
           expect(running_threads.length).to eql(1)
           expect(bt.instance_variable_get("@threads").compact.length).to eq 0
-          expect(stdout.string).to match "BG2 STOP" # No change
+          expect(stdout.string).to match("BG2 STOP") # No change
 
           expect { bt.stop(3) }.to raise_error(/No task at index 3/)
         end
@@ -174,7 +173,7 @@ module Cosmos
           expect(running_threads.length).to eql(1)
           expect(bt.instance_variable_get("@threads").length).to eq 0
 
-          expect(stdout.string).to match "unexpectedly died"
+          expect(stdout.string).to match("unexpectedly died")
         end
         tf.unlink
       end