cosmos 3.2.1 → 3.3.0

data/spec/packets/parsers/format_string_parser_spec.rb

@@ -23,7 +23,7 @@ module Cosmos
         @pc = PacketConfig.new
       end
 
-      it "should complain if a current item is not defined" do
+      it "complains if a current item is not defined" do
         # Check for missing ITEM definitions
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
@@ -33,7 +33,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain if there are not enough parameters" do
+      it "complains if there are not enough parameters" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts 'ITEM myitem 0 8 UINT "Test Item"'
@@ -43,7 +43,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain if there are too many parameters" do
+      it "complains if there are too many parameters" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts 'ITEM myitem 0 8 UINT "Test Item"'
@@ -53,7 +53,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain about invalid format strings" do
+      it "complains about invalid format strings" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  ITEM item1 0 8 INT'
@@ -71,7 +71,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should format integers" do
+      it "formats integers" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  ITEM item1 0 8 INT'
@@ -83,13 +83,13 @@ module Cosmos
         tf.close
         @pc.process_file(tf.path, "TGT1")
         @pc.telemetry["TGT1"]["PKT1"].buffer = "\x0a\x0b\x0c"
-        @pc.telemetry["TGT1"]["PKT1"].read("ITEM1",:FORMATTED).should eql "d10"
-        @pc.telemetry["TGT1"]["PKT1"].read("ITEM2",:FORMATTED).should eql "u10"
-        @pc.telemetry["TGT1"]["PKT1"].read("ITEM3",:FORMATTED).should eql "0xa"
+        expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM1",:FORMATTED)).to eql "d10"
+        expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM2",:FORMATTED)).to eql "u10"
+        expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM3",:FORMATTED)).to eql "0xa"
         tf.unlink
       end
 
-      it "should format floats" do
+      it "formats floats" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  ITEM item1 0 32 FLOAT'
@@ -97,11 +97,11 @@ module Cosmos
         tf.close
         @pc.process_file(tf.path, "TGT1")
         @pc.telemetry["TGT1"]["PKT1"].write("ITEM1",12345.12345)
-        @pc.telemetry["TGT1"]["PKT1"].read("ITEM1",:FORMATTED).should eql "12345.123"
+        expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM1",:FORMATTED)).to eql "12345.123"
         tf.unlink
       end
 
-      it "should format strings and blocks" do
+      it "formats strings and blocks" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  ITEM item1 0 32 STRING'
@@ -111,9 +111,9 @@ module Cosmos
         tf.close
         @pc.process_file(tf.path, "TGT1")
         @pc.telemetry["TGT1"]["PKT1"].write("ITEM1","HI")
-        @pc.telemetry["TGT1"]["PKT1"].read("ITEM1",:FORMATTED).should eql "String: HI"
+        expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM1",:FORMATTED)).to eql "String: HI"
         @pc.telemetry["TGT1"]["PKT1"].write("ITEM2","\x00\x01\x02\x03")
-        @pc.telemetry["TGT1"]["PKT1"].read("ITEM2",:FORMATTED).should eql "Block: \x00\x01\x02\x03"
+        expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM2",:FORMATTED)).to eql "Block: \x00\x01\x02\x03"
         tf.unlink
       end
     end

data/spec/packets/parsers/limits_parser_spec.rb

@@ -227,7 +227,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should take 4 limits values" do
+      it "takes 4 limits values" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
@@ -235,16 +235,16 @@ module Cosmos
         tf.close
         @pc.process_file(tf.path, "TGT1")
         item = @pc.telemetry["TGT1"]["PKT1"].items["ITEM1"]
-        item.limits.values[:DEFAULT].should_not be_nil
+        expect(item.limits.values[:DEFAULT]).not_to be_nil
         @pc.telemetry["TGT1"]["PKT1"].buffer = "\x04"
         @pc.telemetry["TGT1"]["PKT1"].enable_limits("ITEM1")
         @pc.telemetry["TGT1"]["PKT1"].check_limits
-        item.limits.state.should eql :GREEN
-        @pc.telemetry["TGT1"]["PKT1"].limits_items.should eql [item]
+        expect(item.limits.state).to eql :GREEN
+        expect(@pc.telemetry["TGT1"]["PKT1"].limits_items).to eql [item]
         tf.unlink
       end
 
-      it "should take 6 limits values" do
+      it "takes 6 limits values" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
@@ -252,12 +252,12 @@ module Cosmos
         tf.close
         @pc.process_file(tf.path, "TGT1")
         item = @pc.telemetry["TGT1"]["PKT1"].items["ITEM1"]
