rspec-openhab-scripting 0.0.17-java → 0.0.18-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5541ba712d1a3fef9112f736b456309acb491aa0cdf075098abe04712a59940
-  data.tar.gz: d75f2b90687529a2bbc63f6d456f639a23360e7636d8ea7c36ed4d2113c7b6d7
+  metadata.gz: 6ea44768dd3bccdfc7276944f329030e21182d161126e433126970f096543f46
+  data.tar.gz: 81be4550cd3ab271f43e15616959709bb9e5d1cf14a999dd8565e0b148d3a8d7
 SHA512:
-  metadata.gz: f576f81ea3fea76dbb173e8aa7ad3d1439f24e518bcd8574597266fe4bc457e325b6ec2f214e9c15a9c6b4c681d7350f7845fe055962f3b1b68214c0433b6b4d
-  data.tar.gz: 394f5a733ed2ddd02bf109f08fb80bbc35f8db5cebb340231a4b9bb17064ba17598ea1dbd90de18e16ff7d6ef52c387db001da6f6a3ae140c44928e71cef48c5
+  metadata.gz: 4d70a68375f21fab304d05b620125cf79b5767f3522d5e22a0608301b56e4ed3b2f6baba7942bdfcdb9ffed742378452720b79b7bfc5d7523544087a0bcb15bc
+  data.tar.gz: d2ce66901858dc37eb7c76b5f37f82da6147f1b471b8fc70097037099d677eb01c6e4e25d77e12105847e28156a919e059d5420271f9ce5cfcb0c9af933b4383

data/lib/rspec/openhab/core/mocks/thing_handler.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# rubocop:disable Naming have to follow java interface names
+module RSpec
+  module OpenHAB
+    module Core
+      module Mocks
+        class ThingHandler
+          include org.openhab.core.thing.binding.BridgeHandler
+
+          attr_reader :thing, :callback
+
+          def initialize(thing = nil)
+            # have to handle the interface method
+            if thing.nil?
+              status_info = org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder
+                               .create(org.openhab.core.thing.ThingStatus::ONLINE).build
+              @callback.status_updated(self.thing, status_info)
+              return
+            end
+
+            # ruby initializer here
+            @thing = thing
+          end
+
+          def handle_command(channel, command); end
+
+          def set_callback(callback)
+            @callback = callback
+          end
+
+          def child_handler_initialized(child_handler, child_thing); end
+        end
+
+        class ThingHandlerFactory < org.openhab.core.thing.binding.BaseThingHandlerFactory
+          def supportsThingType(_type)
+            true
+          end
+
+          def createHandler(thing)
+            ThingHandler.new(thing)
+          end
+        end
+      end
+    end
+  end
+end
+# rubocop:enable Naming

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

@@ -71,7 +71,17 @@ module OpenHAB
       class BundleResolver
         include org.openhab.core.util.BundleResolver
 
-        def resolve_bundle(klass); end
+        def initialize
+          @bundles = {}
+        end
+
+        def register(klass, bundle)
+          @bundles[klass] = bundle
+        end
+
+        def resolve_bundle(klass)
+          @bundles[klass]
+        end
       end
 
       # don't depend on org.openhab.core.test
@@ -104,13 +114,15 @@ module OpenHAB
         INSTALLED = 2
 
         def initialize(*jar_args)
+          return if jar_args.empty?
+
           file = Jars.find_jar(*jar_args)
           @jar = java.util.jar.JarFile.new(file)
           @symbolic_name = jar_args[1]
           @version = org.osgi.framework.Version.new(jar_args[2].tr("-", "."))
         end
 
-        attr_reader :symbolic_name, :version
+        attr_accessor :symbolic_name, :version
 
         def state
           INSTALLED
@@ -313,6 +325,7 @@ module OpenHAB
           bc = BundleContext.new(em)
           cc = ComponentContext.new(bc)
           cc.properties["measurementSystem"] = api.measurement_system if api
+          resolver = BundleResolver.new
 
           # the registries!
           ss = VolatileStorageService.new
@@ -346,6 +359,7 @@ module OpenHAB
           ttr = org.openhab.core.thing.type.ThingTypeRegistry.new(ctr)
           OpenHAB::Core::OSGI.register_service(ttr)
           ttr.add_thing_type_provider(RSpec::OpenHAB::Core::Mocks::ThingTypeProvider.instance)
+          cgtr = org.openhab.core.thing.type.ChannelGroupTypeRegistry.new
 
           safe_emf = org.openhab.core.model.core.internal.SafeEMFImpl.new
           model_repository = org.openhab.core.model.core.internal.ModelRepositoryImpl.new(safe_emf)
@@ -410,18 +424,18 @@ module OpenHAB
 
           # link up event bus infrastructure
           iu = org.openhab.core.internal.items.ItemUpdater.new(ir)
