rsmp-validator 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf28fcdaff9ccf8df4f107cbe2f045e55316f81285c21520da2ef63a19f9f94f
-  data.tar.gz: 5c7614286acbcb9dce4abb36b66fb48a94493b072a7f88432b598e3249d0b6df
+  metadata.gz: ec84b58102563bba94566d083e07f4180e2522a977b5d8c94fe10bd397518c06
+  data.tar.gz: 511f803b289f6bdb2a8483174b50bccb2b7bc56e60f32c6209d48becc82c584f
 SHA512:
-  metadata.gz: 3e31a7dd63d4143b7804f04026d090a1936e3918a6bd2f060c6e6dd8ae81ad74600ac76cac553a17a89daad2bf769efeaf293f0c6f73d5ca049dbcc756f99e06
-  data.tar.gz: 4abbb6813ee551793997e18e680f131f15680f2a2a16361d524607baf9068807e4f7a663e5d136e2941b9dad8c9601a3ba995dcf80dcc778fef365702e34aa01
+  metadata.gz: ada00db87ffe79709e3fa3003037da04894a5aa39f3699e608aa1c33dea845726a37cc7c13923a9b7af8870af25c160a0ac2a946d6c89f0b3efed8360af28e87
+  data.tar.gz: 0f90a7420de0f29caefb21f83dba9657684536d597b58a4399e74d40f3e34e295b2ae65114a6f3a6e60aaf4b2e6607add3a7c133f97a2eef1f0c3401f9f488f4

data/lib/rsmp/validator/version.rb

@@ -1,5 +1,5 @@
 module RSMP
   module Validator
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.3.3'.freeze
   end
 end

data/test/site/tlc/subscribe_spec.rb

@@ -5,9 +5,10 @@ describe 'Site::Tlc::Subscribe' do
   # is arbitrary as we simply want to check that
   # the subscription mechanism works.
   #
-  # 1. subscribe
-  # 1. check that we receive a status update with a predefined time
-  # 1. unsubscribe
+  # 1. Given the site_proxy is connected
+  # 2. When we subscribe to S0001
+  # 3. Then we should receive a status update
+  # 4. Finally we unsubscribe from S0001
 
   it 'can be turned on and off for S0001' do
     with_site(:connected) do |site_proxy|
@@ -30,39 +31,41 @@ describe 'Site::Tlc::Subscribe' do
   # The test subscribes to S0001 'cyclecounter' attribute with an initial update rate of 60s,
   # then changes the update rate to 1s and verifies the new rate is in effect.
   #
-  # 1. Subscribe to S0001 'cyclecounter' with update rate 60s
-  # 2. Verify that subscription succeeds
-  # 3. Send the same subscription again with update rate 1s
-  # 4. Verify that the new update rate is in effect by checking next update is received within 2s
+  # 1. Given the site_proxy is connected
+  # 2. When we subscribe to S0001 'cyclecounter' with update rate 60s
+  # 3. And we change the update rate to 1s
+  # 4. Then we should receive two immediate updates and one periodic update within 2s
+  # 5. Finally we unsubscribe from S0001
 
   it 'can change interval during active subscription' do
     with_site(:connected) do |site_proxy|
       component = RSMP::Validator.get_config('main_component')
+      matcher = RSMP::StatusMatcher.new('sCI' => 'S0001', 'n' => 'cyclecounter')
 
-      # Step 1: Subscribe with 60s update rate (no need to wait for updates with long interval)
-      log 'Subscribe to S0001 cyclecounter with 60s update rate'
-      initial_status_list = [{ 'sCI' => 'S0001', 'n' => 'cyclecounter', 'uRt' => '60' }]
-      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
-      log 'Initial subscription with 60s update rate successful'
+      # start collecting matching status updates
+      collector = RSMP::Collector.new(
+        site_proxy,
+        filter: RSMP::Filter.new(type: 'StatusUpdate', component: component, ingoing: true, outgoing: false),
+        num: 3,
+        timeout: 2
+      )
+      collector.start do |message|
+        :keep if message.attributes.fetch('sS', []).any? { |item| matcher.match(item) }
+      end
 
-      # Step 3: Change update rate to 1s by re-subscribing and verify we get update within 2s
-      log 'Change update rate to 1s by re-subscribing and verify update within 2s'
-      updated_status_list = [{ 'sCI' => 'S0001', 'n' => 'cyclecounter', 'uRt' => '1' }]
-      updated_status_list.map! { |item| item.merge!('sOc' => true) } if site_proxy.tlc.use_soc?
+      log 'Subscribe to S0001 cyclecounter with 60s update rate'
+      status_list = [{ 'sCI' => 'S0001', 'n' => 'cyclecounter', 'uRt' => '60' }]
+      status_list.each { |item| item['sOc'] = false } if site_proxy.tlc.use_soc?
+      site_proxy.subscribe_to_status! status_list, component: component
 
-      # This should collect at least one status update within 2s if the 1s rate is working
-      exchange = site_proxy.subscribe_to_status_and_collect(updated_status_list,
-                                                            component: component,
-                                                            within: 2).value!
+      log 'Change update rate to 1s and wait for three updates within 2s'
+      status_list.first['uRt'] = '1'
+      site_proxy.subscribe_to_status! status_list, component: component
 
-      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'
+      expect(collector.wait.success?).to be == true
+      log 'Received three updates within 2s, confirming periodic updates at the new rate'
     ensure
+      collector&.stop
       # Clean up subscription
       unsubscribe_list = [{ 'sCI' => 'S0001', 'n' => 'cyclecounter' }]
       site_proxy.unsubscribe_to_status! unsubscribe_list, component: component

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp-validator
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - RSMP Nordic