-        item.limits.values[:DEFAULT].should_not be_nil
+        expect(item.limits.values[:DEFAULT]).not_to be_nil
         @pc.telemetry["TGT1"]["PKT1"].buffer = "\x04"
         @pc.telemetry["TGT1"]["PKT1"].enable_limits("ITEM1")
         @pc.telemetry["TGT1"]["PKT1"].check_limits
-        item.limits.state.should eql :BLUE
-        @pc.telemetry["TGT1"]["PKT1"].limits_items.should eql [item]
+        expect(item.limits.state).to eql :BLUE
+        expect(@pc.telemetry["TGT1"]["PKT1"].limits_items).to eql [item]
         tf.unlink
       end
 

data/spec/packets/parsers/limits_response_parser_spec.rb

@@ -23,7 +23,7 @@ module Cosmos
         @pc = PacketConfig.new
       end
 
-      it "should complain if a current item is not defined" do
+      it "complains if a current item is not defined" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  LIMITS_RESPONSE'
@@ -32,7 +32,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain if there are not enough parameters" do
+      it "complains if there are not enough parameters" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts 'ITEM myitem 0 8 UINT "Test Item"'
@@ -42,7 +42,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain if applied to a command PARAMETER" do
+      it "complains if applied to a command PARAMETER" do
         tf = Tempfile.new('unittest')
         tf.puts 'COMMAND tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  APPEND_PARAMETER item1 16 UINT 0 0 0 "Item"'
@@ -52,7 +52,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain about missing response file" do
+      it "complains about missing response file" do
         filename = File.join(File.dirname(__FILE__), "../../test_only.rb")
         File.delete(filename) if File.exist?(filename)
         @pc = PacketConfig.new
@@ -67,7 +67,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain about a non Cosmos::LimitsResponse class" do
+      it "complains about a non Cosmos::LimitsResponse class" do
         filename = File.join(File.dirname(__FILE__), "../../limits_response1.rb")
         File.open(filename, 'w') do |file|
           file.puts "class LimitsResponse1"
@@ -88,7 +88,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should set the response" do
+      it "sets the response" do
         filename = File.join(File.dirname(__FILE__), "../../limits_response2.rb")
         File.open(filename, 'w') do |file|
           file.puts "require 'cosmos/packets/limits_response'"
@@ -108,13 +108,13 @@ module Cosmos
         tf.close
         @pc.process_file(tf.path, "TGT1")
         pkt = @pc.telemetry["TGT1"]["PKT1"]
-        pkt.get_item("ITEM1").limits.response.class.should eql LimitsResponse2
+        expect(pkt.get_item("ITEM1").limits.response.class).to eql LimitsResponse2
 
         File.delete(filename) if File.exist?(filename)
         tf.unlink
       end
 
-      it "should call the response with parameters" do
+      it "calls the response with parameters" do
         filename = File.join(File.dirname(__FILE__), "../../limits_response2.rb")
         File.open(filename, 'w') do |file|
           file.puts "require 'cosmos/packets/limits_response'"
@@ -137,7 +137,7 @@ module Cosmos
         tf.close
         capture_io do |stdout|
           @pc.process_file(tf.path, "TGT1")
-          stdout.string.should eql "initialize: 2\n"
+          expect(stdout.string).to eql "initialize: 2\n"
         end
 
         File.delete(filename) if File.exist?(filename)

data/spec/packets/parsers/macro_parser_spec.rb

@@ -107,6 +107,29 @@ module Cosmos
     end
 
     describe "add_item" do
+      it "adds multiple items to the packet" do
+        tf = Tempfile.new('unittest')
+        tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
+        tf.puts 'MACRO_APPEND_START 1 2'
+        tf.puts 'APPEND_ITEM WORD 16 UINT'
+        tf.puts 'APPEND_ITEM DOUBLE_WORD 32 UINT'
+        tf.puts 'MACRO_APPEND_END'
+        tf.close
+        @pc.process_file(tf.path, "TGT1")
+        pkt = @pc.telemetry["TGT1"]["PKT1"]
+        expect(pkt.items.length).to eql 7 # 4 plus the RECEIVED_XXX items
+        expect(pkt.items.keys).to include('WORD1','WORD2','DOUBLE_WORD1','DOUBLE_WORD2')
+        expect(pkt.sorted_items[3].name).to eql 'WORD1'
+        expect(pkt.sorted_items[3].bit_offset).to eql 0
+        expect(pkt.sorted_items[4].name).to eql 'DOUBLE_WORD1'
+        expect(pkt.sorted_items[4].bit_offset).to eql 16
+        expect(pkt.sorted_items[5].name).to eql 'WORD2'
+        expect(pkt.sorted_items[5].bit_offset).to eql 48
+        expect(pkt.sorted_items[6].name).to eql 'DOUBLE_WORD2'
+        expect(pkt.sorted_items[6].bit_offset).to eql 64
+        tf.unlink
+      end
+
       it "adds items with states to the packet" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
