cosmos 4.1.1-java → 4.2.0-java

data/spec/interfaces/protocols/fixed_protocol_spec.rb

@@ -21,10 +21,6 @@ module Cosmos
       allow(@interface).to receive(:disconnect) { nil }
     end
 
-    after(:each) do
-      clean_config()
-    end
-
     describe "initialize" do
       it "initializes attributes" do
         @interface.add_protocol(FixedProtocol, [2, 1, '0xDEADBEEF', false, true], :READ_WRITE)
@@ -38,25 +34,46 @@ module Cosmos
     end
 
     describe "read_data" do
+      $index = 0
       class FixedStream < Stream
         def connect; end
         def connected?; true; end
-        def read; "\x01\x02"; end
+        def read
+          case $index
+          when 0
+            "\x00" # UNKNOWN
+          when 1
+            "\x01" # SYSTEM META
+          when 2
+            "\x02" # SYSTEM LIMITS
+          end
+        end
       end
 
       it "returns unknown packets" do
         @interface.add_protocol(FixedProtocol, [1], :READ)
         @interface.instance_variable_set(:@stream, FixedStream.new)
+        @interface.target_names = ['SYSTEM']
+        # Initialize the read with a packet identified as SYSTEM META
+        $index = 1
+        packet = @interface.read
+        expect(packet.received_time.to_f).to_not eql 0.0
+        expect(packet.target_name).to eql "SYSTEM"
+        expect(packet.packet_name).to eql "META"
+        expect(packet.buffer[0]).to eql "\x01"
+        # Return zeros which will not be identified
+        $index = 0
         packet = @interface.read
         expect(packet.received_time.to_f).to eql 0.0
         expect(packet.target_name).to eql nil
         expect(packet.packet_name).to eql nil
-        expect(packet.buffer).to eql "\x01\x02"
+        expect(packet.buffer).to eql "\x00"
       end
 
       it "raises an exception if unknown packet" do
         @interface.add_protocol(FixedProtocol, [1, 0, nil, true, false, true], :READ)
         @interface.instance_variable_set(:@stream, FixedStream.new)
+        @interface.target_names = ['SYSTEM']
         expect { @interface.read }.to raise_error(/Unknown data/)
       end
 
@@ -64,29 +81,34 @@ module Cosmos
         @interface.add_protocol(FixedProtocol, [1], :READ)
         @interface.instance_variable_set(:@stream, FixedStream.new)
         @interface.target_names = ['BLAH']
+        $index = 1
         packet = @interface.read
         expect(packet.received_time.to_f).to eql 0.0
         expect(packet.target_name).to eql nil
         expect(packet.packet_name).to eql nil
-        expect(packet.buffer).to eql "\x01\x02"
+        expect(packet.buffer).to eql "\x01"
       end
 
       it "reads telemetry data from the stream" do
         @interface.add_protocol(FixedProtocol, [1], :READ_WRITE)
         @interface.instance_variable_set(:@stream, FixedStream.new)
         @interface.target_names = ['SYSTEM']
+        $index = 1
         packet = @interface.read
         expect(packet.received_time.to_f).to be_within(0.1).of(Time.now.to_f)
         expect(packet.target_name).to eql 'SYSTEM'
         expect(packet.packet_name).to eql 'META'
+        $index = 2
         packet = @interface.read
         expect(packet.received_time.to_f).to be_within(0.1).of(Time.now.to_f)
         expect(packet.target_name).to eql 'SYSTEM'
         expect(packet.packet_name).to eql 'LIMITS_CHANGE'
+        $index = 1
         packet = @interface.read
         expect(packet.received_time.to_f).to be_within(0.1).of(Time.now.to_f)
         expect(packet.target_name).to eql 'SYSTEM'
         expect(packet.packet_name).to eql 'META'
+        $index = 2
         packet = @interface.read
         expect(packet.received_time.to_f).to be_within(0.1).of(Time.now.to_f)
         expect(packet.target_name).to eql 'SYSTEM'
