rspec-openhab-scripting 0.0.7-java → 0.0.10-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76dfb6fa24e9d5efd4f0857cde57ae0c299f7ff5b6c16d08981fe04aa5ab3f52
-  data.tar.gz: b587bf33488da0f9a095eba35997ae4e615b6f8729ed11e1f8c514d1a195e7e1
+  metadata.gz: ec06e2cfb8832f84f5bd953e22904dbf99ec22a97e5ba0b900ee0e09a163a566
+  data.tar.gz: 959d078c55a2147e8b1899a8efabc6e8d8065fa9c869cda1c1d5ff057784de3c
 SHA512:
-  metadata.gz: 80961c7142353a5cd237414ed8a854a1ce33ef4fe0a32c758bf3a41921e6a3cf92e811fc635b9c72cc5e2d59cf1eb92710ad0a8cbb6cf6a357400180e8c4ba56
-  data.tar.gz: a3cef22e84c40c6f9780830873a0ac1c548e7076c81df9afe9d8fbe9e9bb30e9c316dc6352d329e1c7d95c0be470ebb319f2a7d2c3668c9b8462b24e7e45ebca
+  metadata.gz: d806b85fd33ce2c42b09f5442bd7dc752327a21c1aae8df5fa57b615dd4935a96c62274ffab8d5dcad9bc94fe034c3073d0af20221cd59e647e00568ae7acc64
+  data.tar.gz: a2565829aa4ddd62cdd1e3ac34e23f55ec9794dcbdeac806bb7175c546f2dcca483cddd72116b1f7726d249c983b7407939de8906e0ec442320d2f2b7b515947

data/lib/rspec/openhab/dsl/imports.rb

@@ -157,6 +157,8 @@ module OpenHAB
           OpenHAB::Core::OSGI.register_service("org.openhab.core.items.MetadataRegistry", mr)
           mr.managed_provider = mmp = org.openhab.core.internal.items.ManagedMetadataProviderImpl.new(ss)
           mr.add_provider(mmp)
+          gmp = org.openhab.core.model.item.internal.GenericMetadataProvider.new
+          mr.add_provider(gmp)
           ir = org.openhab.core.internal.items.ItemRegistryImpl.new(mr)
           ir.managed_provider = mip = org.openhab.core.items.ManagedItemProvider.new(ss, nil)
           ir.add_provider(mip)
@@ -171,6 +173,22 @@ module OpenHAB
           rr.managed_provider = mrp = org.openhab.core.automation.ManagedRuleProvider.new(ss)
           rr.add_provider(mrp)
           iclr = org.openhab.core.thing.link.ItemChannelLinkRegistry.new(tr, ir)
+          ctr = org.openhab.core.thing.type.ChannelTypeRegistry.new
+          ttr = org.openhab.core.thing.type.ThingTypeRegistry.new(ctr)
+
+          safe_emf = org.openhab.core.model.core.internal.SafeEMFImpl.new
+          model_repository = org.openhab.core.model.core.internal.ModelRepositoryImpl.new(safe_emf)
+
+          # set up state descriptions
+          sds = org.openhab.core.internal.service.StateDescriptionServiceImpl.new
+          gip = org.openhab.core.model.item.internal.GenericItemProvider.new(model_repository, gmp, {})
+          sds.add_state_description_fragment_provider(gip)
+          msdfp = org.openhab.core.internal.items.MetadataStateDescriptionFragmentProvider.new(mr, {})
+          sds.add_state_description_fragment_provider(msdfp)
+          csdp = org.openhab.core.thing.internal.ChannelStateDescriptionProvider.new(iclr, ttr, tr)
+          csdp.activate(org.osgi.framework.Constants::SERVICE_RANKING => java.lang.Integer.new(-1))
+          sds.add_state_description_fragment_provider(csdp)
+          ir.state_description_service = sds
 
           # set up stuff accessed from rules
           preset = org.openhab.core.automation.module.script.internal.defaultscope

data/lib/rspec/openhab/items.rb

@@ -8,25 +8,24 @@ module RSpec
           all_items = api.items
 
           gfh = org.openhab.core.internal.items.GroupFunctionHelper.new
+          item_factory = org.openhab.core.library.CoreItemFactory.new
 
           all_items.each do |item_json|
-            type, _dimension = item_json["type"].split(":")
+            full_type = item_json["type"]
+            name = item_json["name"]
+
+            type, _dimension = full_type.split(":")
             if type == "Group"
-              if item_json["groupType"]
-                type, _dimension = item_json["groupType"].split(":")
-                klass = ::OpenHAB::DSL::Items.const_get(:"#{type}Item")
-                base_item = klass.new(item_json["name"])
-              end
+              base_item = item_factory.create_item(item_json["groupType"], name) if item_json["groupType"]
               if item_json["function"]
                 dto = org.openhab.core.items.dto.GroupFunctionDTO.new
                 dto.name = item_json.dig("function", "name")
                 dto.params = item_json.dig("function", "params")
                 function = gfh.create_group_function(dto, base_item)
               end
-              item = GroupItem.new(item_json["name"], base_item, function)
+              item = GroupItem.new(name, base_item, function)
             else
