cosmos 4.1.1-java → 4.2.0-java

data/spec/packet_logs/packet_log_writer_spec.rb

@@ -15,12 +15,12 @@ module Cosmos
 
   describe PacketLogWriter do
     before(:each) do
-      System.class_eval('@@instance = nil')
       System.load_configuration
       @log_path = System.paths['LOGS']
     end
 
     after(:each) do
+      # Clean config after each so we can check for individual log files
       clean_config()
     end
 
@@ -170,7 +170,7 @@ module Cosmos
           plw.write(pkt)
           sleep 0.1
           plw.stop
-          expect(stdout.string).to match "Error opening"
+          expect(stdout.string).to match("Error opening")
           plw.shutdown
           sleep(0.1)
         end
@@ -185,7 +185,7 @@ module Cosmos
           plw.write(pkt)
           sleep 0.1
           plw.stop
-          expect(stdout.string).to match "Error closing"
+          expect(stdout.string).to match("Error closing")
           plw.shutdown
           sleep(0.1)
         end
@@ -214,7 +214,7 @@ module Cosmos
 
       it "ignores bad label formats" do
         plw = PacketLogWriter.new(:TLM,nil,false,nil,10000000,nil,false)
-        plw.start('my_test')
+        plw.start('mytest!')
         plw.write(Packet.new('',''))
         plw.shutdown
         expect(Dir[File.join(@log_path,"*.bin")][-1]).to match("_tlm.bin")

data/spec/packets/binary_accessor_spec.rb

@@ -503,7 +503,7 @@ module Cosmos
           end
 
           it "complains with an array_size not a multiple of bit_size" do
-            data = @data.unpack('C*')
+            @data.unpack('C*')
             expect { BinaryAccessor.read_array(0, 8, :UINT, 10, @data, :LITTLE_ENDIAN) }.to raise_error(ArgumentError, "array_size 10 not a multiple of bit_size 8")
           end
 
@@ -518,12 +518,12 @@ module Cosmos
           end
 
           it "returns an empty array if the offset equals the negative array size" do
-            data = @data.unpack('C*')
+            @data.unpack('C*')
             expect(BinaryAccessor.read_array(@data.length*8-32, 8, :UINT, -32, @data, :LITTLE_ENDIAN)).to eql([])
           end
 
           it "complains if the offset is greater than the negative array size" do
-            data = @data.unpack('C*')
+            @data.unpack('C*')
             offset = @data.length * 8 - 16
             expect { BinaryAccessor.read_array(offset, 8, :UINT, -32, @data, :LITTLE_ENDIAN) }.to raise_error(ArgumentError, "16 byte buffer insufficient to read UINT at bit_offset #{offset} with bit_size 8")
           end
@@ -1777,12 +1777,12 @@ module Cosmos
       end
 
       it "complains with an array_size not a multiple of bit_size" do
-        data = @data.unpack('C*')
+        @data.unpack('C*')
         expect { BinaryAccessor.write_array([1,2], 0, 8, :UINT, 10, @data, :BIG_ENDIAN, :ERROR) }.to raise_error(ArgumentError, "array_size 10 not a multiple of bit_size 8")
       end
 
       it "complains with an array_size not a multiple of bit_size" do
-        data = @data.unpack('C*')
+        @data.unpack('C*')
         expect { BinaryAccessor.write_array([1,2], 0, 8, :UINT, -10, @data, :BIG_ENDIAN, :ERROR) }.to raise_error(ArgumentError, "array_size -10 not a multiple of bit_size 8")
       end
 
@@ -1861,13 +1861,11 @@ module Cosmos
       end
 
       it "writes aligned 8-bit unsigned integers" do
-        data = @data.clone
         BinaryAccessor.write_array([0,1,2,3,4,5,255,255], 0, 8, :UINT, 0, @data, :BIG_ENDIAN, :ERROR)
         expect(@data).to eql("\x00\x01\x02\x03\x04\x05\xFF\xFF")
       end
 
       it "writes aligned 8-bit signed integers" do
