cosmos 4.4.0-java → 4.5.1-java

data/spec/io/json_drb_spec.rb

@@ -200,6 +200,20 @@ module Cosmos
         sleep(0.1)
       end
 
+      it "processes success requests with uppercase" do
+        class MyServer5
+          def my_method(param)
+          end
+        end
+
+        @json.start_service('127.0.0.1', 7777, MyServer5.new)
+        request_data = JsonRpcRequest.new('MY_METHOD', 'param', 1).to_json
+        _, error_code = @json.process_request(request_data, Time.now)
+        expect(error_code).to eq nil
+        @json.stop_service
+        sleep(0.1)
+      end
+
       it "does not allow dangerous methods" do
         @json.start_service('127.0.0.1', 7777, self)
         request_data = JsonRpcRequest.new('send', 'param', 1).to_json

data/spec/io/json_rpc_spec.rb

@@ -238,25 +238,25 @@ module Cosmos
 
       it "reports an error if there is no 'result' or 'error' key" do
         json = JsonRpcResponse.new(10).as_json
-        expect { JsonRpcResponse.from_json(json.to_json) }.to raise_error("Invalid JSON-RPC 2.0 Response")
+        expect { JsonRpcResponse.from_json(json.to_json) }.to raise_error(/Invalid JSON-RPC 2.0 Response/)
       end
 
       it "reports an error if the version isn't 2.0" do
         json = JsonRpcResponse.new(10).as_json
         json['jsonrpc'] = "1.1"
         json['result'] = "true"
-        expect { JsonRpcResponse.from_json(json.to_json) }.to raise_error("Invalid JSON-RPC 2.0 Response")
+        expect { JsonRpcResponse.from_json(json.to_json) }.to raise_error(/Invalid JSON-RPC 2.0 Response/)
       end
 
       it "reports an error if there is both a 'result' and 'error' key" do
         json = JsonRpcResponse.new(10).as_json
         json['result'] = "true"
         json['error'] = {"code"=>-1, "message"=>"error"}
-        expect { JsonRpcResponse.from_json(json.to_json) }.to raise_error("Invalid JSON-RPC 2.0 Response")
+        expect { JsonRpcResponse.from_json(json.to_json) }.to raise_error(/Invalid JSON-RPC 2.0 Response/)
       end
 
       it "reports an error if it is not json" do
-        expect { JsonRpcResponse.from_json(Object.new) }.to raise_error("Invalid JSON-RPC 2.0 Response")
+        expect { JsonRpcResponse.from_json(Object.new) }.to raise_error(/Invalid JSON-RPC 2.0 Response/)
       end
 
       it "reports an error if the error hash is bad" do
@@ -268,4 +268,3 @@ module Cosmos
 
   end
 end
-

data/spec/io/posix_serial_driver_spec.rb