-          ief = org.openhab.core.items.events.ItemEventFactory.new
 
           sc = SafeCaller.new
           aum = org.openhab.core.thing.internal.AutoUpdateManager.new(
             { "enabled" => true, "sendOptimisticUpdates" => true }, ctr, ep, iclr, mr, tr
           )
-          spf = org.openhab.core.thing.internal.profiles.SystemProfileFactory.new(ctr, nil, BundleResolver.new)
+          spf = org.openhab.core.thing.internal.profiles.SystemProfileFactory.new(ctr, nil, resolver)
           cm = org.openhab.core.thing.internal.CommunicationManager.new(aum, ctr, spf, iclr, ir, isc, ep, sc, tr)
 
           em.add_event_subscriber(iu)
           em.add_event_subscriber(cm)
-          em.add_event_factory(ief)
+          em.add_event_factory(org.openhab.core.items.events.ItemEventFactory.new)
+          em.add_event_factory(org.openhab.core.thing.events.ThingEventFactory.new)
 
           # set up the rules engine part 2
           k = org.openhab.core.automation.internal.module.factory.CoreModuleHandlerFactory
@@ -464,6 +478,31 @@ module OpenHAB
           pm = org.openhab.core.persistence.internal.PersistenceManagerImpl.new(nil, ir, sc, rs)
           pm.add_persistence_service(ps)
           pm.on_ready_marker_added(nil)
+
+          # set up ThingManager so we can trigger channels
+          localizer = org.openhab.core.thing.i18n.ThingStatusInfoI18nLocalizationService.new
+          tm = org.openhab.core.thing.internal.ThingManagerImpl.new(
+            resolver,
+            cgtr,
+            ctr,
+            cm,
+            nil,
+            nil,
+            ep,
+            iclr,
+            rs,
+            sc,
+            ss,
+            tr,
+            localizer,
+            ttr
+          )
+          thf = RSpec::OpenHAB::Core::Mocks::ThingHandlerFactory.new
+          this_bundle = Bundle.new
+          this_bundle.symbolic_name = "org.openhab.automation.jrubyscripting.rspec"
+          resolver.register(thf.class.java_class, this_bundle)
+          tm.add_thing_handler_factory(thf)
+          tm.on_ready_marker_added(org.openhab.core.service.ReadyMarker.new(nil, this_bundle.symbolic_name))
         end
       end
     end

data/lib/rspec/openhab/helpers.rb

@@ -24,6 +24,13 @@ module RSpec
         @rules.fetch(rule_name).execute(nil, { "event" => event })
       end
 
+      def trigger_channel(channel, event)
+        channel = org.openhab.core.thing.ChannelUID.new(channel) if channel.is_a?(String)
+        channel = channel.uid if channel.is_a?(org.openhab.core.thing.Channel)
+        thing = channel.thing
+        thing.handler.callback.channel_triggered(nil, channel, event)
+      end
+
       private
 
       def restore_autoupdate_items

data/lib/rspec/openhab/items.rb

@@ -3,18 +3,6 @@
 module RSpec
   module OpenHAB
     module Items
-      class ThingHandler
-        include org.openhab.core.thing.binding.ThingHandler
-
-        attr_reader :thing
-
-        def initialize(thing)
-          @thing = thing
-        end
-
-        def handle_command(channel, command); end
-      end
-
       class << self
         def populate_items_from_api(api)
           all_items = api.items
@@ -103,14 +91,7 @@ module RSpec
               end
             end
 
-            thing = builder.build
-            # pretend everything is online so that AutoUpdateManager won't reject updates
-            # to items linked to offline channels
-            thing.status_info = org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder
-                                   .create(org.openhab.core.thing.ThingStatus::ONLINE).build
-            handler = ThingHandler.new(thing)
-            thing.handler = handler
-            $things.add(thing)
+            $things.add(builder.build)
           end
         end
 

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "0.0.17"
+    VERSION = "0.0.18"
   end
 end

data/lib/rspec-openhab-scripting.rb

@@ -70,6 +70,7 @@ OpenHAB::Log.logger("org.openhab.automation.jruby.logger").level = :warn
 require "rspec/openhab/core/mocks/channel_type_provider"
 require "rspec/openhab/core/mocks/item_channel_link_provider"
 require "rspec/openhab/core/mocks/persistence_service"
+require "rspec/openhab/core/mocks/thing_handler"
 require "rspec/openhab/core/mocks/thing_type_provider"
 require "openhab/dsl/imports"
 OpenHAB::DSL::Imports.api = api

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: java
 authors:
 - Cody Cutrer
@@ -195,6 +195,7 @@ files:
 - lib/rspec/openhab/core/mocks/channel_type_provider.rb
 - lib/rspec/openhab/core/mocks/item_channel_link_provider.rb
 - lib/rspec/openhab/core/mocks/persistence_service.rb
+- lib/rspec/openhab/core/mocks/thing_handler.rb
 - lib/rspec/openhab/core/mocks/thing_type_provider.rb
 - lib/rspec/openhab/core/openhab_setup.rb
 - lib/rspec/openhab/core/osgi.rb