-        data = @data.clone
         BinaryAccessor.write_array([0,1,2,3,4,5,-1,127], 0, 8, :INT, 0, @data, :BIG_ENDIAN, :ERROR)
         expect(@data).to eql("\x00\x01\x02\x03\x04\x05\xFF\x7F")
       end
@@ -1877,7 +1875,6 @@ module Cosmos
       end
 
       it "writes STRING items" do
-        data = @baseline_data.clone
         BinaryAccessor.write_array(['a'], 0, 64, :STRING, 0, @baseline_data, :BIG_ENDIAN, :ERROR)
         expect(@baseline_data).to eql("a\x00\x00\x00\x00\x00\x00\x00")
       end

data/spec/packets/commands_spec.rb

@@ -218,7 +218,7 @@ module Cosmos
       end
 
       it "complains about non-existant items" do
-        expect { cmd = @cmd.build_cmd("tgt1","pkt1",{"itemX"=>1}) }.to raise_error(RuntimeError, "Packet item 'TGT1 PKT1 ITEMX' does not exist")
+        expect { @cmd.build_cmd("tgt1","pkt1",{"itemX"=>1}) }.to raise_error(RuntimeError, "Packet item 'TGT1 PKT1 ITEMX' does not exist")
       end
 
       it "creates a populated command packet with default values" do
@@ -329,7 +329,7 @@ module Cosmos
       end
 
       it "complains about non-existant items" do
-        expect { cmd = @cmd.cmd_hazardous?("tgt1","pkt1",{"itemX"=>1}) }.to raise_error(RuntimeError, "Packet item 'TGT1 PKT1 ITEMX' does not exist")
+        expect { @cmd.cmd_hazardous?("tgt1","pkt1",{"itemX"=>1}) }.to raise_error(RuntimeError, "Packet item 'TGT1 PKT1 ITEMX' does not exist")
       end
 
       it "returns true if the command overall is hazardous" do

data/spec/packets/limits_spec.rb

@@ -272,7 +272,7 @@ module Cosmos
       end
 
       it "enables limits for an item" do
-        pkt = @tlm.packet("TGT1","PKT1")
+        @tlm.packet("TGT1","PKT1")
         expect(@limits.enabled?("TGT1","PKT1","ITEM5")).to be false
         @limits.enable("TGT1","PKT1","ITEM5")
         expect(@limits.enabled?("TGT1","PKT1","ITEM5")).to be true
@@ -293,7 +293,7 @@ module Cosmos
       end
 
       it "disables limits for an item" do
-        pkt = @tlm.packet("TGT1","PKT1")
+        @tlm.packet("TGT1","PKT1")
         @limits.enable("TGT1","PKT1","ITEM1")
         expect(@limits.enabled?("TGT1","PKT1","ITEM1")).to be true
         @limits.disable("TGT1","PKT1","ITEM1")

data/spec/packets/packet_config_spec.rb

@@ -832,6 +832,18 @@ module Cosmos
         end
       end
 
+      context "with APPEND" do
+        it "allows appending derived items" do
+          tf = Tempfile.new('unittest')
+          tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
+          tf.puts '  APPEND_ITEM item1 0 DERIVED'
+          tf.close
+          @pc.process_file(tf.path, "TGT1")
+          expect(@pc.telemetry["TGT1"]["PKT1"].items["ITEM1"].data_type).to be :DERIVED
+          tf.unlink
+        end
+      end      
+
     end # describe "process_file"
   end
 end

data/spec/packets/packet_item_limits_spec.rb

@@ -162,7 +162,7 @@ module Cosmos
         expect(hash["enabled"]).to be true
         expect(hash["values"]).to include(:DEFAULT => [0,1,2,3,4,5])
         expect(hash["state"]).to eql :RED_LOW