@@ -0,0 +1,81 @@
+# encoding: ascii-8bit
+
+# Copyright 2014 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i and RUBY_ENGINE == 'ruby' and !ENV['TRAVIS']
+
+  require 'spec_helper'
+  require 'cosmos/io/posix_serial_driver'
+
+  module Cosmos
+
+    describe PosixSerialDriver do
+      describe "instance" do
+        it "enforces the baud rate to a known value" do
+          expect { PosixSerialDriver.new('/dev/ttyS0',10,:NONE) }.to raise_error(ArgumentError, "Invalid baud rate: 10")
+        end
+
+        it "supports even, odd, or no parity" do
+          expect { PosixSerialDriver.new('/dev/ttyS0',9600,:EVEN).close }.to_not raise_error
+          expect { PosixSerialDriver.new('/dev/ttyS0',9600,:ODD).close }.to_not raise_error
+          expect { PosixSerialDriver.new('/dev/ttyS0',9600,:NONE).close }.to_not raise_error
+          expect { PosixSerialDriver.new('/dev/ttyS0',9600,:BLAH) }.to raise_error(ArgumentError, "Invalid parity: BLAH")
+        end
+
+        it "supports 1 or 2 stop bits" do
+          expect { PosixSerialDriver.new('/dev/ttyS0',9600,:NONE,1).close }.to_not raise_error
+          expect { PosixSerialDriver.new('/dev/ttyS0',9600,:NONE,2).close }.to_not raise_error
+          expect { PosixSerialDriver.new('/dev/ttyS0',9600,:NONE,3) }.to raise_error(ArgumentError, "Invalid stop bits: 3")
+        end
+
+        it "supports 5-8 data bits" do
+          (5..8).each do |data_bits|
+            driver = PosixSerialDriver.new('/dev/ttyS0',9600,:NONE,1,10,nil,:NONE,data_bits)
+            handle = driver.instance_variable_get(:@handle)
+            expect(handle.tcgetattr.cflag & Termios::CSIZE).to eq(Termios.const_get("CS#{data_bits}"))
+            driver.close
+          end
+          expect { PosixSerialDriver.new('/dev/ttyS0',9600,:NONE,1,10,nil,:NONE,9) }.to raise_error(ArgumentError, "Invalid data bits: 9")
+        end
+
+        it "sets arbitrary Posix structure elements" do
+          driver = PosixSerialDriver.new('/dev/ttyS0',9600,:NONE,1,10,nil,:NONE,8)
+          handle = driver.instance_variable_get(:@handle)
+          # Verify non of the things we're going to set are already set
+          expect(handle.tcgetattr.iflag & Termios::IGNBRK).to eq(0)
+          expect(handle.tcgetattr.oflag & Termios::OPOST).to eq(0)
+          expect(handle.tcgetattr.cflag & Termios::CLOCAL).to eq(Termios::CLOCAL) # We set this by default
+          expect(handle.tcgetattr.lflag & Termios::ECHO).to eq(0)
+          expect(handle.tcgetattr.cc[Termios::VMIN]).to eq(1)
+          driver.close
+          # When setting a field the "1" is optional. When clearing a field the "0" is required.
+          # Entries in the "cc" special characters field are automatically converted to integers if they are numbers
+          struct = [["iflag", "IGNBRK"], ["oflag", "OPOST", "1"], ["cflag", "CLOCAL", "0"], ["lflag", "ECHO"], ["cc", "VMIN", "2"]]
+          driver = PosixSerialDriver.new('/dev/ttyS0',9600,:NONE,1,10,nil,:NONE,8,struct)
+          handle = driver.instance_variable_get(:@handle)
+          expect(handle.tcgetattr.iflag & Termios::IGNBRK).to eq(Termios::IGNBRK)
+          expect(handle.tcgetattr.oflag & Termios::OPOST).to eq(Termios::OPOST)
+          expect(handle.tcgetattr.cflag & Termios::CLOCAL).to eq(0)
+          expect(handle.tcgetattr.lflag & Termios::ECHO).to eq(Termios::ECHO)
+          expect(handle.tcgetattr.cc[Termios::VMIN]).to eq(2)
+          driver.close
+        end
+      end
+
+      describe "close, closed?" do
+        it "closes the handle" do
+          driver = PosixSerialDriver.new('/dev/ttyS0',9600)
+          expect(driver.closed?).to be false
+          driver.close
+          expect(driver.closed?).to be true
+        end
+      end
+    end
+  end
+end

data/spec/io/win32_serial_driver_spec.rb

@@ -19,7 +19,8 @@ if RUBY_ENGINE == 'ruby' or Gem.win_platform?
       before(:each) do
         allow(Win32).to receive(:create_file).and_return(Object.new)
         state = double("comm_state")
-        allow(state).to receive(:write)
+        @dcb_struct = {}
+        allow(state).to receive(:write) { |key, value| @dcb_struct[key] = value }
         allow(Win32).to receive(:get_comm_state).and_return(state)
         allow(Win32).to receive(:set_comm_state)
         allow(Win32).to receive(:set_comm_timeouts)