@@ -95,7 +117,9 @@ module Cosmos
 
       it "reads command data from the stream" do
         $index = 0
-        class FixedStream < Stream
+        class FixedStream2 < Stream
+          def connect; end
+          def connected?; true; end
           def read
             case $index
             when 0
@@ -107,7 +131,7 @@ module Cosmos
           end
         end
         @interface.add_protocol(FixedProtocol, [8, 0, '0x1ACFFC1D', false], :READ_WRITE)
-        @interface.instance_variable_set(:@stream, FixedStream.new)
+        @interface.instance_variable_set(:@stream, FixedStream2.new)
         @interface.target_names = ['SYSTEM']
         packet = @interface.read
         expect(packet.received_time.to_f).to be_within(0.01).of(Time.now.to_f)

data/spec/interfaces/protocols/length_protocol_spec.rb

@@ -172,7 +172,7 @@ module Cosmos
           nil, # sync
           50], :READ_WRITE) # max_length
         $buffer = "\x00\x01\xFF\xFF\x03\x04"
-        expect { packet = @interface.read }.to raise_error(RuntimeError, "Length value received larger than max_length: 65535 > 50")
+        expect { @interface.read }.to raise_error(RuntimeError, "Length value received larger than max_length: 65535 > 50")
       end
 
       it "handles a sync value in the packet" do

data/spec/interfaces/protocols/override_protocol_spec.rb

@@ -132,7 +132,9 @@ module Cosmos
     end
 
     it "warns the user if the protocol is not required" 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
       FileUtils.mkdir_p(File.dirname(cts))
       File.open(cts,'w') do |file|
         file.puts 'INTERFACE INST_INT interface.rb'
@@ -151,8 +153,10 @@ module Cosmos
       @server.stop
       shutdown_cmd_tlm()
       sleep(0.1)
-      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
   end
 end

data/spec/interfaces/protocols/preidentified_protocol_spec.rb

@@ -21,10 +21,6 @@ module Cosmos
       allow(@interface).to receive(:connected?) { true }
     end
 
-    after(:all) do
-      clean_config()
-    end
-
     class PreStream < Stream
       def connect; end
       def connected?; true; end
@@ -40,7 +36,7 @@ module Cosmos
       time = Time.new(2020,1,31,12,15,30.5)
       pkt.received_time = time
       @interface.write(pkt)
-      expect { packet = @interface.read }.to raise_error(RuntimeError)
+      expect { @interface.read }.to raise_error(RuntimeError)
     end
 
     describe "initialize" do

data/spec/interfaces/protocols/template_protocol_spec.rb

@@ -167,7 +167,6 @@ module Cosmos
         packet.get_item("RSP_PACKET").default = ""
         packet.restore_defaults
         @interface.connect
-        start = Time.now
         logger = class_double("Cosmos::Logger").as_stubbed_const(:transfer_nested_constants => true)
         expect(logger).to_not receive(:error)
         @interface.write(packet)

data/spec/interfaces/simulated_target_interface_spec.rb

@@ -83,11 +83,11 @@ end
         expect(sti.connected?).to be false
         sti.connect
         pkt = sti.read
-        #~ expect(pkt.target_name).to eql "SYSTEM"
-        #~ expect(pkt.packet_name).to eql "LIMITS_CHANGE"
-        #~ pkt = sti.read
-        #~ expect(pkt.target_name).to eql "SYSTEM"
-        #~ expect(pkt.packet_name).to eql "LIMITS_CHANGE"
+        expect(pkt.target_name).to eql "SYSTEM"
+        expect(pkt.packet_name).to eql "LIMITS_CHANGE"
+        pkt = sti.read
+        expect(pkt.target_name).to eql "SYSTEM"
+        expect(pkt.packet_name).to eql "LIMITS_CHANGE"
       end
     end
 

data/spec/interfaces/udp_interface_spec.rb

@@ -173,7 +173,6 @@ module Cosmos
         expect(i.write_count).to eql 0
         pkt = Packet.new('tgt','pkt')
         pkt.buffer = "\x00\x01\x02\x03"