-        expect(hash["response"]).to match "LimitsResponse"
+        expect(hash["response"]).to match("LimitsResponse")
         expect(hash["persistence_setting"]).to eql 1
         expect(hash["persistence_count"]).to eql 2
       end

data/spec/packets/packet_item_spec.rb

@@ -24,7 +24,7 @@ module Cosmos
       it "sets the format_string" do
         @pi.format_string = "%5.1f"
         expect(@pi.format_string).to eql "%5.1f"
-        expect(@pi.to_config(:TELEMETRY, :BIG_ENDIAN)).to match /FORMAT_STRING %5.1f/
+        expect(@pi.to_config(:TELEMETRY, :BIG_ENDIAN)).to match(/FORMAT_STRING %5.1f/)
       end
 
       it "sets the format_string to nil" do
@@ -49,9 +49,9 @@ module Cosmos
         @pi.read_conversion = c
         expect(@pi.read_conversion.to_s == c.to_s).to be true
         config = @pi.to_config(:TELEMETRY, :BIG_ENDIAN)
-        expect(config).to match /GENERIC_READ_CONVERSION_START/
-        expect(config).to match /value \/ 2/
-        expect(config).to match /GENERIC_READ_CONVERSION_END/
+        expect(config).to match(/GENERIC_READ_CONVERSION_START/)
+        expect(config).to match(/value \/ 2/)
+        expect(config).to match(/GENERIC_READ_CONVERSION_END/)
       end
 
       it "sets the read_conversion to nil" do
@@ -70,9 +70,9 @@ module Cosmos
         @pi.write_conversion = c
         expect(@pi.write_conversion.to_s == c.to_s).to be true
         config = @pi.to_config(:TELEMETRY, :BIG_ENDIAN)
-        expect(config).to match /GENERIC_WRITE_CONVERSION_START/
-        expect(config).to match /value \/ 2/
-        expect(config).to match /GENERIC_WRITE_CONVERSION_END/
+        expect(config).to match(/GENERIC_WRITE_CONVERSION_START/)
+        expect(config).to match(/value \/ 2/)
+        expect(config).to match(/GENERIC_WRITE_CONVERSION_END/)
       end
 
       it "sets the write_conversion to nil" do
@@ -423,8 +423,8 @@ module Cosmos
         # Check the unique PacketItem values
         expect(hash.keys).to include('format_string','read_conversion','write_conversion','id_value','states','description','units_full','units','default','range','required','hazardous','state_colors','limits')
         expect(hash["format_string"]).to eql "%5.1f"
-        expect(hash["read_conversion"]).to match "value / 2"
-        expect(hash["write_conversion"]).to match /value \* 2/
+        expect(hash["read_conversion"]).to match("value / 2")
+        expect(hash["write_conversion"]).to match(/value \* 2/)
         expect(hash["id_value"]).to eql 10
         expect(hash["states"]).to include("TRUE"=>1,"FALSE"=>0)
         expect(hash["description"]).to eql "description"

data/spec/packets/packet_spec.rb

@@ -1411,8 +1411,8 @@ module Cosmos
     describe "clone" do
       it "duplicates the packet" do
         p = Packet.new("tgt","pkt")
-        p.processors['processor'] = Processor.new
-        p.processors['processor'].name = "TestProcessor"
+        p.processors['PROCESSOR'] = Processor.new
+        p.processors['PROCESSOR'].name = "TestProcessor"
         p2 = p.clone
         # No comparison operator
         # expect(p).to eql p2
@@ -1420,13 +1420,23 @@ module Cosmos
         expect(p2.target_name).to eql "TGT"
         expect(p2.packet_name).to eql "PKT"
         # No comparison operator
-        # expect(p2.processors['processor']).to eql p.processors['processor']
-        expect(p2.processors['processor']).to_not be p.processors['processor']
-        expect(p2.processors['processor'].name).to eql p.processors['processor'].name
+        # expect(p2.processors['PROCESSOR']).to eql p.processors['PROCESSOR']
+        expect(p2.processors['PROCESSOR']).to_not be p.processors['PROCESSOR']
+        expect(p2.processors['PROCESSOR'].name).to eql p.processors['PROCESSOR'].name
       end
     end
 
     describe "reset" do
+      it "does nothing to the SYSTEM META packet" do
+        p = Packet.new("SYSTEM","META")
+        time = Time.now
+        p.received_time = time
+        p.received_count = 50
+        p.reset
+        expect(p.received_time).to eql time
+        expect(p.received_count).to eql 50
+      end
+
       it "resets the received_time and received_count" do
         p = Packet.new("tgt","pkt")
         p.processors['processor'] = double("reset", :reset => true)

data/spec/packets/parsers/packet_item_parser_spec.rb

@@ -166,6 +166,20 @@ module Cosmos
           expect(packet.read("ITEM60")).to eql [0x00000001, 0x00000001]
           tf.unlink
         end
+
+        it "complains if an ITEM is redefined" do
+          tf = Tempfile.new('unittest')
+          tf.puts 'TELEMETRY TGT1 PKT1 BIG_ENDIAN "Description"'
+          tf.puts '  APPEND_ITEM ITEM1 16 UINT "Item 1"'
+          tf.puts '  APPEND_ITEM ITEM1 16 UINT "Another item"'
+          tf.close
+          @pc.process_file(tf.path, "TGT1")
+          packet = @pc.telemetry["TGT1"]["PKT1"]
+          packet.buffer = "\xDE\xAD\xBE\xEF"
+          expect(packet.read("ITEM1")).to eql 0xBEEF
+          expect(@pc.warnings).to include("TGT1 PKT1 ITEM1 redefined.")
+          tf.unlink
+        end
       end
 
       context "with keywords including PARAMETER" do
@@ -371,6 +385,19 @@ module Cosmos
           end
         end
 
+        it "complains if a PARAMETER is redefined" do
+          tf = Tempfile.new('unittest')
+          tf.puts 'COMMAND TGT1 PKT1 BIG_ENDIAN "Description"'
+          tf.puts '  APPEND_PARAMETER PARAM1 16 UINT MIN MAX 1 "Param 1"'
+          tf.puts '  APPEND_PARAMETER PARAM1 16 UINT MIN MAX 2 "Another param"'
+          tf.close
+          @pc.process_file(tf.path, "TGT1")
+          packet = @pc.commands["TGT1"]["PKT1"]
+          packet.buffer = "\xDE\xAD\xBE\xEF"
+          expect(packet.read("PARAM1")).to eql 0xBEEF
+          expect(@pc.warnings).to include("TGT1 PKT1 PARAM1 redefined.")
+          tf.unlink
+        end
       end
 
     end # describe "process_file"

data/spec/packets/parsers/xtce_parser_spec.rb

@@ -48,10 +48,6 @@ END
 module Cosmos
 
   describe XtceParser do
-    after(:all) do
-      #clean_config()
-    end
-
     def xml_file(target)
       tf = Tempfile.new(['unittest', '.xtce'])
       tf.puts '<?xml version="1.0" encoding="UTF-8"?>'
@@ -63,11 +59,12 @@ module Cosmos
     end
 
     def telemetry_file(target)
-      xml_file(target) do |tf|
+      file = xml_file(target) do |tf|
         tf.puts '  <xtce:TelemetryMetaData>'
         yield tf
         tf.puts '  </xtce:TelemetryMetaData>'
       end
+      file
     end
 
     def add_tlm_packet_item(tf, packet, item)
@@ -94,11 +91,12 @@ module Cosmos
     end
 
     def command_file(target)
-      xml_file(target) do |tf|
+      file = xml_file(target) do |tf|
         tf.puts '  <xtce:CommandMetaData>'
         yield tf
         tf.puts '  </xtce:CommandMetaData>'
       end
+      file
     end
 
     def add_cmd_packet_item(tf, packet, item)
@@ -150,9 +148,8 @@ module Cosmos
       end
 
       it "processes xtce commands" do
-        tf = Tempfile.new(['unittest', '.xtce'])
-        tf = command_file("TGT") do |tf|
-          add_cmd_packet_item(tf, "PKT", "PARAM1")
+        tf = command_file("TGT") do |file|
+          add_cmd_packet_item(file, "PKT", "PARAM1")
         end
 
         @pc.process_file(tf.path, 'TGT')
@@ -167,11 +164,11 @@ module Cosmos
 
       context "with units" do
         it "processes description and value" do
-          tf = telemetry_file("TGT") do |tf|
-            add_tlm_packet_item(tf, "PKT", "TEMP1") do |tf|
-              tf.puts '<xtce:UnitSet>'
-              tf.puts '<xtce:Unit description="Volts">V</xtce:Unit>'
-              tf.puts '</xtce:UnitSet>'
+          tf = telemetry_file("TGT") do |file|
+            add_tlm_packet_item(file, "PKT", "TEMP1") do |file2|
+              file2.puts '<xtce:UnitSet>'
+              file2.puts '<xtce:Unit description="Volts">V</xtce:Unit>'
+              file2.puts '</xtce:UnitSet>'
             end
           end
 
@@ -184,11 +181,11 @@ module Cosmos
         end
 
         it "processes description only" do
-          tf = telemetry_file("TGT") do |tf|
-            add_tlm_packet_item(tf, "PKT", "TEMP1") do |tf|
-              tf.puts '<xtce:UnitSet>'
-              tf.puts '<xtce:Unit description="Volts"/>'
-              tf.puts '</xtce:UnitSet>'
+          tf = telemetry_file("TGT") do |file|
+            add_tlm_packet_item(file, "PKT", "TEMP1") do |file2|
+              file2.puts '<xtce:UnitSet>'
+              file2.puts '<xtce:Unit description="Volts"/>'
+              file2.puts '</xtce:UnitSet>'
             end
           end
 
@@ -201,11 +198,11 @@ module Cosmos
         end
 
         it "processes value only" do
-          tf = telemetry_file("TGT") do |tf|
-            add_tlm_packet_item(tf, "PKT", "TEMP1") do |tf|
-              tf.puts '<xtce:UnitSet>'
-              tf.puts '<xtce:Unit>V</xtce:Unit>'
-              tf.puts '</xtce:UnitSet>'
+          tf = telemetry_file("TGT") do |file|
+            add_tlm_packet_item(file, "PKT", "TEMP1") do |file2|
+              file2.puts '<xtce:UnitSet>'
+              file2.puts '<xtce:Unit>V</xtce:Unit>'
+              file2.puts '</xtce:UnitSet>'
             end
           end
 
@@ -218,12 +215,12 @@ module Cosmos
         end
 
         it "processes multiple units" do
-          tf = telemetry_file("TGT") do |tf|
-            add_tlm_packet_item(tf, "PKT", "TEMP1") do |tf|
-              tf.puts '<xtce:UnitSet>'
-              tf.puts '<xtce:Unit description="Volts">V</xtce:Unit>'
-              tf.puts '<xtce:Unit description="Mega">M</xtce:Unit>'
-              tf.puts '</xtce:UnitSet>'
+          tf = telemetry_file("TGT") do |file|
+            add_tlm_packet_item(file, "PKT", "TEMP1") do |file2|
+              file2.puts '<xtce:UnitSet>'
+              file2.puts '<xtce:Unit description="Volts">V</xtce:Unit>'
+              file2.puts '<xtce:Unit description="Mega">M</xtce:Unit>'
+              file2.puts '</xtce:UnitSet>'
             end
           end
 