@@ -34,12 +35,14 @@ if RUBY_ENGINE == 'ruby' or Gem.win_platform?
           expect { Win32SerialDriver.new('COM1',9600,:EVEN) }.to_not raise_error
           expect { Win32SerialDriver.new('COM1',9600,:ODD) }.to_not raise_error
           expect { Win32SerialDriver.new('COM1',9600,:NONE) }.to_not raise_error
+          expect(@dcb_struct["Parity"]).to_not be_nil # Simply check that Parity was set
           expect { Win32SerialDriver.new('COM1',9600,:BLAH) }.to raise_error(ArgumentError, "Invalid parity: BLAH")
         end
 
         it "supports 1 or 2 stop bits" do
           expect { Win32SerialDriver.new('COM1',9600,:NONE,1) }.to_not raise_error
           expect { Win32SerialDriver.new('COM1',9600,:NONE,2) }.to_not raise_error
+          expect(@dcb_struct["StopBits"]).to_not be_nil # Simply check that StopBits was set
           expect { Win32SerialDriver.new('COM1',9600,:NONE,3) }.to raise_error(ArgumentError, "Invalid stop bits: 3")
         end
 
@@ -49,6 +52,35 @@ if RUBY_ENGINE == 'ruby' or Gem.win_platform?
           expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,7) }.to_not raise_error
           expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,8) }.to_not raise_error
           expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,9) }.to raise_error(ArgumentError, "Invalid data bits: 9")
+          expect(@dcb_struct["ByteSize"]).to_not be_nil # Simply check that ByteSize was set
+        end
+
+        it "sets arbitrary Windows DCB structure elements" do
+          Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,8)
+          expect(@dcb_struct["fOutxDsrFlow"]).to be_nil # This isn't set by default
+          expect(@dcb_struct["Parity"]).to eq(0)
+          # Set a new variable in the Windows DCB struct and override the :NONE parity
+          # We pass them in as strings because that's how they're parsed
+          struct = [["fOutxDsrFlow", "1"], ["Parity", "4"]]
+          Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,8,struct)
+          expect(@dcb_struct["fOutxDsrFlow"]).to eq(1)
+          expect(@dcb_struct["Parity"]).to eq(4)
+        end
+
+        it "calculates the correct timeouts" do
+          Win32::BAUD_RATES.each do |baud|
+            (5..8).each do |data_bits|
+              (1..2).each do |stop_bits|
+                [:EVEN, :ODD, :NONE].each do |parity|
+                  # data_bits + 1 start bit + stop bits + potentially a parity bit
+                  symbols = data_bits + 1 + stop_bits + (parity == :NONE ? 0 : 1)
+                  delay = 1000.0 / (baud.to_f / symbols)
+                  expect(Win32).to receive(:set_comm_timeouts).with(anything, 0xFFFFFFFF,0,0,delay.ceil,1000)
+                  Win32SerialDriver.new('COM1',baud,parity,stop_bits,10,nil,0.01,1000,:NONE,data_bits)
+                end
+              end
+            end
+          end
         end
       end
 
@@ -92,8 +124,6 @@ if RUBY_ENGINE == 'ruby' or Gem.win_platform?
           expect { driver.read }.to raise_error(Timeout::Error)
         end
       end
-
     end
   end
-
 end

data/spec/packet_logs/packet_log_reader_spec.rb

@@ -23,7 +23,10 @@ module Cosmos
       plw = PacketLogWriter.new(:CMD,nil,true,nil,10000000,nil,false)
       @cmd_packets = []
       pkt = System.commands.packet("SYSTEM","STARTLOGGING").clone
-      pkt.received_time = Time.new(2020,1,31,12,30,15)
+      # Avoid precision errors by rounding to nearest second and then add 1 to ensure
+      # the time is AFTER the initial META packet with the current time
+      @time = Time.now.round + 1
+      pkt.received_time = @time
       pkt.write('label','PKT1')
       plw.write(pkt)
       @cmd_packet_length = pkt.length