@@ -119,17 +142,22 @@ module Cosmos
         @pc.process_file(tf.path, "TGT1")
         pkt = @pc.telemetry["TGT1"]["PKT1"]
         expect(pkt.items.length).to eql 8 # 5 plus the RECEIVED_XXX items
-        pkt.items.keys.should include('BIT1','BIT2','BIT3','BIT4','BIT5')
+        expect(pkt.items.keys).to include('BIT1','BIT2','BIT3','BIT4','BIT5')
         expect(pkt.sorted_items[3].name).to eql 'BIT1'
+        expect(pkt.sorted_items[3].bit_offset).to eql 0
         expect(pkt.sorted_items[4].name).to eql 'BIT2'
+        expect(pkt.sorted_items[4].bit_offset).to eql 16
         expect(pkt.sorted_items[5].name).to eql 'BIT3'
+        expect(pkt.sorted_items[5].bit_offset).to eql 32
         expect(pkt.sorted_items[6].name).to eql 'BIT4'
+        expect(pkt.sorted_items[6].bit_offset).to eql 48
         expect(pkt.sorted_items[7].name).to eql 'BIT5'
+        expect(pkt.sorted_items[7].bit_offset).to eql 64
         limits_items = []
         pkt.items.each do |name, item|
           limits_items << item if name.include?('BIT')
         end
-        pkt.limits_items.should eql limits_items
+        expect(pkt.limits_items).to eql limits_items
         tf.unlink
       end
 
@@ -159,8 +187,8 @@ module Cosmos
         @pc.process_file(tf.path, "TGT1")
         pkt = @pc.telemetry["TGT1"]["PKT1"]
         expect(pkt.items.length).to eql 8 # 5 plus the RECEIVED_XXX items
-        pkt.items.keys.should include('BIT1','BIT2','BIT3','BIT4','BIT5')
-        pkt.limits_items.should be_empty
+        expect(pkt.items.keys).to include('BIT1','BIT2','BIT3','BIT4','BIT5')
+        expect(pkt.limits_items).to be_empty
         tf.unlink
       end
 
@@ -174,8 +202,8 @@ module Cosmos
         @pc.process_file(tf.path, "TGT1")
         pkt = @pc.telemetry["TGT1"]["PKT1"]
         expect(pkt.items.length).to eql 8 # 5 plus the RECEIVED_XXX items
-        pkt.items.keys.should include('08_BIT','09_BIT','10_BIT','11_BIT','12_BIT')
-        pkt.limits_items.should be_empty
+        expect(pkt.items.keys).to include('08_BIT','09_BIT','10_BIT','11_BIT','12_BIT')
+        expect(pkt.limits_items).to be_empty
         tf.unlink
       end
 

data/spec/packets/parsers/packet_parser_spec.rb

@@ -61,10 +61,10 @@ module Cosmos
           @pc.process_file(tf.path, "TGT1")
           pkt = @pc.commands["TGT1"]["PKT1"] if keyword == 'COMMAND'
           pkt = @pc.telemetry["TGT1"]["PKT1"] if keyword == 'TELEMETRY'
-          pkt.target_name.should eql "TGT1"
-          pkt.packet_name.should eql "PKT1"
-          pkt.default_endianness.should eql :LITTLE_ENDIAN
-          pkt.description.should eql "Packet"
+          expect(pkt.target_name).to eql "TGT1"
+          expect(pkt.packet_name).to eql "PKT1"
+          expect(pkt.default_endianness).to eql :LITTLE_ENDIAN
+          expect(pkt.description).to eql "Packet"
           tf.unlink
         end
       end
@@ -77,7 +77,7 @@ module Cosmos
           @pc.process_file(tf.path, "NEW")
           pkt = @pc.commands["NEW"]["PKT1"] if keyword == 'COMMAND'
           pkt = @pc.telemetry["NEW"]["PKT1"] if keyword == 'TELEMETRY'
-          pkt.target_name.should eql "NEW"
+          expect(pkt.target_name).to eql "NEW"
           tf.unlink
         end
       end