-        packet = nil
         i.write(pkt)
         data = read.read
         expect(i.write_count).to eql 1
@@ -192,9 +191,8 @@ module Cosmos
         expect(i.raw_logger_pair.write_logger.logging_enabled).to be true
         pkt = Packet.new('tgt','pkt')
         pkt.buffer = "\x00\x01\x02\x03"
-        packet = nil
         i.write(pkt)
-        data = read.read
+        _ = read.read
         filename = i.raw_logger_pair.write_logger.filename
         i.stop_raw_logging
         expect(i.raw_logger_pair.write_logger.logging_enabled).to be false
@@ -238,7 +236,7 @@ module Cosmos
         i.start_raw_logging
         expect(i.raw_logger_pair.write_logger.logging_enabled).to be true
         i.write_raw("\x00\x01\x02\x03")
-        data = read.read
+        _ = read.read
         filename = i.raw_logger_pair.write_logger.filename
         i.stop_raw_logging
         expect(i.raw_logger_pair.write_logger.logging_enabled).to be false

data/spec/io/buffered_file_spec.rb

@@ -23,13 +23,9 @@ module Cosmos
       end
     end
 
-    after(:all) do
-      clean_config()
-    end
-
     describe "read" do
       it "reads less than the buffer size" do
-        file = BufferedFile.open(@filename, "rb") do |file|
+        BufferedFile.open(@filename, "rb") do |file|
           expect(file.read(8)).to eql DATA[0..7]
           expect(file.pos).to eql 8
           expect(file.read(4)).to eql DATA[8..11]
@@ -51,7 +47,7 @@ module Cosmos
       end
 
       it "handles trying to read past the end" do
-        file = BufferedFile.open(@filename, "rb") do |file|
+        BufferedFile.open(@filename, "rb") do |file|
           file.seek(-16, IO::SEEK_END)
           expect(file.pos).to eql ((2 * BufferedFile::BUFFER_SIZE) - 16)
           expect(file.read(DATA.length * 10)).to eql(DATA)
@@ -62,7 +58,7 @@ module Cosmos
       end
 
       it "reads equal to the buffer size" do
-        file = BufferedFile.open(@filename, "rb") do |file|
+        BufferedFile.open(@filename, "rb") do |file|
           expect(file.read(BufferedFile::BUFFER_SIZE)).to eql(DATA * (BufferedFile::BUFFER_SIZE / DATA.length))
           expect(file.pos).to eql BufferedFile::BUFFER_SIZE
           expect(file.read(BufferedFile::BUFFER_SIZE)).to eql(DATA * (BufferedFile::BUFFER_SIZE / DATA.length))
@@ -72,7 +68,7 @@ module Cosmos
       end
 
       it "reads greater than the buffer size" do
-        file = BufferedFile.open(@filename, "rb") do |file|
+        BufferedFile.open(@filename, "rb") do |file|
           expect(file.read(BufferedFile::BUFFER_SIZE + 1)).to eql(DATA * (BufferedFile::BUFFER_SIZE / DATA.length) << DATA[0..0])
           expect(file.pos).to eql BufferedFile::BUFFER_SIZE + 1
           expect(file.read(BufferedFile::BUFFER_SIZE + 1)).to eql((DATA * (BufferedFile::BUFFER_SIZE / DATA.length))[1..-1])
@@ -82,7 +78,7 @@ module Cosmos
       end
 
       it "reads greater than the buffer size after a previous read" do
-        file = BufferedFile.open(@filename, "rb") do |file|
+        BufferedFile.open(@filename, "rb") do |file|
           expect(file.read(DATA.length * 10)).to eql(DATA * 10)
           expect(file.pos).to eql DATA.length * 10
           expect(file.read(BufferedFile::BUFFER_SIZE + 1)).to eql(DATA * ((BufferedFile::BUFFER_SIZE + 10) / DATA.length) << DATA[0])
@@ -93,13 +89,13 @@ module Cosmos
 
     describe "seek" do
       it "raises if given more than 2 arguments" do