@@ -43,7 +46,7 @@ module Cosmos
       plw = PacketLogWriter.new(:TLM,nil,true,nil,10000000,nil,false)
       @tlm_packets = []
       pkt = System.telemetry.packet("SYSTEM","LIMITS_CHANGE").clone
-      pkt.received_time = Time.new(2020,2,1,12,30,15)
+      pkt.received_time = @time
       pkt.write('PACKET','PKT1')
       plw.write(pkt)
       @tlm_packet_length = pkt.length
@@ -121,7 +124,7 @@ module Cosmos
           file.write [pkt.buffer.length].pack('N')
           file.write pkt.buffer
         end
-        expect(@plr.open(filename)).to eql [false, nil]
+        expect(@plr.open(filename)[0]).to eql false
         pkt1 = @plr.read
         expect(pkt1.target_name).to eql 'TGT1'
         expect(pkt1.packet_name).to eql 'PKT1'
@@ -149,7 +152,7 @@ module Cosmos
           file.write [pkt.buffer.length].pack('N')
           file.write pkt.buffer
         end
-        expect(@plr.open(filename)).to eql [false, nil]
+        expect(@plr.open(filename)[0]).to eql false
         pkt1 = @plr.read
         expect(pkt1.target_name).to eql 'TGT1'
         expect(pkt1.packet_name).to eql 'PKT1'
@@ -203,7 +206,7 @@ module Cosmos
         end
 
         # Corrupt the second config
-        second_config_path = System.instance.send(:find_configuration, second_config_name)
+        second_config_path = System.instance.public_send(:find_configuration, second_config_name)
         md5 = File.basename(second_config_path, '.*')
         Zip::File.open(second_config_path) do |zip|
           zip.file.rename(File.join(md5, 'system.txt'), File.join(md5, 'system2.txt'))
@@ -239,10 +242,11 @@ module Cosmos
         expect(packet_offsets).to eql [PacketLogReader::COSMOS4_HEADER_LENGTH, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length + header_length + @cmd_packet_length, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length + (header_length + @cmd_packet_length) * 2]
 
         expect(@plr.open(Dir[File.join(@log_path,"*cmd.bin")][0])).to eql [true, nil]
-        pkt = @plr.read_at_offset(packet_offsets[2])
+        pkt = @plr.read_at_offset(packet_offsets[2]) # Grab the second STARTLOGGING (META is 0)
         expect(pkt.target_name).to eql "SYSTEM"
         expect(pkt.packet_name).to eql "STARTLOGGING"
-        expect(pkt.received_time).to eql Time.new(2020,1,31,12,30,16)
+        expect(pkt.read('LABEL')).to eql "PKT2"
+        expect(pkt.received_time).to eql @time + 1
         @plr.close
       end
 
@@ -257,10 +261,11 @@ module Cosmos
         expect(packet_offsets).to eql [PacketLogReader::COSMOS4_HEADER_LENGTH, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length + header_length + @tlm_packet_length, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length + (header_length + @tlm_packet_length) * 2]
 
         expect(@plr.open(Dir[File.join(@log_path,"*tlm.bin")][0])).to eql [true, nil]
-        pkt = @plr.read_at_offset(packet_offsets[2])
+        pkt = @plr.read_at_offset(packet_offsets[2]) # Grab the second LIMITS_CHANGE (META is 0)
         expect(pkt.target_name).to eql "SYSTEM"
         expect(pkt.packet_name).to eql "LIMITS_CHANGE"
-        expect(pkt.received_time).to eql Time.new(2020,2,1,12,30,16)
+        expect(pkt.read('PACKET')).to eql "PKT2"
+        expect(pkt.received_time).to eql @time + 1
         @plr.close
       end
     end
@@ -415,9 +420,8 @@ module Cosmos
       end
 
       it "returns all packets if the start time is before all" do
-        time = Time.new(2000,1,31,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, @time) do |packet|
           next if packet.packet_name == 'META'
           expect(packet.target_name).to eql @cmd_packets[index].target_name
           expect(packet.packet_name).to eql @cmd_packets[index].packet_name
@@ -429,51 +433,48 @@ module Cosmos
       end
 
       it "returns no packets if the start time is after all" do
-        time = Time.new(2030,2,1,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, @time + 100) do |packet|
           index += 1
         end
         expect(index).to eql 0
       end
 
       it "returns all packets after a start time" do
-        time = Time.new(2020,1,31,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, time) do |packet|
-          expect(packet.target_name).to eql @cmd_packets[index+1].target_name
-          expect(packet.packet_name).to eql @cmd_packets[index+1].packet_name
-          expect(packet.received_time).to eql @cmd_packets[index+1].received_time
-          expect(packet.read('LABEL')).to eql @cmd_packets[index+1].read('LABEL')
+        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, @time) do |packet|
+          next if packet.packet_name == 'META'
+          expect(packet.target_name).to eql @cmd_packets[index].target_name
+          expect(packet.packet_name).to eql @cmd_packets[index].packet_name
+          expect(packet.received_time).to eql @cmd_packets[index].received_time
+          expect(packet.read('LABEL')).to eql @cmd_packets[index].read('LABEL')
           index += 1
         end
-        expect(index).to eql 2
+        expect(index).to eql 3
 
-        time = Time.new(2020,2,1,12,30,16)
-        index = 0
-        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, time) do |packet|
-          expect(packet.target_name).to eql @tlm_packets[index+1].target_name
-          expect(packet.packet_name).to eql @tlm_packets[index+1].packet_name
-          expect(packet.received_time).to eql @tlm_packets[index+1].received_time
-          expect(packet.read('PACKET')).to eql @tlm_packets[index+1].read('PACKET')
+        index = 1 # @time + 1
+        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, @time + 1) do |packet|
+          next if packet.packet_name == 'META'
+          expect(packet.target_name).to eql @tlm_packets[index].target_name
+          expect(packet.packet_name).to eql @tlm_packets[index].packet_name
+          expect(packet.received_time).to eql @tlm_packets[index].received_time
+          expect(packet.read('PACKET')).to eql @tlm_packets[index].read('PACKET')
           index += 1
         end
-        expect(index).to eql 2
+        expect(index).to eql 3
       end
 
       it "returns no packets if the end time is before all" do
-        time = Time.new(2000,1,31,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, nil, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, nil, @time - 10) do |packet|
           index += 1
         end
         expect(index).to eql 0
       end
 
       it "returns all packets if the end time is after all" do
-        time = Time.new(2030,2,1,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, nil, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, nil, @time + 10) do |packet|
           next if packet.packet_name == 'META'
           expect(packet.target_name).to eql @cmd_packets[index].target_name
           expect(packet.packet_name).to eql @cmd_packets[index].packet_name
@@ -485,9 +486,8 @@ module Cosmos
       end
 
       it "returns all packets before an end time" do
-        time = Time.new(2020,1,31,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, nil, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, nil, @time) do |packet|
           next if packet.packet_name == 'META'
           expect(packet.target_name).to eql @cmd_packets[index].target_name
           expect(packet.packet_name).to eql @cmd_packets[index].packet_name
@@ -495,11 +495,10 @@ module Cosmos
           expect(packet.read('LABEL')).to eql @cmd_packets[index].read('LABEL')
           index += 1
         end
-        expect(index).to eql 2
+        expect(index).to eql 1
 
-        time = Time.new(2020,2,1,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, nil, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, nil, @time + 1) do |packet|
           next if packet.packet_name == 'META'
           expect(packet.target_name).to eql @tlm_packets[index].target_name
           expect(packet.packet_name).to eql @tlm_packets[index].packet_name

data/spec/packets/structure_spec.rb