-              klass = ::OpenHAB::DSL::Items.const_get(:"#{type}Item")
-              item = klass.new(item_json["name"])
+              item = item_factory.create_item(full_type, name)
             end
 
             item.label = item_json["label"]
@@ -36,6 +35,8 @@ module RSpec
             item_json["metadata"]&.each do |key, config|
               item.meta[key] = config["value"], config["config"]
             end
+            item.meta["stateDescription"] = item_json["stateDescription"] if item_json["stateDescription"]
+            item.category = item_json["category"] if item_json["category"]
 
             $ir.add(item)
           end

data/lib/rspec/openhab/timer.rb

@@ -3,8 +3,10 @@
 RSpec.configure do |config|
   config.before(:each) do
     OpenHAB::DSL::Timers.timer_manager.cancel_all
+    wait_for_background_tasks
   end
   config.after(:each) do
     OpenHAB::DSL::Timers.timer_manager.cancel_all
+    wait_for_background_tasks
   end
 end

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "0.0.7"
+    VERSION = "0.0.10"
   end
 end

data/lib/rspec/openhab/wait.rb

@@ -4,14 +4,75 @@ module RSpec
   module OpenHAB
     module Wait
       def wait_for_rules
+        wait_for_background_tasks(timers: false)
+      end
+
+      def wait_for_timers
+        wait_for_background_tasks(rules: false)
+      end
+
+      def wait_for_background_tasks(rules: true, timers: true)
         loop do
-          sleep(0.1)
-          break if java.lang.Thread.all_stack_traces.keys.all? do |t|
-                     !t.name.match?(/^OH-rule-/) ||
-                     [java.lang.Thread::State::WAITING, java.lang.Thread::State::TIMED_WAITING].include?(t.state)
-                   end
+          sleep 0.1
+          next if java.lang.Thread.all_stack_traces.any? do |(t, stack)|
+            # this is just an estimate. I see 9 when it's parked waiting
+            # for an event, but once it hits ruby it gets real big real quick
+            min_frames = 15
+
+            case t.name
+            when /^OH-scheduler-/
+              # timer thread; born and die for each timer
+              if thread_running?(t) || stack.length > min_frames
+                logger.debug "thread #{t.name} is running (#{stack.length})"
+                stack.each do |frame|
+                  logger.trace "  #{frame}"
+                end
+                next timers
+              end
+            when /^OH-rule-/
+
+              if thread_running?(t) || stack.length > min_frames
+                logger.debug "thread #{t.name} is running (#{stack.length})"
+                stack.each do |frame|
+                  logger.trace "  #{frame}"
+                end
+
+                next rules
+              end
+            when /^OH-(?:eventwatcher|eventexecutor)-/
+              # an event is making its way through the system
+              if thread_running?(t)
+                logger.debug "thread #{t.name} is running"
+                next rules
+              end
+            end
+          end
+
+          # no need to retry if there were no timers
+          break unless timers && wait_for_next_timer
         end
       end
+
+      private
+
+      def thread_running?(thread)
+        ![java.lang.Thread::State::WAITING,
+          java.lang.Thread::State::TIMED_WAITING].include?(thread.state)
+      end
+
+      def wait_for_next_timer
+        latest = ::OpenHAB::DSL::Timers.timer_manager.instance_variable_get(:@timers).min_by(&:execution_time)
+        return false unless latest
+
+        delta = (latest.execution_time.to_instant.to_epoch_milli - java.time.Instant.now.to_epoch_milli) / 1000.0
+        # in the past? it's probably executing
+        return true if delta.negative?
+
+        logger.info("Waiting #{delta}s for next timer") if delta > 5
+
+        sleep(delta)
+        true
+      end
     end
   end
 end

data/lib/rspec-openhab-scripting.rb

@@ -40,6 +40,7 @@ maven_require do
   require "jar org.openhab.core.bundles, org.openhab.core.config.core, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.io.monitor, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.model.core, #{openhab_version}"
+  require "jar org.openhab.core.bundles, org.openhab.core.model.item, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.model.script, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.semantics, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.thing, #{openhab_version}"
@@ -58,6 +59,8 @@ end
 # global variables need to be set up before openhab-scripting loads
 require "openhab/log/logger"
 require "rspec/openhab/core/logger"
+# during testing, we don't want "regular" output from rules
+OpenHAB::Log.logger("org.openhab.automation.jruby.runtime").level = :warn
 require "openhab/dsl/imports"
 OpenHAB::DSL::Imports.api = api
 OpenHAB::DSL::Imports.import_presets
@@ -70,10 +73,14 @@ require "rspec/openhab/core/cron_scheduler"
 # RSpec additions
 require "rspec/core"
 require "rspec/openhab/dsl/rules/rspec"
+require "rspec/openhab/items"
 require "rspec/openhab/state"
+require "rspec/openhab/timer"
 require "rspec/openhab/trigger"
 require "rspec/openhab/wait"
-require "rspec/openhab/items"
+RSpec.configure do |config|
+  config.include OpenHAB::Core::EntityLookup
+end
 
 RSpec::OpenHAB::Items.populate_items_from_api(api)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.10
 platform: java
 authors:
 - Cody Cutrer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement