This repository has been archived by the owner on May 7, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 779
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
improve handling of links related to model-items (#3641)
* change the order of how the GenericItemProvider registers links and items * enable the GenericItemChannelLinkProvider to handle deletions correctly * call GenericItemChannelLinkProvider from within GenericItemProvider only * enforce correct transaction handling in GenericItemChannelLinkProvider fixes #2491 relates to #3607 Signed-off-by: Simon Kaufmann <[email protected]>
- Loading branch information
1 parent
607d424
commit 9d96c90
Showing
6 changed files
with
218 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
176 changes: 176 additions & 0 deletions
176
...s/src/org/eclipse/smarthome/model/thing/tests/GenericItemChannelLinkProviderJavaTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| /** | ||
| * Copyright (c) 2014-2017 by the respective copyright holders. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| */ | ||
| package org.eclipse.smarthome.model.thing.tests; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.*; | ||
| import static org.junit.Assert.assertThat; | ||
| import static org.mockito.Matchers.*; | ||
| import static org.mockito.Mockito.*; | ||
| import static org.mockito.MockitoAnnotations.initMocks; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.util.Collection; | ||
|
|
||
| import org.eclipse.smarthome.core.common.registry.ProviderChangeListener; | ||
| import org.eclipse.smarthome.core.items.ItemRegistry; | ||
| import org.eclipse.smarthome.core.thing.ChannelUID; | ||
| import org.eclipse.smarthome.core.thing.Thing; | ||
| import org.eclipse.smarthome.core.thing.ThingRegistry; | ||
| import org.eclipse.smarthome.core.thing.link.ItemChannelLink; | ||
| import org.eclipse.smarthome.core.thing.link.ItemChannelLinkProvider; | ||
| import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry; | ||
| import org.eclipse.smarthome.model.core.ModelRepository; | ||
| import org.eclipse.smarthome.model.thing.internal.GenericItemChannelLinkProvider; | ||
| import org.eclipse.smarthome.test.java.JavaOSGiTest; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.mockito.Mock; | ||
|
|
||
| /** | ||
| * | ||
| * @author Simon Kaufmann - initial contribution and API | ||
| * | ||
| */ | ||
| public class GenericItemChannelLinkProviderJavaTest extends JavaOSGiTest { | ||
|
|
||
| private final static String THINGS_TESTMODEL_NAME = "test.things"; | ||
| private final static String ITEMS_TESTMODEL_NAME = "test.items"; | ||
|
|
||
| private static final String ITEM = "test"; | ||
| private static final String CHANNEL = "test:test:test:test"; | ||
| private static final String LINK = ITEM + " -> " + CHANNEL; | ||
|
|
||
| private ModelRepository modelRepository; | ||
| private ThingRegistry thingRegistry; | ||
| private ItemRegistry itemRegistry; | ||
| private ItemChannelLinkRegistry itemChannelLinkRegistry; | ||
| private ItemChannelLinkProvider itemChannelLinkProvider; | ||
|
|
||
| @Mock | ||
| private ProviderChangeListener<ItemChannelLink> listener; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| initMocks(this); | ||
|
|
||
| thingRegistry = getService(ThingRegistry.class); | ||
| assertThat(thingRegistry, is(notNullValue())); | ||
| modelRepository = getService(ModelRepository.class); | ||
| assertThat(modelRepository, is(notNullValue())); | ||
| itemRegistry = getService(ItemRegistry.class); | ||
| assertThat(itemRegistry, is(notNullValue())); | ||
| itemChannelLinkRegistry = getService(ItemChannelLinkRegistry.class); | ||
| assertThat(itemChannelLinkRegistry, is(notNullValue())); | ||
| itemChannelLinkProvider = getService(ItemChannelLinkProvider.class); | ||
| assertThat(itemChannelLinkProvider, is(notNullValue())); | ||
| modelRepository.removeModel(THINGS_TESTMODEL_NAME); | ||
| modelRepository.removeModel(ITEMS_TESTMODEL_NAME); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| modelRepository.removeModel(THINGS_TESTMODEL_NAME); | ||
| modelRepository.removeModel(ITEMS_TESTMODEL_NAME); | ||
|
|
||
| assertThat(itemRegistry.getItems().size(), is(0)); | ||
| assertThat(itemChannelLinkRegistry.getAll().size(), is(0)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testIntegrationWithGenericItemProvider() throws Exception { | ||
| Thread.sleep(2500); // Wait for the ChannelItemProvider to join the game | ||
|
|
||
| Collection<Thing> things = thingRegistry.getAll(); | ||
| assertThat(things.size(), is(0)); | ||
|
|
||
| String thingsModel = | ||
|
|
||
| "Bridge hue:bridge:huebridge [ ipAddress = \"192.168.3.84\", userName = \"19fc3fa6fc870a4280a55f21315631f\" ] {" | ||
| + "LCT001 bulb3 [ lightId = \"3\" ]" + "LCT001 bulb4 [ lightId = \"3\" ]" + "}"; | ||
| modelRepository.addOrRefreshModel(THINGS_TESTMODEL_NAME, new ByteArrayInputStream(thingsModel.getBytes())); | ||
| Collection<Thing> actualThings = thingRegistry.getAll(); | ||
|
|
||
| assertThat(actualThings.size(), is(3)); | ||
|
|
||
| assertThat(itemRegistry.getItems().size(), is(0)); | ||
| assertThat(itemChannelLinkRegistry.getAll().size(), is(0)); | ||
|
|
||
| String itemsModel = "Color Light3Color \"Light3 Color\" { channel=\"hue:LCT001:huebridge:bulb3:color\" }" | ||
| + "Group:Switch:MAX TestSwitches"; | ||
|
|
||
| // Initially load the model | ||
| modelRepository.addOrRefreshModel(ITEMS_TESTMODEL_NAME, new ByteArrayInputStream(itemsModel.getBytes())); | ||
| assertThat(itemRegistry.getItems().size(), is(2)); | ||
| assertThat(itemChannelLinkRegistry.getAll().size(), is(1)); | ||
|
|
||
| // Update the model to run into GenericItemChannelLinkProvider's amnesia | ||
| modelRepository.addOrRefreshModel(ITEMS_TESTMODEL_NAME, new ByteArrayInputStream(itemsModel.getBytes())); | ||
| assertThat(itemRegistry.getItems().size(), is(2)); | ||
| assertThat(itemChannelLinkRegistry.getAll().size(), is(1)); | ||
|
|
||
| // Remove the model (-> the link and therefore the item is kept) | ||
| modelRepository.removeModel(ITEMS_TESTMODEL_NAME); | ||
| assertThat(itemRegistry.getItems().size(), is(0)); | ||
| assertThat(itemChannelLinkRegistry.getAll().size(), is(0)); | ||
|
|
||
| // Now add the model again | ||
| modelRepository.addOrRefreshModel(ITEMS_TESTMODEL_NAME, new ByteArrayInputStream(itemsModel.getBytes())); | ||
| assertThat(itemRegistry.getItems().size(), is(2)); // -> ensure ChannelItemProvider cleans up properly | ||
| assertThat(itemChannelLinkRegistry.getAll().size(), is(1)); | ||
| } | ||
|
|
||
| @Test(expected = IllegalStateException.class) | ||
| public void testTransaction_requiredStart() { | ||
| GenericItemChannelLinkProvider provider = new GenericItemChannelLinkProvider(); | ||
| provider.stopConfigurationUpdate(ITEMS_TESTMODEL_NAME); | ||
| } | ||
|
|
||
| @Test(expected = IllegalStateException.class) | ||
| public void testTransaction_requiredProcess() throws Exception { | ||
| GenericItemChannelLinkProvider provider = new GenericItemChannelLinkProvider(); | ||
| provider.processBindingConfiguration(ITEMS_TESTMODEL_NAME, "Number", ITEM, CHANNEL); | ||
| } | ||
|
|
||
| @Test(expected = IllegalStateException.class) | ||
| public void testTransaction_duplicate() { | ||
| GenericItemChannelLinkProvider provider = new GenericItemChannelLinkProvider(); | ||
| provider.startConfigurationUpdate(ITEMS_TESTMODEL_NAME); | ||
| provider.startConfigurationUpdate(ITEMS_TESTMODEL_NAME); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| @Test | ||
| public void testNoAmnesia() throws Exception { | ||
| GenericItemChannelLinkProvider provider = new GenericItemChannelLinkProvider(); | ||
| provider.addProviderChangeListener(listener); | ||
|
|
||
| provider.startConfigurationUpdate(ITEMS_TESTMODEL_NAME); | ||
| provider.processBindingConfiguration(ITEMS_TESTMODEL_NAME, "Number", ITEM, CHANNEL); | ||
| provider.stopConfigurationUpdate(ITEMS_TESTMODEL_NAME); | ||
| assertThat(provider.getAll().size(), is(1)); | ||
| assertThat(provider.getAll().iterator().next().toString(), is(LINK)); | ||
| verify(listener, only()).added(same(provider), eq(new ItemChannelLink(ITEM, new ChannelUID(CHANNEL)))); | ||
|
|
||
| reset(listener); | ||
| provider.startConfigurationUpdate(ITEMS_TESTMODEL_NAME); | ||
| provider.processBindingConfiguration(ITEMS_TESTMODEL_NAME, "Number", ITEM, CHANNEL); | ||
| provider.stopConfigurationUpdate(ITEMS_TESTMODEL_NAME); | ||
| assertThat(provider.getAll().size(), is(1)); | ||
| assertThat(provider.getAll().iterator().next().toString(), is(LINK)); | ||
| verify(listener, only()).updated(same(provider), eq(new ItemChannelLink(ITEM, new ChannelUID(CHANNEL))), | ||
| eq(new ItemChannelLink(ITEM, new ChannelUID(CHANNEL)))); | ||
|
|
||
| reset(listener); | ||
| provider.startConfigurationUpdate(ITEMS_TESTMODEL_NAME); | ||
| provider.stopConfigurationUpdate(ITEMS_TESTMODEL_NAME); | ||
| assertThat(provider.getAll().size(), is(0)); | ||
| verify(listener, only()).removed(same(provider), eq(new ItemChannelLink(ITEM, new ChannelUID(CHANNEL)))); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.