@@ -185,6 +185,8 @@ module Cosmos
         expect(@s.defined_length).to eql 1
         si = StructureItem.new("test1",0,16,:INT,:BIG_ENDIAN)
         @s.define(si)
+        expect(@s.items.length).to eql 1
+        expect(@s.sorted_items.length).to eql 1
         expect(@s.sorted_items[0].name).to eql "TEST1"
         expect(@s.items["TEST1"].bit_size).to eql 16
         expect(@s.items["TEST1"].data_type).to eql :INT
@@ -290,6 +292,56 @@ module Cosmos
       end
     end
 
+    describe "delete_item" do
+      before(:each) do
+        @s = Structure.new(:BIG_ENDIAN)
+        @s.define_item("test1", 0, 8, :UINT)
+      end
+
+      it "removes the item and leaves a hole" do
+        @s.append_item("test2", 16, :UINT)
+        expect(@s.defined_length).to eql 3
+        @s.delete_item("test1")
+        expect { @s.get_item("test1") }.to raise_error(ArgumentError, "Unknown item: test1")
+        expect(@s.defined_length).to eql 3
+        expect(@s.items["TEST1"]).to be_nil
+        expect(@s.items["TEST2"]).not_to be_nil
+        expect(@s.sorted_items.length).to eql 1
+        expect(@s.sorted_items[0]).to eql(@s.get_item("test2"))
+        buffer = "\x01\x02\x03"
+        expect(@s.read("test2", :RAW, buffer)).to eql 0x0203
+      end
+
+      it "allows new items to be defined in place" do
+        @s.append_item("test2", 16, :UINT)
+        @s.append_item("test3", 8, :UINT)
+        expect(@s.defined_length).to eql 4
+        # Delete the first 2 items, note a 3 byte hole now exists
+        @s.delete_item("test1")
+        @s.delete_item("test2")
+        expect(@s.defined_length).to eql 4
+        expect(@s.items.length).to eql 1
+        expect(@s.sorted_items.length).to eql 1
+        # Fill the hole and overlap the last byte
+        @s.define_item("test4", 0, 16, :UINT)
+        @s.define_item("test5", 16, 16, :UINT)
+        @s.define_item("test6", 32, 32, :UINT)
+        buffer = "\x01\x02\x03\x04\x05\x06\x07\x08"
+        expect(@s.read("test4", :RAW, buffer)).to eql 0x0102
+        expect(@s.read("test5", :RAW, buffer)).to eql 0x0304
+        expect(@s.read("test6", :RAW, buffer)).to eql 0x05060708
+        # test3 is still defined
+        expect(@s.read("test3", :RAW, buffer)).to eql 0x04
+        expect(@s.items.length).to eql 4
+        expect(@s.sorted_items.length).to eql 4
+        # Check that everything is sorted correctly
+        expect(@s.sorted_items[0].name).to eql "TEST4"
+        expect(@s.sorted_items[1].name).to eql "TEST5"
+        expect(@s.sorted_items[2].name).to eql "TEST3"
+        expect(@s.sorted_items[3].name).to eql "TEST6"
+      end
+    end
+
     describe "read_item" do
       it "complains if no buffer given" do
         s = Structure.new
@@ -601,7 +653,5 @@ module Cosmos
         expect { s.test1 }.to raise_error(ArgumentError, "Unknown item: test1")
       end
     end
-
   end # describe Structure
-
 end

data/spec/packets/telemetry_spec.rb

@@ -596,6 +596,34 @@ module Cosmos
       end
     end
 
+    describe "all_item_strings" do
+      it "returns hidden TGT,PKT,ITEMs in the system" do
+        @tlm.packet("TGT1","PKT1").hidden = true
+        @tlm.packet("TGT1","PKT2").disabled = true
+        default = @tlm.all_item_strings() # Return only those not hidden or disabled
+        strings = @tlm.all_item_strings(true) # Return everything, even hidden & disabled
+        expect(default).to_not eq strings
+        # Spot check the default
+        expect(default).to include("TGT2 PKT1 ITEM1")
+        expect(default).to include("TGT2 PKT1 ITEM2")
+        expect(default).to_not include("TGT1 PKT1 ITEM1") # hidden
+        expect(default).to_not include("TGT1 PKT2 ITEM1") # disabled
+
+        items = {}
+        # Built from the before(:each) section
+        items['TGT1 PKT1'] = %w(ITEM1 ITEM2 ITEM3 ITEM4)
+        items['TGT1 PKT2'] = %w(ITEM1 ITEM2)
+        items['TGT2 PKT1'] = %w(ITEM1 ITEM2)
+        items.each do |tgt_pkt, items|
+          Packet::RESERVED_ITEM_NAMES.each do |item|
+            expect(strings).to include("#{tgt_pkt} #{item}")
+          end
+          items.each do |item|
+            expect(strings).to include("#{tgt_pkt} #{item}")
+          end
+        end
+      end
+    end
+
   end
 end
-

data/spec/script/extract_spec.rb

@@ -148,6 +148,10 @@ module Cosmos
         expect(extract_fields_from_check_text("TARGET PACKET ITEM < 5")).to eql(['TARGET', 'PACKET', 'ITEM', '< 5'])
       end
 
+      it "should support target packet items named the same" do
+        expect(extract_fields_from_check_text("TEST TEST TEST == 5")).to eql(['TEST', 'TEST', 'TEST', '== 5'])
+      end
+
       it "should complain about trying to do an = comparison" do
         expect { extract_fields_from_check_text("TARGET PACKET ITEM = 5") }.to raise_error(/ERROR: Use/)
       end
@@ -160,4 +164,3 @@ module Cosmos
 
   end
 end
-

data/spec/system/system_spec.rb

@@ -45,7 +45,7 @@ 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 DART_DECOM DART_STREAM)
+        expect(System.ports.keys).to eql %w(CTS_API TLMVIEWER_API CTS_PREIDENTIFIED CTS_CMD_ROUTER REPLAY_API REPLAY_PREIDENTIFIED REPLAY_CMD_ROUTER DART_STREAM DART_DECOM DART_MASTER)
       end
 
       it "creates default paths" do
@@ -349,7 +349,7 @@ module Cosmos
           # Try loading something that doesn't exist
           # It should fail and reload the original configuration
           name, err = System.load_configuration("BLAH")
-          expect(err).to eql nil
+          expect(err.message).to eql "Unable to find configuration: BLAH"
           expect(name).to eql original_config_name
 
           # Now load the second configuration. It shouldn't have the most
@@ -359,7 +359,7 @@ module Cosmos
           expect(System.telemetry.packets('SYSTEM').keys).not_to include "TEST2"
 
           # Now remove system.txt from the third configuration and try to load it again to cause an error
-          #third_config_path = System.instance.send(:find_configuration, third_config_name)
+          #third_config_path = System.instance.public_send(:find_configuration, third_config_name)
           #FileUtils.mv File.join(third_config_path, 'system.txt'), File.join(third_config_path, 'system2.txt')
           #result, err = System.load_configuration(third_config_name)
           #expect(result).to eql original_config_name
@@ -703,6 +703,114 @@ module Cosmos
         end
       end
 