@@ -89,7 +89,7 @@ module Cosmos
           tf.puts keyword + ' tgt1 pkt1 LITTLE_ENDIAN "Packet 2"'
           tf.close
           @pc.process_file(tf.path, "SYSTEM")
-          @pc.warnings.should include("#{keyword.capitalize} Packet TGT1 PKT1 redefined.")
+          expect(@pc.warnings).to include("#{keyword.capitalize} Packet TGT1 PKT1 redefined.")
           tf.unlink
         end
       end

data/spec/packets/parsers/processor_parser_spec.rb

@@ -23,7 +23,7 @@ module Cosmos
         @pc = PacketConfig.new
       end
 
-      it "should complain if a current packet is not defined" do
+      it "complains if a current packet is not defined" do
         # Check for missing TELEMETRY line
         tf = Tempfile.new('unittest')
         tf.puts('PROCESSOR')
@@ -32,7 +32,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain if there are not enough parameters" do
+      it "complains if there are not enough parameters" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  PROCESSOR'
@@ -41,7 +41,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain about missing processor file" do
+      it "complains about missing processor file" do
         filename = File.join(File.dirname(__FILE__), "../../test_only.rb")
         File.delete(filename) if File.exist?(filename)
         @pc = PacketConfig.new
@@ -54,7 +54,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain about a non Cosmos::Processor class" do
+      it "complains about a non Cosmos::Processor class" do
         filename = File.join(File.dirname(__FILE__), "../../processor1.rb")
         File.open(filename, 'w') do |file|
           file.puts "class Processor1"
@@ -73,7 +73,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should parse the processor" do
+      it "parses the processor" do
         filename = File.join(File.dirname(__FILE__), "../../processor2.rb")
         File.open(filename, 'w') do |file|
           file.puts "require 'cosmos/processors/processor'"
@@ -94,13 +94,13 @@ module Cosmos
         tf.close
         @pc.process_file(tf.path, "TGT1")
         @pc.telemetry["TGT1"]["PKT1"].buffer = "\x01\x01"
-        @pc.telemetry["TGT1"]["PKT1"].read("ITEM1").should eql 5
+        expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM1")).to eql 5
         tf.unlink
 
         File.delete(filename) if File.exist?(filename)
       end
 
-      it "should complain if applied to a command packet" do
+      it "complains if applied to a command packet" do
         tf = Tempfile.new('unittest')
         tf.puts 'COMMAND tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  PROCESSOR P1 processor1.rb'

data/spec/packets/parsers/state_parser_spec.rb

@@ -23,7 +23,7 @@ module Cosmos
         @pc = PacketConfig.new
       end
 
-      it "should complain if a current item is not defined" do
+      it "complains if a current item is not defined" do
         # Check for missing ITEM definitions
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
@@ -33,7 +33,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain if there are not enough parameters" do
+      it "complains if there are not enough parameters" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts 'ITEM myitem 0 8 UINT "Test Item"'
@@ -43,7 +43,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should complain if there are too many parameters" do
+      it "complains if there are too many parameters" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts 'ITEM myitem 0 8 UINT "Test Item"'
@@ -53,7 +53,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "should support STRING items" do
+      it "supports STRING items" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
         tf.puts '  APPEND_ITEM item1 128 STRING "state item"'
@@ -62,13 +62,13 @@ module Cosmos
         tf.close
         @pc.process_file(tf.path, "TGT1")
         @pc.telemetry["TGT1"]["PKT1"].write("ITEM1", "TRUE STRING")
-        @pc.telemetry["TGT1"]["PKT1"].read("ITEM1").should eql "TRUE"
+        expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM1")).to eql "TRUE"
         @pc.telemetry["TGT1"]["PKT1"].write("ITEM1", "FALSE STRING")
-        @pc.telemetry["TGT1"]["PKT1"].read("ITEM1").should eql "FALSE"
+        expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM1")).to eql "FALSE"
         tf.unlink
       end
 
-      it "should warn about duplicate states and replace the duplicate" do
+      it "warns about duplicate states and replace the duplicate" do
         tf = Tempfile.new('unittest')
         tf.puts 'COMMAND tgt1 pkt1 LITTLE_ENDIAN "Description"'
         tf.puts '  APPEND_PARAMETER item1 8 UINT 0 2 0 "state item"'
@@ -77,16 +77,16 @@ module Cosmos
         tf.puts '    STATE FALSE 2'
         tf.close
         @pc.process_file(tf.path, "TGT1")
