cosmos 4.1.1-java → 4.2.0-java

data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb

@@ -50,7 +50,6 @@ module Cosmos
     end
 
     after(:all) do
-      clean_config()
       File.delete @interface_filename
       File.delete @protocol_filename
     end

data/spec/tools/cmd_tlm_server/cmd_tlm_server_spec.rb

@@ -13,21 +13,7 @@ require 'cosmos'
 require 'cosmos/tools/cmd_tlm_server/cmd_tlm_server'
 
 module Cosmos
-
   describe CmdTlmServer 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 SYSTEM_INT cmd_tlm_server_interface.rb'
-        file.puts '  TARGET SYSTEM'
-      end
-    end
-
-    after(:all) do
-      clean_config()
-    end
-
     before(:each) do
       allow_any_instance_of(Interface).to receive(:connect).and_return(true)
       allow_any_instance_of(Interface).to receive(:connected?).and_return(true)
@@ -112,7 +98,7 @@ module Cosmos
           cts.stop
           sleep 0.2
 
-          expect(stdout.string).to match "Staleness Monitor thread unexpectedly died"
+          expect(stdout.string).to match("Staleness Monitor thread unexpectedly died")
         end
       end
     end
@@ -125,23 +111,23 @@ module Cosmos
             pkt = Packet.new("TGT","PKT")
             pi = PacketItem.new("TEST", 0, 32, :UINT, :BIG_ENDIAN, nil)
             cts.limits_change_callback(pkt, pi, :STALE, 100, true)
-            expect(stdout.string).to match "TGT PKT TEST = 100 is UNKNOWN"
+            expect(stdout.string).to match("TGT PKT TEST = 100 is UNKNOWN")
 
             pi.limits.state = :BLUE
             cts.limits_change_callback(pkt, pi, :STALE, 100, true)
-            expect(stdout.string).to match "<B>TGT PKT TEST = 100 is BLUE"
+            expect(stdout.string).to match("<B>TGT PKT TEST = 100 is BLUE")
 
             pi.limits.state = :GREEN
             cts.limits_change_callback(pkt, pi, :STALE, 100, true)
-            expect(stdout.string).to match "<G>TGT PKT TEST = 100 is GREEN"
+            expect(stdout.string).to match("<G>TGT PKT TEST = 100 is GREEN")
 
             pi.limits.state = :YELLOW
             cts.limits_change_callback(pkt, pi, :STALE, 100, true)
-            expect(stdout.string).to match "<Y>TGT PKT TEST = 100 is YELLOW"
+            expect(stdout.string).to match("<Y>TGT PKT TEST = 100 is YELLOW")
 
             pi.limits.state = :RED
             cts.limits_change_callback(pkt, pi, :STALE, 100, true)
-            expect(stdout.string).to match "<R>TGT PKT TEST = 100 is RED"
+            expect(stdout.string).to match("<R>TGT PKT TEST = 100 is RED")
           ensure
             cts.stop
             sleep 0.2
@@ -152,7 +138,7 @@ module Cosmos
       it "calls the limits response" do
         cts = CmdTlmServer.new
         begin
-          pkt = Packet.new("TGT","PKT")
+          packet = Packet.new("TGT","PKT")
           pi = PacketItem.new("TEST", 0, 32, :UINT, :BIG_ENDIAN, nil)
           lr = LimitsResponse.new
           pi.limits.response = lr
@@ -164,7 +150,7 @@ module Cosmos
             expect(state).to eql :GREEN
           end
           pi.limits.state = :GREEN
-          cts.limits_change_callback(pkt, pi, :YELLOW, 100, true)
+          cts.limits_change_callback(packet, pi, :YELLOW, 100, true)
         ensure
           cts.stop
           sleep 0.2
@@ -183,7 +169,7 @@ module Cosmos
             pi.limits.state = :GREEN
             cts.limits_change_callback(pkt, pi, :YELLOW, 100, true)
             sleep 0.1
-            expect(stdout.string).to match "TGT PKT TEST Limits Response Exception!"
+            expect(stdout.string).to match("TGT PKT TEST Limits Response Exception!")
           ensure
             cts.stop
             sleep 0.2
@@ -256,7 +242,7 @@ module Cosmos
           cts.limits_change_callback(pkt, pi, :GREEN, 100, true)
 
           # Pull off one
-          type,data = CmdTlmServer.get_limits_event(id)
+          CmdTlmServer.get_limits_event(id)
 
           # Add two more to put us over the limit
           cts.limits_change_callback(pkt, pi, :GREEN, 100, true)
@@ -289,7 +275,7 @@ module Cosmos
           cts.limits_change_callback(pkt, pi, :GREEN, 100, true)
 
           # Get one
