rsmp-validator 0.1.1 → 0.3.2

data/test/site/tlc/signal_plans_spec.rb

@@ -8,13 +8,13 @@ describe 'Site::Tlc::SignalPlans' do
   # 3. We should receive a status response before timeout
   it 'currently active is read with S0014' do
     with_site(:connected, sxl: '>=1.0.7') do |site_proxy|
-      status_list = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1')
+      status_list = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1.0')
                       { S0014: %i[status source] }
                     else
                       { S0014: [:status] }
                     end
       site_proxy.request_status_and_collect(status_list,
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -34,34 +34,33 @@ describe 'Site::Tlc::SignalPlans' do
       plans.each do |plan|
         command_timeout = RSMP::Validator.get_config('timeouts', 'command')
         status_timeout = RSMP::Validator.get_config('timeouts', 'status_response')
-        site_proxy.tlc.set_timeplan(plan, within: command_timeout)
+        site_proxy.tlc.set_timeplan!(plan, within: command_timeout)
 
-        s0014_fields = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1')
+        s0014_fields = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1.0')
                          { S0014: %i[status source] }
                        else
                          { S0014: [:status] }
                        end
-        collector = site_proxy.request_status_and_collect(
+        exchange = site_proxy.request_status_and_collect(
           s0014_fields,
           within: status_timeout
-        )
-        collector.ok!
-        ss = collector.messages.last.attributes['sS']
+        ).value!
+        ss = exchange.messages.last.attributes['sS']
         expect(ss.find { |i| i['n'] == 'status' }&.fetch('s').to_i).to eq(plan)
       end
     end
   end
 
   # Verify status S0018 number of time plans
-  # Deprecated from 1.2, use S0022 instead.
+  # Deprecated from 1.2.0, use S0022 instead.
   #
   # 1. Given the site_proxy is connected
   # 2. When we request the status
   # 3. We should receive a status response before timeout
   it 'list size is read with S0018' do
-    with_site(:connected, sxl: ['>=1.0.7', '<1.2']) do |site_proxy|
+    with_site(:connected, sxl: ['>=1.0.7', '<1.2.0']) do |site_proxy|
       site_proxy.request_status_and_collect({ S0018: [:number] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -73,7 +72,7 @@ describe 'Site::Tlc::SignalPlans' do
   it 'list is read with S0022' do
     with_site(:connected, sxl: '>=1.0.13') do |site_proxy|
       site_proxy.request_status_and_collect({ S0022: [:status] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -85,7 +84,7 @@ describe 'Site::Tlc::SignalPlans' do
   it 'week table is read with S0026' do
     with_site(:connected, sxl: '>=1.0.13') do |site_proxy|
       site_proxy.request_status_and_collect({ S0026: [:status] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -98,7 +97,7 @@ describe 'Site::Tlc::SignalPlans' do
     with_site(:connected, sxl: '>=1.0.13') do |site_proxy|
       status = '0-1,6-2'
       timeout = RSMP::Validator.get_config('timeouts', 'command_response')
-      site_proxy.tlc.set_week_table(status, within: timeout)
+      site_proxy.tlc.set_week_table!(status, within: timeout)
     end
   end
 
@@ -110,7 +109,7 @@ describe 'Site::Tlc::SignalPlans' do
   it 'day table is read with S0027' do
     with_site(:connected, sxl: '>=1.0.13') do |site_proxy|
       site_proxy.request_status_and_collect({ S0027: [:status] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -123,7 +122,7 @@ describe 'Site::Tlc::SignalPlans' do
     with_site(:connected, sxl: '>=1.0.13') do |site_proxy|
       status = '12-1-12-59,1-0-23-12'
       timeout = RSMP::Validator.get_config('timeouts', 'command_response')
-      site_proxy.tlc.set_day_table(status, within: timeout)
+      site_proxy.tlc.set_day_table!(status, within: timeout)
     end
   end
 
@@ -135,7 +134,7 @@ describe 'Site::Tlc::SignalPlans' do
   it 'version is read with S0097' do
     with_site(:connected, sxl: '>=1.0.15') do |site_proxy|
       site_proxy.request_status_and_collect({ S0097: %i[timestamp checksum] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -148,12 +147,11 @@ describe 'Site::Tlc::SignalPlans' do
   it 'config is read with S0098' do
     with_site(:connected, sxl: '>=1.0.15') do |site_proxy|
       timeout = RSMP::Validator.get_config('timeouts', 'status_response')
-      collector = site_proxy.request_status_and_collect(
+      exchange = site_proxy.request_status_and_collect(
         { S0098: %i[timestamp config version] },
         within: timeout
-      )
-      collector.ok!
-      ss = collector.messages.last.attributes['sS']
+      ).value!
+      ss = exchange.messages.last.attributes['sS']
       values = ss.to_h { |i| [i['n'], i['s']] }
 
       assert(!values['timestamp'].empty?, 'expected timestamp to not be empty')
@@ -170,7 +168,7 @@ describe 'Site::Tlc::SignalPlans' do
   it 'dynamic bands are read with S0023' do
     with_site(:connected, sxl: '>=1.0.13') do |site_proxy|
       site_proxy.request_status_and_collect({ S0023: [:status] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -184,7 +182,7 @@ describe 'Site::Tlc::SignalPlans' do
       plan = RSMP::Validator.get_config('items', 'plans').first
       status = '1-12'
       timeout = RSMP::Validator.get_config('timeouts', 'command_response')
-      site_proxy.tlc.set_dynamic_bands(plan: plan, status: status, within: timeout)
+      site_proxy.tlc.set_dynamic_bands!(plan: plan, status: status, within: timeout)
     end
   end
 
@@ -202,17 +200,17 @@ describe 'Site::Tlc::SignalPlans' do
       plan = RSMP::Validator.get_config('items', 'plans').first
       band = 3
 
-      value = site_proxy.tlc.read_dynamic_band(plan: plan, band: band) || 0
+      value = site_proxy.tlc.read_dynamic_band!(plan: plan, band: band) || 0
       expect(value).to be_a(Integer)
 
       new_value = value + 1
 
       timeout = RSMP::Validator.get_config('timeouts', 'command_response')
-      site_proxy.tlc.set_dynamic_bands(plan: plan, status: "#{band}-#{new_value}", within: timeout)
-      expect(site_proxy.tlc.read_dynamic_band(plan: plan, band: band)).to eq(new_value)
+      site_proxy.tlc.set_dynamic_bands!(plan: plan, status: "#{band}-#{new_value}", within: timeout)
+      expect(site_proxy.tlc.read_dynamic_band!(plan: plan, band: band)).to eq(new_value)
 
-      site_proxy.tlc.set_dynamic_bands(plan: plan, status: "#{band}-#{value}", within: timeout)
-      expect(site_proxy.tlc.read_dynamic_band(plan: plan, band: band)).to eq(value)
+      site_proxy.tlc.set_dynamic_bands!(plan: plan, status: "#{band}-#{value}", within: timeout)
+      expect(site_proxy.tlc.read_dynamic_band!(plan: plan, band: band)).to eq(value)
     end
   end
 
@@ -224,12 +222,12 @@ describe 'Site::Tlc::SignalPlans' do
   # 2. When we send command to disable timeout
   # 3. Then we should get a confirmation
   it 'timeout for dynamic bands is set with M0023' do
-    with_site(:connected, sxl: '>=1.1') do |site_proxy|
+    with_site(:connected, sxl: '>=1.1.0') do |site_proxy|
       timeout = RSMP::Validator.get_config('timeouts', 'command_response')
       status = 10
-      site_proxy.tlc.set_dynamic_bands_timeout(status, within: timeout)
+      site_proxy.tlc.set_dynamic_bands_timeout!(status, within: timeout)
       status = 0
-      site_proxy.tlc.set_dynamic_bands_timeout(status, within: timeout)
+      site_proxy.tlc.set_dynamic_bands_timeout!(status, within: timeout)
     end
   end
 
@@ -241,7 +239,7 @@ describe 'Site::Tlc::SignalPlans' do
   it 'offset is read with S0024' do
     with_site(:connected, sxl: '>=1.0.13') do |site_proxy|
       site_proxy.request_status_and_collect({ S0024: [:status] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -253,7 +251,7 @@ describe 'Site::Tlc::SignalPlans' do
       plan = RSMP::Validator.get_config('items', 'plans').first
       offset = 99
       timeout = RSMP::Validator.get_config('timeouts', 'command_response')
-      site_proxy.tlc.set_offset(plan: plan, offset: offset, within: timeout)
+      site_proxy.tlc.set_offset!(plan: plan, offset: offset, within: timeout)
     end
   end
 
@@ -265,7 +263,7 @@ describe 'Site::Tlc::SignalPlans' do
   it 'cycle time is read with S0028' do
     with_site(:connected, sxl: '>=1.0.13') do |site_proxy|
       site_proxy.request_status_and_collect({ S0028: [:status] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 

data/test/site/tlc/signal_priority_spec.rb

@@ -1,7 +1,7 @@
 describe 'Site::Tlc::SignalPriority' do
   include RSMP::Validator::Helpers::Status
 
-  # Signal requests require core >= 3.2 because they uses the Array data type.
+  # Signal requests require core >= 3.2.0 because they use the Array data type.
 
   # Validate that a signal priority can be requested.
   #
@@ -9,7 +9,7 @@ describe 'Site::Tlc::SignalPriority' do
   # 2. When we send a signal priority request
   # 3. Then we should receive an acknowledgement
   it 'can be requested with M0022' do
-    with_site(:connected, core: '>=3.2', sxl: '>=1.1') do |site_proxy|
+    with_site(:connected, core: '>=3.2.0', sxl: '>=1.1.0') do |site_proxy|
       signal_group = RSMP::Validator.get_config('components', 'signal_group').keys.first
       command_list = RSMP::CommandList.new(:M0022, :requestPriority,
                                            requestId: SecureRandom.uuid[0..3],
@@ -20,7 +20,7 @@ describe 'Site::Tlc::SignalPriority' do
                                            vehicleType: 'car').to_a
       log "Request signal priority for signal group #{signal_group}"
       timeout = RSMP::Validator.get_config('timeouts', 'command_response')
-      site_proxy.send_command_and_collect(command_list, within: timeout).ok!
+      site_proxy.send_command_and_collect(command_list, within: timeout).value!
     end
   end
 
@@ -30,9 +30,9 @@ describe 'Site::Tlc::SignalPriority' do
   # 2. When we request signal priority status
   # 3. Then we should receive a status update
   it 'status can be fetched with S0033' do
-    with_site(:connected, core: '>=3.2', sxl: '>=1.1') do |site_proxy|
+    with_site(:connected, core: '>=3.2.0', sxl: '>=1.1.0') do |site_proxy|
       site_proxy.request_status_and_collect({ S0033: [:status] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -43,7 +43,7 @@ describe 'Site::Tlc::SignalPriority' do
   # 4. Then we should receive an acknowledgement
   # 5. And we should reive a status updates
   it 'status can be subscribed to with S0033' do
-    with_site(:connected, core: '>=3.2', sxl: '>=1.1') do |site_proxy|
+    with_site(:connected, core: '>=3.2.0', sxl: '>=1.1.0') do |site_proxy|
       status_list = [{ 'sCI' => 'S0033', 'n' => 'status', 'uRt' => '0' }]
       status_list.map! { |item| item.merge!('sOc' => true) } if site_proxy.tlc.use_soc?
       wait_for_status(site_proxy, 'signal priority status', status_list)
@@ -61,7 +61,7 @@ describe 'Site::Tlc::SignalPriority' do
   # 7. Then the state should become 'completed'
 
   it 'becomes completed when cancelled' do
-    with_site(:connected, core: '>=3.2', sxl: '>=1.1') do |site_proxy|
+    with_site(:connected, core: '>=3.2.0', sxl: '>=1.1.0') do |site_proxy|
       timeout = RSMP::Validator.get_config('timeouts', 'priority_completion')
       component = RSMP::Validator.get_config('main_component')
       signal_group_id = RSMP::Validator.get_config('components', 'signal_group').keys.first
@@ -69,8 +69,7 @@ describe 'Site::Tlc::SignalPriority' do
         site_proxy,
         component: component,
         signal_group_id: signal_group_id,
-        timeout: timeout,
-        task: Async::Task.current
+        timeout: timeout
       )
 
       prio.run do
@@ -107,7 +106,7 @@ describe 'Site::Tlc::SignalPriority' do
   # 7. Then the state should become 'stale'
 
   it 'becomes stale if not cancelled' do
-    with_site(:connected, core: '>=3.2', sxl: '>=1.1') do |site_proxy|
+    with_site(:connected, core: '>=3.2.0', sxl: '>=1.1.0') do |site_proxy|
       timeout = RSMP::Validator.get_config('timeouts', 'priority_completion')
       component = RSMP::Validator.get_config('main_component')
       signal_group_id = RSMP::Validator.get_config('components', 'signal_group').keys.first
@@ -115,8 +114,7 @@ describe 'Site::Tlc::SignalPriority' do
         site_proxy,
         component: component,
         signal_group_id: signal_group_id,
-        timeout: timeout,
-        task: Async::Task.current
+        timeout: timeout
       )
 
       prio.run do

data/test/site/tlc/subscribe_spec.rb

@@ -19,10 +19,10 @@ describe 'Site::Tlc::Subscribe' do
 
       site_proxy.subscribe_to_status_and_collect(status_list,
                                                  component: component,
-                                                 within: RSMP::Validator.get_config('timeouts', 'status_update')).ok!
+                                                 within: RSMP::Validator.get_config('timeouts', 'status_update')).value!
     ensure
       unsubscribe_list = status_list.map { |item| item.slice('sCI', 'n') }
-      site_proxy.unsubscribe_to_status unsubscribe_list, component: component
+      site_proxy.unsubscribe_to_status! unsubscribe_list, component: component
     end
   end
 
@@ -45,7 +45,7 @@ describe 'Site::Tlc::Subscribe' do
       initial_status_list.map! { |item| item.merge!('sOc' => true) } if site_proxy.tlc.use_soc?
 
       # Subscribe but don't wait for updates (since 60s is too long)
-      site_proxy.subscribe_to_status initial_status_list, component: component
+      site_proxy.subscribe_to_status! initial_status_list, component: component
       log 'Initial subscription with 60s update rate successful'
 
       # Step 3: Change update rate to 1s by re-subscribing and verify we get update within 2s
@@ -54,18 +54,18 @@ describe 'Site::Tlc::Subscribe' do
       updated_status_list.map! { |item| item.merge!('sOc' => true) } if site_proxy.tlc.use_soc?
 
       # This should collect at least one status update within 2s if the 1s rate is working
-      collector = site_proxy.subscribe_to_status_and_collect(updated_status_list,
-                                                             component: component,
-                                                             within: 2).ok!
+      exchange = site_proxy.subscribe_to_status_and_collect(updated_status_list,
+                                                            component: component,
+                                                            within: 2).value!
 
-      assert(!collector.nil?, 'Expected subscribe_to_status_and_collect to return a collector')
-      assert(!collector.messages.empty?,
+      assert(!exchange.nil?, 'Expected subscribe_to_status_and_collect to return an exchange')
+      assert(!exchange.messages.empty?,
              'Expected to receive status update within 2s with new 1s update rate')
       log 'Successfully received status update within 2s, confirming 1s update rate is active'
     ensure
       # Clean up subscription
       unsubscribe_list = [{ 'sCI' => 'S0001', 'n' => 'cyclecounter' }]
-      site_proxy.unsubscribe_to_status unsubscribe_list, component: component
+      site_proxy.unsubscribe_to_status! unsubscribe_list, component: component
     end
   end
 end

data/test/site/tlc/system_spec.rb

@@ -8,13 +8,13 @@ describe 'Site::Tlc::System' do
   # 3. Expect status response before timeout
   it 'operator logged in/out of OP-panel is read with S0091' do
     with_site(:connected, sxl: '>=1.0.7') do |site_proxy|
-      status_list = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1')
+      status_list = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1.0')
                       { S0091: [:user] }
                     else
                       { S0091: %i[user status] }
                     end
       site_proxy.request_status_and_collect(status_list,
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -25,13 +25,13 @@ describe 'Site::Tlc::System' do
   # 3. Expect status response before timeout
   it 'operator logged in/out of web-interface is read with S0092' do
     with_site(:connected, sxl: '>=1.0.7') do |site_proxy|
-      status_list = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1')
+      status_list = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1.0')
                       { S0092: [:user] }
                     else
                       { S0092: %i[user status] }
                     end
       site_proxy.request_status_and_collect(status_list,
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -43,7 +43,7 @@ describe 'Site::Tlc::System' do
   it 'version is read with S0095' do
     with_site(:connected, sxl: '>=1.0.7') do |site_proxy|
       site_proxy.request_status_and_collect({ S0095: [:status] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -57,20 +57,22 @@ describe 'Site::Tlc::System' do
       code1 = RSMP::Validator.get_config('secrets', 'security_codes', 1)
       code2 = RSMP::Validator.get_config('secrets', 'security_codes', 2)
       timeout = RSMP::Validator.get_config('timeouts', 'command_response')
-      site_proxy.tlc.set_security_code(level: 'Level1', old_code: code1, new_code: code1, within: timeout)
-      site_proxy.tlc.set_security_code(level: 'Level2', old_code: code2, new_code: code2, within: timeout)
+      site_proxy.tlc.set_security_code!(level: 'Level1', old_code: code1, new_code: code1, within: timeout)
+      site_proxy.tlc.set_security_code!(level: 'Level2', old_code: code2, new_code: code2, within: timeout)
     end
   end
 
   # Verify that the site_proxy responds with NotAck if we send incorrect security cdoes.
-  # RThis hehaviour is defined in SXL >= 1.1. For earlier versions,
+  # This behaviour is defined in SXL >= 1.1.0. For earlier versions,
   # The behaviour is undefined.
   # 1. Given the site_proxy is connected
   # 2. When we send a M0008 command with incorrect security codes
   # 3. Then we should received a NotAck
   it 'security code is rejected when incorrect' do
-    with_site(:connected, sxl: '>=1.1') do |site_proxy|
-      expect { wrong_security_code(site_proxy) }.to raise_exception(RSMP::MessageRejected)
+    with_site(:connected, sxl: '>=1.1.0') do |site_proxy|
+      result = wrong_security_code(site_proxy)
+      expect(result).to be_a(RSMP::Result::Failure)
+      expect(result.failure.code).to eq(:message_rejected) if result.failure?
     end
   end
 end

data/test/site/tlc/traffic_data_spec.rb

@@ -13,7 +13,7 @@ describe 'Site::Tlc::TrafficData' do
         { S0201: %i[starttime vehicles] },
         component: component,
         within: RSMP::Validator.get_config('timeouts', 'status_response')
-      ).ok!
+      ).value!
     end
   end
 
@@ -25,7 +25,7 @@ describe 'Site::Tlc::TrafficData' do
   it 'number of vehicles for all detectors is read with S0205' do
     with_site(:connected, sxl: '>=1.0.14') do |site_proxy|
       site_proxy.request_status_and_collect({ S0205: %i[start vehicles] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -41,7 +41,7 @@ describe 'Site::Tlc::TrafficData' do
         { S0202: %i[starttime speed] },
         component: component,
         within: RSMP::Validator.get_config('timeouts', 'status_response')
-      ).ok!
+      ).value!
     end
   end
 
@@ -53,7 +53,7 @@ describe 'Site::Tlc::TrafficData' do
   it 'vehicle speed for all detectors is read with S0206' do
     with_site(:connected, sxl: '>=1.0.14') do |site_proxy|
       site_proxy.request_status_and_collect({ S0206: %i[start speed] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -69,7 +69,7 @@ describe 'Site::Tlc::TrafficData' do
         { S0203: %i[starttime occupancy] },
         component: component,
         within: RSMP::Validator.get_config('timeouts', 'status_response')
-      ).ok!
+      ).value!
     end
   end
 
@@ -80,19 +80,30 @@ describe 'Site::Tlc::TrafficData' do
   # 3. Expect status response before timeout
   it 'occupancy for all detectors is read with S0207' do
     with_site(:connected, sxl: '>=1.0.14') do |site_proxy|
-      result = wait_for_status(site_proxy, 'traffic counting: occupancy',
-                               { S0207: %i[start occupancy] },
-                               update_rate: 60)
+      exchange = wait_for_status(site_proxy, 'traffic counting: occupancy',
+                                 { S0207: %i[start occupancy] },
+                                 update_rate: 60)
+      values = exchange.reached.to_h { |item| [item['n'], item['s']] }
 
-      occupancies = result.matcher_got_hash.dig('S0207', 'occupancy')
-      start = result.matcher_got_hash.dig('S0207', 'start')
+      occupancies = values['occupancy']
+      start = values['start']
 
-      expect(occupancies).to be_a(String)
       expect(start).to be_a(String)
 
-      occupancies.split(',').each do |occupancy|
-        num = occupancy.to_i
-        assert((-1..100).cover?(num), "Occupancy must be in the range -1..100, got #{num}")
+      occupancy_values = if RSMP::Validator.sxl_matches?('<1.1.0')
+                           expect(occupancies).to be_a(String)
+                           occupancies.split(',').map do |occupancy|
+                             assert(occupancy.match?(/\A-?\d+\z/), "Occupancy must be an Integer, got #{occupancy}")
+                             occupancy.to_i
+                           end
+                         else
+                           expect(occupancies).to be_a(Array)
+                           occupancies
+                         end
+
+      occupancy_values.each do |occupancy|
+        assert(occupancy.is_a?(Integer), "Occupancy must be an Integer, got #{occupancy.class}")
+        assert((-1..100).cover?(occupancy), "Occupancy must be in the range -1..100, got #{occupancy}")
       end
     end
   end
@@ -120,7 +131,7 @@ describe 'Site::Tlc::TrafficData' do
         ] },
         component: component,
         within: RSMP::Validator.get_config('timeouts', 'status_response')
-      ).ok!
+      ).value!
     end
   end
 
@@ -145,7 +156,7 @@ describe 'Site::Tlc::TrafficData' do
           F
         ] },
         within: RSMP::Validator.get_config('timeouts', 'status_response')
-      ).ok!
+      ).value!
     end
   end
 end

data/test/site/tlc/traffic_situations_spec.rb

@@ -6,13 +6,13 @@ describe 'Site::Tlc::TrafficSituations' do
   # 3. Expect status response before timeout
   it 'is read with S0015' do
     with_site(:connected, sxl: '>=1.0.7') do |site_proxy|
-      status_list = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1')
+      status_list = if RSMP::Proxy.version_meets_requirement?(site_proxy.sxl_version, '>=1.1.0')
                       { S0015: %i[status source] }
                     else
                       { S0015: [:status] }
                     end
       site_proxy.request_status_and_collect(status_list,
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 
@@ -29,10 +29,10 @@ describe 'Site::Tlc::TrafficSituations' do
     timeout = RSMP::Validator.get_config('timeouts', 'command')
     with_site(:connected) do |site_proxy|
       situations.each do |traffic_situation|
-        assert site_proxy.tlc.set_traffic_situation(traffic_situation.to_s, within: timeout)
+        assert site_proxy.tlc.set_traffic_situation!(traffic_situation.to_s, within: timeout)
       end
     ensure
-      site_proxy.tlc.unset_traffic_situation(within: timeout)
+      site_proxy.tlc.unset_traffic_situation!(within: timeout)
     end
   end
 
@@ -44,7 +44,7 @@ describe 'Site::Tlc::TrafficSituations' do
   it 'list size is read with S0019' do
     with_site(:connected, sxl: '>=1.0.7') do |site_proxy|
       site_proxy.request_status_and_collect({ S0019: [:number] },
-                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).ok!
+                                            within: RSMP::Validator.get_config('timeouts', 'status_response')).value!
     end
   end
 end

data/test/supervisor/connect_spec.rb

@@ -10,9 +10,7 @@ describe 'Supervisor' do
     end
 
     def prepare_and_wait_for_collector(supervisor_proxy)
-      collector = supervisor_proxy.collector
-      collector.use_task Async::Task.current
-      collector.wait!
+      supervisor_proxy.collector.wait!
     end
 
     def direction_and_type_pairs(messages)
@@ -23,13 +21,12 @@ describe 'Supervisor' do
       timeout = RSMP::Validator.get_config('timeouts', 'ready')
       got_messages = nil
       with_supervisor(:isolated,
-                      'rsmp_versions' => [core_version],
+                      'core_version' => core_version,
                       'collect' => {
                         **connection_collect_options(timeout, length)
                       }) do |supervisor_proxy|
-        prepare_and_wait_for_collector(supervisor_proxy)
+        got_messages = prepare_and_wait_for_collector(supervisor_proxy)
         assert(supervisor_proxy.ready?, 'expected site proxy to be ready')
-        got_messages = supervisor_proxy.collector.messages
       end
       direction_and_type_pairs(got_messages)
     rescue Async::TimeoutError
@@ -108,7 +105,7 @@ describe 'Supervisor' do
       case version
       when '3.1.1', '3.1.2', '3.1.3'
         check_sequence_v311 version
-      when '3.1.4', '3.1.5', '3.2', '3.2.1', '3.2.2'
+      when '3.1.4', '3.1.5', '3.2.0', '3.2.1', '3.2.2'
         check_sequence_v314 version
       when '3.3.0'
         check_sequence_v330 version
@@ -172,15 +169,15 @@ describe 'Supervisor' do
       check_sequence '3.1.5'
     end
 
-    # Verify the connection sequence when using rsmp core 3.2
+    # Verify the connection sequence when using rsmp core 3.2.0
     #
-    # 1. Given the site is connected and using core 3.2
+    # 1. Given the site is connected and using core 3.2.0
     # 2. Send and receive handshake messages
     # 3. Expect the handshake messages to be in the specified sequence corresponding to version 3.1.5
     # 4. Expect the connection sequence to be complete
-    it 'exchanges correct connection sequence of rsmp version 3.2' do
-      skip 'requires core == 3.2' unless RSMP::Validator.core_matches?('3.2')
-      check_sequence '3.2'
+    it 'exchanges correct connection sequence of rsmp version 3.2.0' do
+      skip 'requires core == 3.2.0' unless RSMP::Validator.core_matches?('3.2.0')
+      check_sequence '3.2.0'
     end
 
     # Verify the connection sequence when using rsmp core 3.2.1