data/spec/packets/structure_spec.rb

@@ -249,7 +249,8 @@ module Cosmos
 
       it "complains if appending after a variably sized item" do
         @s.define_item("test1", 0, 0, :BLOCK)
-        expect { @s.append(@item) }.to raise_error(ArgumentError, "Can't append an item after a variably sized item")
+        item = StructureItem.new("test2", 0, 16, :UINT, :BIG_ENDIAN)
+        expect { @s.append(item) }.to raise_error(ArgumentError, "Can't append an item after a variably sized item")
       end
     end
 

data/spec/packets/telemetry_spec.rb

@@ -149,7 +149,7 @@ module Cosmos
       end
 
       it "returns the packet and item" do
-        pkt,item = @tlm.packet_and_item("TGT1","PKT1","ITEM1")
+        _, item = @tlm.packet_and_item("TGT1","PKT1","ITEM1")
         expect(item.name).to eql "ITEM1"
       end
 
@@ -386,10 +386,8 @@ module Cosmos
       end
 
       it "returns the list of stale packets for a given target" do
-        p1 = @tlm.packet("TGT1","PKT1")
-        p2 = @tlm.packet("TGT1","PKT2")
-        p3 = @tlm.packet("TGT2","PKT1")
-        expect(@tlm.stale(false, "TGT2")).to include(p3)
+        pkt = @tlm.packet("TGT2","PKT1")
+        expect(@tlm.stale(false, "TGT2")).to include(pkt)
         @tlm.packet("TGT2","PKT1").check_limits
         expect(@tlm.stale(false, "TGT2").size).to eql 0
         expect(@tlm.stale(false, "TGT1").size).to eql 2

data/spec/processors/statistics_processor_spec.rb

@@ -54,6 +54,41 @@ module Cosmos
         expect(p.results[:MEAN]).to eql nil
         expect(p.results[:STDDEV]).to eql nil
       end
+
+      it "handles nil and infinity" do
+        p = StatisticsProcessor.new('TEST', '5')
+        packet = Packet.new("tgt","pkt")
+        packet.append_item("TEST", 32, :FLOAT)
+        packet.write("TEST", 1)
+        p.call(packet, packet.buffer)
+        expect(p.results[:MAX]).to eql 1.0
+        expect(p.results[:MIN]).to eql 1.0
+        expect(p.results[:MEAN]).to be_within(0.001).of(1.0)
+        expect(p.results[:STDDEV]).to be_within(0.001).of(0.0)
+        packet.write("TEST", Float::NAN)
+        p.call(packet, packet.buffer)
+        expect(p.results[:MAX]).to eql 1.0
+        expect(p.results[:MIN]).to eql 1.0
+        expect(p.results[:MEAN]).to be_within(0.001).of(1.0)
+        expect(p.results[:STDDEV]).to be_within(0.001).of(0.0)
+        packet.write("TEST", 2)
+        p.call(packet, packet.buffer)
+        expect(p.results[:MAX]).to eql 2.0
+        expect(p.results[:MIN]).to eql 1.0
+        expect(p.results[:MEAN]).to be_within(0.001).of(1.5)
+        expect(p.results[:STDDEV]).to be_within(0.001).of(0.7071)
+        packet.write("TEST", Float::INFINITY)
+        p.call(packet, packet.buffer)
+        expect(p.results[:MAX]).to eql 2.0
+        expect(p.results[:MIN]).to eql 1.0
+        expect(p.results[:MEAN]).to be_within(0.001).of(1.5)
+        expect(p.results[:STDDEV]).to be_within(0.001).of(0.7071)
+        p.reset
+        expect(p.results[:MAX]).to eql nil
+        expect(p.results[:MIN]).to eql nil
+        expect(p.results[:MEAN]).to eql nil
+        expect(p.results[:STDDEV]).to eql nil
+      end
     end
   end
 end