-        file = BufferedFile.open(@filename, "rb") do |file|
+        BufferedFile.open(@filename, "rb") do |file|
           expect { file.seek(0, 4, IO::SEEK_CUR) }.to raise_error(ArgumentError)
         end
       end
 
       it "implies SEEK_SET with 1 argument" do
-        file = BufferedFile.open(@filename, "rb") do |file|
+        BufferedFile.open(@filename, "rb") do |file|
           expect(file.read(8)).to eql DATA[0..7]
           expect(file.pos).to eql 8
           file.seek(4, IO::SEEK_CUR)
@@ -110,7 +106,7 @@ module Cosmos
       end
 
       it "has reads still work afterwards" do
-        file = BufferedFile.open(@filename, "rb") do |file|
+        BufferedFile.open(@filename, "rb") do |file|
           expect(file.read(8)).to eql DATA[0..7]
           expect(file.pos).to eql 8
           file.seek(4, IO::SEEK_CUR)

data/spec/io/json_drb_spec.rb

@@ -85,7 +85,7 @@ module Cosmos
           expect { @json.start_service('blah', 7777, self) }.to raise_error(/JsonDRb http server could not be started/)
           sleep 5
           expect($system_exit_count).to eql(system_exit_count + 1)
-          expect(stdout.string).to match /JsonDRb http server could not be started or unexpectedly died/
+          expect(stdout.string).to match(/JsonDRb http server could not be started or unexpectedly died/)
           @json.stop_service
           sleep(0.1)
         end
@@ -121,7 +121,7 @@ module Cosmos
           @json.stop_service
           sleep(0.1)
 
-          expect(stdout.string).to match /JsonDRb http server could not be started or unexpectedly died/
+          expect(stdout.string).to match(/JsonDRb http server could not be started or unexpectedly died/)
         end
 
         Dir[File.join(Cosmos::USERPATH,"*_exception.txt")].each do |file|
@@ -135,7 +135,7 @@ module Cosmos
         client = HTTPClient.new
         res = client.post("http://127.0.0.1:7777", "")
         expect(res.status).to eq 403
-        expect(res.body).to match /Forbidden/
+        expect(res.body).to match(/Forbidden/)
         @json.stop_service
         sleep(0.1)
       end
@@ -150,7 +150,7 @@ module Cosmos
 
         @json.start_service('127.0.0.1', 7777, MyServer1.new)
         request_data = JsonRpcRequest.new('my_method', 'param', 1).to_json
-        response_data, error_code = @json.process_request(request_data, Time.now)
+        _, error_code = @json.process_request(request_data, Time.now)
         expect(error_code).to eq nil
         @json.stop_service
         sleep(0.1)
@@ -164,7 +164,7 @@ module Cosmos
         request_data = JsonRpcRequest.new('my_method', 'param', 1).to_json
         response_data, error_code = @json.process_request(request_data, Time.now)
         expect(error_code).to eql -32601
-        expect(response_data).to match /Method not found/
+        expect(response_data).to match(/Method not found/)
         @json.stop_service
         sleep(0.1)
       end
@@ -179,7 +179,7 @@ module Cosmos
         request_data = JsonRpcRequest.new('my_method', 'param1', 1).to_json
         response_data, error_code = @json.process_request(request_data, Time.now)
         expect(error_code).to eql -32602
-        expect(response_data).to match /Invalid params/
+        expect(response_data).to match(/Invalid params/)
         @json.stop_service
         sleep(0.1)
       end
@@ -195,7 +195,7 @@ module Cosmos
         request_data = JsonRpcRequest.new('my_method', 'param', 1).to_json
         response_data, error_code = @json.process_request(request_data, Time.now)
         expect(error_code).to eql -1
-        expect(response_data).to match /Method Error/
+        expect(response_data).to match(/Method Error/)
         @json.stop_service
         sleep(0.1)
       end
