OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve log message to identify profile's link (#3568)

pull/3459/head^2
jimtng 2023-04-22 16:18:49 +10:00 committed by GitHub
parent 7cf090140c
commit bff92e0349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/profile/ScriptProfile.java
View File

@ -76,7 +76,8 @@ public class ScriptProfile implements StateProfile {
if (toItemScript.isBlank() && toHandlerScript.isBlank()) { if (toItemScript.isBlank() && toHandlerScript.isBlank()) {
logger.error( logger.error(
"Neither 'toItem' nor 'toHandler' script defined. Profile will discard all states and commands."); "Neither 'toItemScript' nor 'toHandlerScript' defined in link '{}'. Profile will discard all states and commands.",
callback.getItemChannelLink());
isConfigured = false; isConfigured = false;
return; return;
} }

8
bundles/org.openhab.core.automation.module.script/src/test/java/org/openhab/core/automation/module/script/profile/ScriptProfileTest.java
View File

@ -40,6 +40,8 @@ import org.openhab.core.library.types.HSBType;
import org.openhab.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.PercentType; import org.openhab.core.library.types.PercentType;
import org.openhab.core.test.java.JavaTest; import org.openhab.core.test.java.JavaTest;
import org.openhab.core.thing.ChannelUID;
import org.openhab.core.thing.link.ItemChannelLink;
import org.openhab.core.thing.profiles.ProfileCallback; import org.openhab.core.thing.profiles.ProfileCallback;
import org.openhab.core.thing.profiles.ProfileContext; import org.openhab.core.thing.profiles.ProfileContext;
import org.openhab.core.thing.profiles.ProfileTypeUID; import org.openhab.core.thing.profiles.ProfileTypeUID;
@ -70,6 +72,9 @@ public class ScriptProfileTest extends JavaTest {
public void testScriptNotExecutedAndNoValueForwardedToCallbackIfNoScriptDefined() throws TransformationException { public void testScriptNotExecutedAndNoValueForwardedToCallbackIfNoScriptDefined() throws TransformationException {
ProfileContext profileContext = ProfileContextBuilder.create().build(); ProfileContext profileContext = ProfileContextBuilder.create().build();
ItemChannelLink link = new ItemChannelLink("DummyItem", new ChannelUID("foo:bar:baz:qux"));
when(profileCallback.getItemChannelLink()).thenReturn(link);
setupInterceptedLogger(ScriptProfile.class, LogLevel.ERROR); setupInterceptedLogger(ScriptProfile.class, LogLevel.ERROR);
ScriptProfile scriptProfile = new ScriptProfile(mock(ProfileTypeUID.class), profileCallback, profileContext, ScriptProfile scriptProfile = new ScriptProfile(mock(ProfileTypeUID.class), profileCallback, profileContext,
@ -85,7 +90,8 @@ public class ScriptProfileTest extends JavaTest {
verify(profileCallback, never()).sendCommand(any()); verify(profileCallback, never()).sendCommand(any());
assertLogMessage(ScriptProfile.class, LogLevel.ERROR, assertLogMessage(ScriptProfile.class, LogLevel.ERROR,
"Neither 'toItem' nor 'toHandler' script defined. Profile will discard all states and commands."); "Neither 'toItemScript' nor 'toHandlerScript' defined in link '" + link.toString()
+ "'. Profile will discard all states and commands.");
} }
@Test @Test