public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build after core changes (#14027)

Browse Source 
Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2023-01-20 14:57:42 +01:00 committed by GitHub
parent bd23bcc87d
commit 598a285adf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bundles/org.openhab.binding.wundergroundupdatereceiver/src/test/java/org/openhab/binding/wundergroundupdatereceiver/internal/WundergroundUpdateReceiverDiscoveryServiceTest.java
View File

@ -107,22 +107,22 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
// Then // Then
assertThat(actual.size(), is(9)); assertThat(actual.size(), is(9));
assertChannel(actual.get(0), METADATA_GROUP, LAST_RECEIVED, LAST_RECEIVED_DATETIME_CHANNELTYPEUID, assertChannel(actual, METADATA_GROUP, LAST_RECEIVED, LAST_RECEIVED_DATETIME_CHANNELTYPEUID, ChannelKind.STATE,
ChannelKind.STATE, is("DateTime")); is("DateTime"));
assertChannel(actual.get(1), METADATA_GROUP, LAST_QUERY_TRIGGER, LAST_QUERY_TRIGGER_CHANNELTYPEUID, assertChannel(actual, METADATA_GROUP, LAST_QUERY_TRIGGER, LAST_QUERY_TRIGGER_CHANNELTYPEUID,
ChannelKind.TRIGGER, nullValue()); ChannelKind.TRIGGER, nullValue());
assertChannel(actual.get(2), METADATA_GROUP, LAST_QUERY_STATE, LAST_QUERY_STATE_CHANNELTYPEUID, assertChannel(actual, METADATA_GROUP, LAST_QUERY_STATE, LAST_QUERY_STATE_CHANNELTYPEUID, ChannelKind.STATE,
ChannelKind.STATE, is("String"));
assertChannel(actual.get(3), METADATA_GROUP, DATEUTC, DATEUTC_CHANNELTYPEUID, ChannelKind.STATE, is("String"));
assertChannel(actual.get(4), METADATA_GROUP, REALTIME_FREQUENCY, REALTIME_FREQUENCY_CHANNELTYPEUID,
ChannelKind.STATE, is("Number"));
assertChannel(actual.get(5), METADATA_GROUP, SOFTWARE_TYPE, SOFTWARETYPE_CHANNELTYPEUID, ChannelKind.STATE,
is("String")); is("String"));
assertChannel(actual.get(6), HUMIDITY_GROUP, HUMIDITY, HUMIDITY_CHANNELTYPEUID, ChannelKind.STATE, assertChannel(actual, METADATA_GROUP, DATEUTC, DATEUTC_CHANNELTYPEUID, ChannelKind.STATE, is("String"));
assertChannel(actual, METADATA_GROUP, REALTIME_FREQUENCY, REALTIME_FREQUENCY_CHANNELTYPEUID, ChannelKind.STATE,
is("Number"));
assertChannel(actual, METADATA_GROUP, SOFTWARE_TYPE, SOFTWARETYPE_CHANNELTYPEUID, ChannelKind.STATE,
is("String"));
assertChannel(actual, HUMIDITY_GROUP, HUMIDITY, HUMIDITY_CHANNELTYPEUID, ChannelKind.STATE,
is("Number:Dimensionless")); is("Number:Dimensionless"));
assertChannel(actual.get(7), WIND_GROUP, WIND_SPEED_AVG_2MIN, WIND_SPEED_AVG_2MIN_CHANNELTYPEUID, assertChannel(actual, WIND_GROUP, WIND_SPEED_AVG_2MIN, WIND_SPEED_AVG_2MIN_CHANNELTYPEUID, ChannelKind.STATE,
ChannelKind.STATE, is("Number:Speed")); is("Number:Speed"));
assertChannel(actual.get(8), POLLUTION_GROUP, AQ_PM2_5, PM2_5_MASS_CHANNELTYPEUID, ChannelKind.STATE, assertChannel(actual, POLLUTION_GROUP, AQ_PM2_5, PM2_5_MASS_CHANNELTYPEUID, ChannelKind.STATE,
is("Number:Density")); is("Number:Density"));
} }
@ -388,8 +388,8 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
// Then // Then
assertThat(actual.size(), is(8)); assertThat(actual.size(), is(8));
assertChannel(actual.get(7), METADATA_GROUP, LAST_QUERY_TRIGGER, LAST_QUERY_TRIGGER_CHANNELTYPEUID, assertChannel(actual, METADATA_GROUP, LAST_QUERY_TRIGGER, LAST_QUERY_TRIGGER_CHANNELTYPEUID, ChannelKind.STATE,
ChannelKind.STATE, is("DateTime")); is("DateTime"));
// When // When
handler.dispose(); handler.dispose();
@ -414,15 +414,16 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
// Then // Then
assertThat(actual.size(), is(8)); assertThat(actual.size(), is(8));
assertChannel(actual.get(7), METADATA_GROUP, LAST_QUERY_TRIGGER, LAST_QUERY_TRIGGER_CHANNELTYPEUID, assertChannel(actual, METADATA_GROUP, LAST_QUERY_TRIGGER, LAST_QUERY_TRIGGER_CHANNELTYPEUID,
ChannelKind.TRIGGER, nullValue()); ChannelKind.TRIGGER, nullValue());
} }
private void assertChannel(Channel actual, String expectedGroup, String expectedName, ChannelTypeUID expectedUid, private void assertChannel(List<Channel> channels, String expectedGroup, String expectedName,
ChannelKind expectedKind, Matcher<Object> expectedItemType) { ChannelTypeUID expectedUid, ChannelKind expectedKind, Matcher<Object> expectedItemType) {
ChannelUID channelUID = new ChannelUID(TEST_THING_UID, expectedGroup, expectedName);
Channel actual = channels.stream().filter(c -> channelUID.equals(c.getUID())).findFirst().orElse(null);
assertThat(actual, is(notNullValue())); assertThat(actual, is(notNullValue()));
assertThat(actual.getLabel() + " UID", actual.getUID(), assertThat(actual.getLabel() + " UID", actual.getUID(), is(channelUID));
is(new ChannelUID(TEST_THING_UID, expectedGroup, expectedName)));
assertThat(actual.getLabel() + " ChannelTypeUID", actual.getChannelTypeUID(), is(expectedUid)); assertThat(actual.getLabel() + " ChannelTypeUID", actual.getChannelTypeUID(), is(expectedUid));
assertThat(actual.getLabel() + " Kind", actual.getKind(), is(expectedKind)); assertThat(actual.getLabel() + " Kind", actual.getKind(), is(expectedKind));
assertThat(actual.getLabel() + " AcceptedItemType", actual.getAcceptedItemType(), expectedItemType); assertThat(actual.getLabel() + " AcceptedItemType", actual.getAcceptedItemType(), expectedItemType);