@@ -205,7 +205,7 @@ module Cosmos
         request_data = JsonRpcRequest.new('send', 'param', 1).to_json
         response_data, error_code = @json.process_request(request_data, Time.now)
         expect(error_code).to eql -1
-        expect(response_data).to match /Cannot call unauthorized methods/
+        expect(response_data).to match(/Cannot call unauthorized methods/)
         @json.stop_service
         sleep(0.1)
       end
@@ -217,7 +217,7 @@ module Cosmos
         request_data.gsub!("2.0","1.1")
         response_data, error_code = @json.process_request(request_data, Time.now)
         expect(error_code).to eql -32600
-        expect(response_data).to match /Invalid Request/
+        expect(response_data).to match(/Invalid Request/)
         @json.stop_service
         sleep(0.1)
       end

data/spec/io/json_rpc_spec.rb

@@ -79,7 +79,7 @@ end
 describe Time do
   it "implements as_json" do
     time = Time.new(2020,01,31,12,20,10)
-    expect(time.as_json).to match "2020-01-31 12:20:10"
+    expect(time.as_json).to match("2020-01-31 12:20:10")
   end
 end
 
@@ -93,7 +93,7 @@ end
 describe DateTime do
   it "implements as_json" do
     dt = DateTime.new(2020,01,31,12,20,10)
-    expect(dt.as_json).to match "2020-01-31T12:20:10"
+    expect(dt.as_json).to match("2020-01-31T12:20:10")
   end
 end
 
@@ -168,7 +168,7 @@ module Cosmos
 
     describe "to_json" do
       it "returns the json string" do
-        json = expect(JsonRpcRequest.new("puts","test",10).to_json).to be_a String
+        expect(JsonRpcRequest.new("puts","test",10).to_json).to be_a String
       end
     end
 
@@ -206,7 +206,7 @@ module Cosmos
 
     describe "to_json" do
       it "returns the json string" do
-        json = expect(JsonRpcResponse.new(10).to_json).to be_a String
+        expect(JsonRpcResponse.new(10).to_json).to be_a String
       end
     end
 

data/spec/io/raw_logger_spec.rb

@@ -19,6 +19,7 @@ module Cosmos
     end
 
     after(:each) do
+      # Clean after each so we can check for single log files
       clean_config()
     end
 
@@ -92,7 +93,7 @@ module Cosmos
           raw_logger = RawLogger.new('MYINT', :WRITE, true, 200, nil)
           raw_logger.write("\x00\x01\x02\x03")
           raw_logger.stop
-          expect(stdout.string).to match "Error opening"
+          expect(stdout.string).to match("Error opening")
         end
       end
 
@@ -102,7 +103,7 @@ module Cosmos
           raw_logger = RawLogger.new('MYINT', :WRITE, true, 200, nil)
           raw_logger.write("\x00\x01\x02\x03")
           raw_logger.stop
-          expect(stdout.string).to match "Error closing"
+          expect(stdout.string).to match("Error closing")
         end
       end
 
@@ -113,7 +114,7 @@ module Cosmos
           allow(raw_logger.instance_variable_get(:@file)).to receive(:write) { raise "Error" }
           raw_logger.write("\x00\x01\x02\x03")
           raw_logger.stop
-          expect(stdout.string).to match "Error writing"
+          expect(stdout.string).to match("Error writing")
         end
       end
     end

data/spec/packet_logs/packet_log_reader_spec.rb

@@ -61,10 +61,6 @@ module Cosmos
       plw.stop
     end
 
-    after(:all) do
-      clean_config()
-    end
-
     before(:each) do
       @plr = PacketLogReader.new
     end
@@ -157,10 +153,10 @@ module Cosmos
         end
 
         # Load the original configuration
-        original_config_name, err = System.load_configuration
+        _, 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|
@@ -199,6 +195,7 @@ module Cosmos
           File.join(Cosmos::USERPATH,'config','system')
 
         FileUtils.rm_f(File.join(@config_targets,'SYSTEM','cmd_tlm','test1_tlm.txt'))
+        System.class_eval('@@instance = nil')
       end
     end