-        @pc.warnings.should include("Duplicate state defined on line 5: STATE FALSE 2")
+        expect(@pc.warnings).to include("Duplicate state defined on line 5: STATE FALSE 2")
         @pc.commands["TGT1"]["PKT1"].buffer = "\x00"
-        @pc.commands["TGT1"]["PKT1"].read("ITEM1").should eql 0
+        expect(@pc.commands["TGT1"]["PKT1"].read("ITEM1")).to eql 0
         @pc.commands["TGT1"]["PKT1"].buffer = "\x02"
-        @pc.commands["TGT1"]["PKT1"].read("ITEM1").should eql "FALSE"
+        expect(@pc.commands["TGT1"]["PKT1"].read("ITEM1")).to eql "FALSE"
         tf.unlink
       end
 
       context "with telemetry" do
-        it "should only allow GREEN YELLOW or RED" do
+        it "only allows GREEN YELLOW or RED" do
           tf = Tempfile.new('unittest')
           tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
           tf.puts '  APPEND_ITEM item1 8 UINT "state item"'
@@ -96,7 +96,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should record the state values and colors" do
+        it "records the state values and colors" do
           tf = Tempfile.new('unittest')
           tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
           tf.puts '  APPEND_ITEM item1 8 UINT "state item"'
@@ -109,19 +109,19 @@ module Cosmos
           index = 1
           colors = [:RED, :YELLOW, :GREEN]
           @pc.telemetry["TGT1"]["PKT1"].items["ITEM1"].states.each do |name,val|
-            name.should eql "STATE#{index}"
-            val.should eql index
-            @pc.telemetry["TGT1"]["PKT1"].items["ITEM1"].state_colors[name].should eql colors[index - 1]
+            expect(name).to eql "STATE#{index}"
+            expect(val).to eql index
+            expect(@pc.telemetry["TGT1"]["PKT1"].items["ITEM1"].state_colors[name]).to eql colors[index - 1]
 
             index += 1
           end
-          @pc.telemetry["TGT1"]["PKT1"].limits_items.should eql [@pc.telemetry["TGT1"]["PKT1"].items["ITEM1"]]
+          expect(@pc.telemetry["TGT1"]["PKT1"].limits_items).to eql [@pc.telemetry["TGT1"]["PKT1"].items["ITEM1"]]
           tf.unlink
         end
       end
 
       context "with command" do
-        it "should only allow HAZARDOUS as the third param" do
+        it "only allows HAZARDOUS as the third param" do
           tf = Tempfile.new('unittest')
           tf.puts 'COMMAND tgt1 pkt1 LITTLE_ENDIAN "Description"'
           tf.puts '  APPEND_PARAMETER item1 8 UINT 0 0 0'
@@ -131,7 +131,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should take HAZARDOUS and an optional description" do
+        it "takes HAZARDOUS and an optional description" do
           tf = Tempfile.new('unittest')
           tf.puts 'COMMAND tgt1 pkt1 LITTLE_ENDIAN "Description"'
           tf.puts '  APPEND_PARAMETER item1 8 UINT 1 3 1'
@@ -142,11 +142,11 @@ module Cosmos
           @pc.process_file(tf.path, "TGT1")
           @pc.commands["TGT1"]["PKT1"].buffer = "\x01"
           @pc.commands["TGT1"]["PKT1"].check_limits
-          @pc.commands["TGT1"]["PKT1"].items["ITEM1"].hazardous["GOOD"].should be_nil
-          @pc.commands["TGT1"]["PKT1"].items["ITEM1"].hazardous["BAD"].should_not be_nil
-          @pc.commands["TGT1"]["PKT1"].items["ITEM1"].hazardous["WORST"].should_not be_nil
-          @pc.commands["TGT1"]["PKT1"].items["ITEM1"].hazardous["WORST"].should eql "Hazardous description"
-          @pc.commands["TGT1"]["PKT1"].limits_items.should be_empty
+          expect(@pc.commands["TGT1"]["PKT1"].items["ITEM1"].hazardous["GOOD"]).to be_nil
+          expect(@pc.commands["TGT1"]["PKT1"].items["ITEM1"].hazardous["BAD"]).not_to be_nil
+          expect(@pc.commands["TGT1"]["PKT1"].items["ITEM1"].hazardous["WORST"]).not_to be_nil
+          expect(@pc.commands["TGT1"]["PKT1"].items["ITEM1"].hazardous["WORST"]).to eql "Hazardous description"
+          expect(@pc.commands["TGT1"]["PKT1"].limits_items).to be_empty
           tf.unlink
         end
       end