-          type,data = CmdTlmServer.get_limits_event(id)
+          CmdTlmServer.get_limits_event(id)
 
           # Unsubscribe and try to get the other one
           CmdTlmServer.unsubscribe_limits_events(id)
@@ -413,12 +399,15 @@ module Cosmos
       end
 
       it "works in disconnect mode" do
-        cts = CmdTlmServer.new(CmdTlmServer::DEFAULT_CONFIG_FILE, false, true)
+        CmdTlmServer.new(CmdTlmServer::DEFAULT_CONFIG_FILE, false, true)
         id = CmdTlmServer.subscribe_packet_data([["SYSTEM","LIMITS_CHANGE"]])
-        buffer,tgt,pkt,tv_sec,tv_usec,cnt = CmdTlmServer.get_packet_data(id, true)
+        buffer, tgt, pkt, tv_sec, tv_usec, cnt = CmdTlmServer.get_packet_data(id, true)
         expect(buffer).not_to be_nil
         expect(tgt).to eql "SYSTEM"
         expect(pkt).to eql "LIMITS_CHANGE"
+        expect(tv_sec).to be > 0
+        expect(tv_usec).to be > 0
+        expect(cnt).to eql 1
       end
     end
 

data/spec/tools/cmd_tlm_server/commanding_spec.rb

@@ -17,10 +17,6 @@ require 'cosmos/tools/cmd_tlm_server/cmd_tlm_server_config'
 module Cosmos
 
   describe Commanding do
-    after(:all) do
-      clean_config()
-    end
-
     describe "send_command_to_target" do
       it "complains about unknown targets" do
         tf = Tempfile.new('unittest')
@@ -109,7 +105,7 @@ module Cosmos
         expect(System.commands.packet("UNKNOWN","UNKNOWN").buffer).to eql pkt.buffer
         tf.unlink
 
-        expect(stdout.string).to match "Unidentified packet"
+        expect(stdout.string).to match("Unidentified packet")
         Logger.level = Logger::FATAL
         $stdout = STDOUT
       end
@@ -140,7 +136,7 @@ module Cosmos
         cmd.send_raw('MY_INT', "\x00\x01")
         tf.unlink
 
-        expect(stdout.string).to match "Unlogged raw data of 2 bytes being sent to interface MY_INT"
+        expect(stdout.string).to match("Unlogged raw data of 2 bytes being sent to interface MY_INT")
         Logger.level = Logger::FATAL
         $stdout = STDOUT
       end

data/spec/tools/cmd_tlm_server/connections_spec.rb

@@ -17,10 +17,6 @@ require 'tempfile'
 module Cosmos
 
   describe Connections do
-    after(:all) do
-      clean_config()
-    end
-
     describe "initialize" do
       it "only allows :ROUTERS or :INTERFACES" do
         tf = Tempfile.new('unittest')

data/spec/tools/cmd_tlm_server/interface_thread_spec.rb

@@ -64,7 +64,7 @@ module Cosmos
           sleep 0.2
           expect(running_threads.length).to eql(1)
 
-          expect(stdout.string).to match "Connection Failed: RuntimeError : ConnectError"
+          expect(stdout.string).to match("Connection Failed: RuntimeError : ConnectError")
         end
       end
 
@@ -89,7 +89,7 @@ module Cosmos
           expect(running_threads.length).to eql(1)
           expect(error_count).to eql 2
 
-          expect(stdout.string).not_to match "Connection Failed: ConnectError"
+          expect(stdout.string).not_to match("Connection Failed: ConnectError")
         end
       end
 
@@ -103,7 +103,7 @@ module Cosmos
           sleep 0.2
           expect(running_threads.length).to eql(1)
 
-          expect(stdout.string).to match "Connection Success"
+          expect(stdout.string).to match("Connection Success")
         end
       end
 
@@ -122,7 +122,7 @@ module Cosmos
           expect(running_threads.length).to eql(1)
           expect(callback_called).to be true
 
-          expect(stdout.string).not_to match "Connection Success"
+          expect(stdout.string).not_to match("Connection Success")
         end
       end
 
@@ -141,7 +141,7 @@ module Cosmos
           sleep 0.2
           expect(running_threads.length).to eql(1)
 
-          expect(stdout.string).to match "Connection Lost"
+          expect(stdout.string).to match("Connection Lost")
         end
       end
 
@@ -164,7 +164,7 @@ module Cosmos
           expect(running_threads.length).to eql(1)
           expect(callback_called).to be true
 
-          expect(stdout.string).not_to match "Connection Lost"
+          expect(stdout.string).not_to match("Connection Lost")
         end
       end
 
@@ -178,7 +178,7 @@ module Cosmos
           thread.stop
           sleep 0.2
           expect(running_threads.length).to eql(1)
-          expect(stdout.string).to match "ReadError"
+          expect(stdout.string).to match("ReadError")
         end
       end
 
@@ -197,7 +197,7 @@ module Cosmos
           sleep 0.2
           expect(running_threads.length).to eql(1)
 
-          expect(stdout.string).to match "ECONNRESET"
+          expect(stdout.string).to match("ECONNRESET")
         end
       end
 
@@ -210,7 +210,7 @@ module Cosmos
           thread.stop
           sleep 0.2
 
-          expect(stdout.string).to match "Packet reading thread unexpectedly died"
+          expect(stdout.string).to match("Packet reading thread unexpectedly died")
         end
       end
 
@@ -229,7 +229,7 @@ module Cosmos
           sleep 0.2
           expect(callback_called).to be true
 
-          expect(stdout.string).not_to match "Packet reading thread unexpectedly died"
+          expect(stdout.string).not_to match("Packet reading thread unexpectedly died")
         end
       end
 
@@ -244,7 +244,7 @@ module Cosmos
           sleep 0.2
           expect(running_threads.length).to eql(1)
 
-          expect(stdout.string).to match "Unknown 2 byte packet"
+          expect(stdout.string).to match("Unknown 2 byte packet")
         end
       end
 
@@ -261,7 +261,7 @@ module Cosmos
           thread.stop
           sleep 0.2
           expect(running_threads.length).to eql(1)
-          expect(stdout.string).to match "Received unknown identified telemetry: BOB SMITH"
+          expect(stdout.string).to match("Received unknown identified telemetry: BOB SMITH")
         end
       end
 
@@ -281,7 +281,7 @@ module Cosmos
           sleep 0.2
           expect(running_threads.length).to eql(1)
 
-          expect(stdout.string).to match "Problem writing to router"
+          expect(stdout.string).to match("Problem writing to router")
         end
       end
 

data/spec/tools/cmd_tlm_server/interfaces_spec.rb

@@ -17,10 +17,6 @@ require 'cosmos/tools/cmd_tlm_server/cmd_tlm_server_config'
 module Cosmos
 
   describe Interfaces do
-    after(:all) do
-      clean_config()
-    end
-
     describe "map_all_targets" do
       it "complains about an unknown interface" do
         tf = Tempfile.new('unittest')
@@ -100,7 +96,7 @@ module Cosmos
           interfaces.all['MY_INT'].connect_on_startup = true
           interfaces.start
 
-          expect(stdout.string).to match "Creating thread for interface MY_INT"
+          expect(stdout.string).to match("Creating thread for interface MY_INT")
 
           interfaces.stop
           sleep 0.1
@@ -133,7 +129,7 @@ module Cosmos
           sleep 0.5
           expect(interfaces.state("MY_INT")).to eql "DISCONNECTED"
 
-          expect(stdout.string).to match "Disconnected from interface MY_INT"
+          expect(stdout.string).to match("Disconnected from interface MY_INT")
 
           sleep 0.1
         end
@@ -187,14 +183,14 @@ module Cosmos
           expect(config.interfaces['DEST2'].routers[0].name).to eql "MY_ROUTER"
           interfaces.connect("DEST1")
           sleep 0.2
-          expect(stdout.string).to match "Connecting to DEST1"
+          expect(stdout.string).to match("Connecting to DEST1")
           interfaces.disconnect("DEST1")
           interfaces.connect("DEST1",'localhost',8888,8888,6,6,'length')
           sleep 0.2
           expect(config.interfaces['DEST1'].routers[0].name).to eql "MY_ROUTER"
           expect(config.interfaces['DEST2'].routers[0].name).to eql "MY_ROUTER"
-          expect(stdout.string).to match "Disconnected from interface DEST1"
-          expect(stdout.string).to match "Connecting to DEST1"
+          expect(stdout.string).to match("Disconnected from interface DEST1")
+          expect(stdout.string).to match("Connecting to DEST1")
           interfaces.disconnect("DEST1")
           interfaces.stop
 

data/spec/tools/cmd_tlm_server/limits_groups_background_task_spec.rb

@@ -32,12 +32,20 @@ module Cosmos
     end
 
     describe "call" do
-      it "raises an error if the group is not defined" do
+      it "warns if the group is not defined" do
         class MyLimitsGroups1 < LimitsGroupsBackgroundTask
           def check_blah
           end
         end
-        expect { MyLimitsGroups1.new.call }.to raise_error(/check_blah doesn't match a group name/)
+        expect(Logger).to receive(:warn) do |msg|
+          expect(msg).to match(/check_blah doesn't match a group name/)
+        end
+        thread = Thread.new do
+          MyLimitsGroups1.new.call
+        end
+        sleep 0.1
+        thread.kill
+        thread.join
       end
 
       it "requires a floating point delay parameter" do
@@ -137,7 +145,7 @@ module Cosmos
           my.call
         end
         sleep 0.3
-        expect(my.status).to match /Checking groups took 0.\d+/
+        expect(my.status).to match(/Checking groups took 0.\d+/)
         Cosmos.kill_thread(self, thread)
       end
     end

data/spec/tools/cmd_tlm_server/packet_logging_spec.rb

@@ -17,10 +17,6 @@ require 'tempfile'
 module Cosmos
 
   describe PacketLogging do
-    after(:all) do
-      clean_config()
-    end
-
     describe "start" do
       it "starts each log writer" do
         tf = Tempfile.new('unittest')

data/spec/tools/cmd_tlm_server/router_thread_spec.rb

@@ -43,7 +43,7 @@ module Cosmos
           thread.stop
           sleep 0.5
           expect(running_threads.length).to eql(1)
-          expect(stdout.string).to match "disconnected interface"
+          expect(stdout.string).to match("disconnected interface")
         end
       end
 
@@ -61,7 +61,7 @@ module Cosmos
           thread.stop
           sleep 0.5
           expect(running_threads.length).to eql(1)
-          expect(stdout.string).to match "Error routing command"
+          expect(stdout.string).to match("Error routing command")
         end
       end
 
@@ -85,7 +85,7 @@ module Cosmos
           thread.stop
           sleep 0.5
           expect(running_threads.length).to eql(1)
-          expect(stdout.string).to match "Received unknown identified command: BOB SMITH"
+          expect(stdout.string).to match("Received unknown identified command: BOB SMITH")
         end
       end
 
@@ -113,7 +113,7 @@ module Cosmos
           thread.stop
           sleep 0.5
           expect(running_threads.length).to eql(1)
-          expect(stdout.string).to match "Received unknown identified command: BOB SMITH"
+          expect(stdout.string).to match("Received unknown identified command: BOB SMITH")
         end
         expect(target).to have_received(:interface).at_least(2).times #and_return(@interface)
       end
@@ -142,7 +142,7 @@ module Cosmos
           thread.stop
           sleep 0.5
           expect(running_threads.length).to eql(1)
-          expect(stdout.string).to match "target with no interface"
+          expect(stdout.string).to match("target with no interface")
         end
       end
     end

data/spec/tools/cmd_tlm_server/routers_spec.rb

@@ -16,10 +16,6 @@ require 'tempfile'
 module Cosmos
 
   describe Routers do
-    after(:all) do
-      clean_config()
-    end
-
     describe "start" do
       it "connects each router" do
         tf = Tempfile.new('unittest')
@@ -37,7 +33,7 @@ module Cosmos
           routers.all['MY_ROUTER'].connect_on_startup = true
           routers.start
 
-          expect(stdout.string).to match "Creating thread for router MY_ROUTER"
+          expect(stdout.string).to match("Creating thread for router MY_ROUTER")
           routers.stop
         end
         tf.unlink
@@ -67,7 +63,7 @@ module Cosmos
           sleep 0.1
           expect(routers.state("MY_ROUTER")).to eql "DISCONNECTED"
 
-          expect(stdout.string).to match "Disconnected from router MY_ROUTER"
+          expect(stdout.string).to match("Disconnected from router MY_ROUTER")
         end
         tf.unlink
         sleep(0.2)
@@ -156,12 +152,12 @@ module Cosmos
           expect(config.interfaces['DEST2'].routers[0].name).to eql "MY_ROUTER"
           routers.connect("MY_ROUTER")
           sleep 0.1
-          expect(stdout.string).to match "Connecting to MY_ROUTER"
+          expect(stdout.string).to match("Connecting to MY_ROUTER")
           routers.disconnect("MY_ROUTER")
           routers.connect("MY_ROUTER",'localhost',8888,8888,6,6,'length')
           sleep 0.1
-          expect(stdout.string).to match "Disconnected from router MY_ROUTER"
-          expect(stdout.string).to match "Connecting to MY_ROUTER"
+          expect(stdout.string).to match("Disconnected from router MY_ROUTER")
+          expect(stdout.string).to match("Connecting to MY_ROUTER")
           expect(routers.all["MY_ROUTER"].interfaces[0].name).to eql "DEST1"
           expect(routers.all["MY_ROUTER"].interfaces[1].name).to eql "DEST2"
           expect(config.interfaces['DEST1'].routers[0].name).to eql "MY_ROUTER"