+      context "with ALLOW_ROUTER_COMMANDING" do
+        it "takes 0 parameters" do
+          tf = Tempfile.new('unittest')
+          tf.puts("ALLOW_ROUTER_COMMANDING BLAH TRUE")
+          tf.close
+          expect { System.instance.process_file(tf.path) }.to raise_error(ConfigParser::Error, /Too many parameters for ALLOW_ROUTER_COMMANDING./)
+          tf.unlink
+        end
+
+        it "allows router commanding" do
+          tf = Tempfile.new('unittest')
+          tf.puts("ALLOW_ROUTER_COMMANDING")
+          tf.close
+          expect(System.allow_router_commanding).to be false
+          System.instance.process_file(tf.path)
+          expect(System.allow_router_commanding).to be true
+          tf.unlink
+        end
+
+        it "it disallows router commanding if not present" do
+          tf = Tempfile.new('unittest')
+
+          tf.close
+          expect(System.allow_router_commanding).to be false
+          System.instance.process_file(tf.path)
+          expect(System.allow_router_commanding).to be false
+          tf.unlink
+        end
+      end
+
+      context "with X_CSRF_TOKEN" do
+        it "takes 1 parameters" do
+          tf = Tempfile.new('unittest')
+          tf.puts("X_CSRF_TOKEN")
+          tf.close
+          expect { System.instance.process_file(tf.path) }.to raise_error(ConfigParser::Error, /Not enough parameters for X_CSRF_TOKEN./)
+          tf.unlink
+
+          tf = Tempfile.new('unittest')
+          tf.puts("X_CSRF_TOKEN localhost true")
+          tf.close
+          expect { System.instance.process_file(tf.path) }.to raise_error(ConfigParser::Error, /Too many parameters for X_CSRF_TOKEN./)
+          tf.unlink
+        end
+
+        it "updates the CSRF token" do
+          tf = Tempfile.new('unittest')
+          tf.puts("X_CSRF_TOKEN ExtraSpecial")
+          tf.close
+          expect(System.x_csrf_token).to eql "SuperSecret"
+          System.instance.process_file(tf.path)
+          expect(System.x_csrf_token).to eql "ExtraSpecial"
+          tf.unlink
+        end
+      end
+
+      context "with ALLOW_HOST" do
+        it "takes 1 parameters" do
+          tf = Tempfile.new('unittest')
+          tf.puts("ALLOW_HOST")
+          tf.close
+          expect { System.instance.process_file(tf.path) }.to raise_error(ConfigParser::Error, /Not enough parameters for ALLOW_HOST./)
+          tf.unlink
+
+          tf = Tempfile.new('unittest')
+          tf.puts("ALLOW_HOST localhost true")
+          tf.close
+          expect { System.instance.process_file(tf.path) }.to raise_error(ConfigParser::Error, /Too many parameters for ALLOW_HOST./)
+          tf.unlink
+        end
+
+        it "adds to allowed hosts" do
+          tf = Tempfile.new('unittest')
+          tf.puts("ALLOW_HOST 1.2.3.4:8888")
+          tf.close
+          expect(System.allowed_hosts).to_not include("1.2.3.4:8888")
+          System.instance.process_file(tf.path)
+          expect(System.allowed_hosts).to include("1.2.3.4:8888")
+          tf.unlink
+        end
+      end
+
+      context "with ALLOW_ORIGIN" do
+        it "takes 1 parameters" do
+          tf = Tempfile.new('unittest')
+          tf.puts("ALLOW_ORIGIN")
+          tf.close
+          expect { System.instance.process_file(tf.path) }.to raise_error(ConfigParser::Error, /Not enough parameters for ALLOW_ORIGIN./)
+          tf.unlink
+
+          tf = Tempfile.new('unittest')
+          tf.puts("ALLOW_ORIGIN localhost true")
+          tf.close
+          expect { System.instance.process_file(tf.path) }.to raise_error(ConfigParser::Error, /Too many parameters for ALLOW_ORIGIN./)
+          tf.unlink
+        end
+
+        it "adds to allowed origins" do
+          tf = Tempfile.new('unittest')
+          tf.puts("ALLOW_ORIGIN 1.2.3.4:8888")
+          tf.close
+          expect(System.allowed_origins).to_not include("1.2.3.4:8888")
+          System.instance.process_file(tf.path)
+          expect(System.allowed_origins).to include("1.2.3.4:8888")
+          tf.unlink
+        end
+      end
+
       context "with ALLOW_ACCESS" do
         it "takes 1 parameters" do
           tf = Tempfile.new('unittest')