Skip to content

Commit e503de7

Browse files
markus7017markus7017
committed
unit tests fixed
Signed-off-by: Markus Michels <markus7017@gmail.com>
1 parent a29aa0b commit e503de7

2 files changed

Lines changed: 88 additions & 89 deletions

File tree

‎bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/shellyGen2_lights.xml‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,44 @@
1616
<channel-group id="meter" typeId="meter"/>
1717
<channel-group id="device" typeId="deviceStatus"/>
1818

19-
<channel-group id="channel1" typeId="rgbw2Channel">
20-
<label>@text/channel-group-type.shelly.rgbw2Channel1.label</label>
21-
</channel-group>
22-
<channel-group id="channel2" typeId="rgbw2Channel">
23-
<label>@text/channel-group-type.shelly.rgbw2Channel2.label</label>
24-
</channel-group>
25-
<channel-group id="channel3" typeId="rgbw2Channel">
26-
<label>@text/channel-group-type.shelly.rgbw2Channel3.label</label>
27-
</channel-group>
28-
<channel-group id="channel4" typeId="rgbw2Channel">
29-
<label>@text/channel-group-type.shelly.rgbw2Channel4.label</label>
30-
</channel-group>
31-
32-
<channel-group id="status1" typeId="ixChannel">
33-
<label>@text/channel-group-type.shelly.iXChannel1.label</label>
34-
</channel-group>
35-
<channel-group id="status2" typeId="ixChannel">
36-
<label>@text/channel-group-type.shelly.iXChannel2.label</label>
37-
</channel-group>
38-
<channel-group id="status3" typeId="ixChannel">
39-
<label>@text/channel-group-type.shelly.iXChannel3.label</label>
40-
</channel-group>
41-
<channel-group id="status4" typeId="ixChannel">
42-
<label>@text/channel-group-type.shelly.iXChannel4.label</label>
43-
</channel-group>
44-
45-
<channel-group id="meter1" typeId="meter">
46-
<label>@text/channel-group-type.shelly.meter1.label</label>
47-
</channel-group>
48-
<channel-group id="meter2" typeId="meter">
49-
<label>@text/channel-group-type.shelly.meter2.label</label>
50-
</channel-group>
51-
<channel-group id="meter3" typeId="meter">
52-
<label>@text/channel-group-type.shelly.meter3.label</label>
53-
</channel-group>
54-
<channel-group id="meter4" typeId="meter">
55-
<label>@text/channel-group-type.shelly.meter4.label</label>
56-
</channel-group>
19+
<channel-group id="channel1" typeId="rgbw2Channel">
20+
<label>@text/channel-group-type.shelly.rgbw2Channel1.label</label>
21+
</channel-group>
22+
<channel-group id="channel2" typeId="rgbw2Channel">
23+
<label>@text/channel-group-type.shelly.rgbw2Channel2.label</label>
24+
</channel-group>
25+
<channel-group id="channel3" typeId="rgbw2Channel">
26+
<label>@text/channel-group-type.shelly.rgbw2Channel3.label</label>
27+
</channel-group>
28+
<channel-group id="channel4" typeId="rgbw2Channel">
29+
<label>@text/channel-group-type.shelly.rgbw2Channel4.label</label>
30+
</channel-group>
31+
32+
<channel-group id="status1" typeId="ixChannel">
33+
<label>@text/channel-group-type.shelly.iXChannel1.label</label>
34+
</channel-group>
35+
<channel-group id="status2" typeId="ixChannel">
36+
<label>@text/channel-group-type.shelly.iXChannel2.label</label>
37+
</channel-group>
38+
<channel-group id="status3" typeId="ixChannel">
39+
<label>@text/channel-group-type.shelly.iXChannel3.label</label>
40+
</channel-group>
41+
<channel-group id="status4" typeId="ixChannel">
42+
<label>@text/channel-group-type.shelly.iXChannel4.label</label>
43+
</channel-group>
44+
45+
<channel-group id="meter1" typeId="meter">
46+
<label>@text/channel-group-type.shelly.meter1.label</label>
47+
</channel-group>
48+
<channel-group id="meter2" typeId="meter">
49+
<label>@text/channel-group-type.shelly.meter2.label</label>
50+
</channel-group>
51+
<channel-group id="meter3" typeId="meter">
52+
<label>@text/channel-group-type.shelly.meter3.label</label>
53+
</channel-group>
54+
<channel-group id="meter4" typeId="meter">
55+
<label>@text/channel-group-type.shelly.meter4.label</label>
56+
</channel-group>
5757

5858
</channel-groups>
5959

@@ -67,59 +67,59 @@
6767
<category>Lightbulb</category>
6868
<semantic-equipment-tag>Lightbulb</semantic-equipment-tag>
6969
<channel-groups>
70-
<channel-group id="device" typeId="deviceStatus"/>
70+
<channel-group id="device" typeId="deviceStatus"/>
7171

7272
<channel-group id="control" typeId="rgbwpmColorControl"/>
7373
<channel-group id="color" typeId="colorSettingsRGBWpm"/>
7474
<channel-group id="white" typeId="whiteSettings"/>
7575

76-
<channel-group id="channel1" typeId="rgbw2Channel">
77-
<label>@text/channel-group-type.shelly.rgbw2Channel1.label</label>
78-
</channel-group>
79-
<channel-group id="channel2" typeId="rgbw2Channel">
80-
<label>@text/channel-group-type.shelly.rgbw2Channel2.label</label>
81-
</channel-group>
82-
<channel-group id="channel3" typeId="rgbw2Channel">
83-
<label>@text/channel-group-type.shelly.rgbw2Channel3.label</label>
84-
</channel-group>
85-
<channel-group id="channel4" typeId="rgbw2Channel">
86-
<label>@text/channel-group-type.shelly.rgbw2Channel4.label</label>
87-
</channel-group>
88-
<channel-group id="channel5" typeId="rgbw2Channel">
89-
<label>@text/channel-group-type.shelly.rgbw2Channel4.label</label>
90-
</channel-group>
91-
92-
<channel-group id="status1" typeId="ixChannel">
93-
<label>@text/channel-group-type.shelly.iXChannel1.label</label>
94-
</channel-group>
95-
<channel-group id="status2" typeId="ixChannel">
96-
<label>@text/channel-group-type.shelly.iXChannel2.label</label>
97-
</channel-group>
98-
<channel-group id="status3" typeId="ixChannel">
99-
<label>@text/channel-group-type.shelly.iXChannel3.label</label>
100-
</channel-group>
101-
<channel-group id="status4" typeId="ixChannel">
102-
<label>@text/channel-group-type.shelly.iXChannel4.label</label>
103-
</channel-group>
104-
<channel-group id="status5" typeId="ixChannel">
105-
<label>@text/channel-group-type.shelly.iXChannel4.label</label>
106-
</channel-group>
107-
108-
<channel-group id="meter1" typeId="meter">
109-
<label>@text/channel-group-type.shelly.meter1.label</label>
110-
</channel-group>
111-
<channel-group id="meter2" typeId="meter">
112-
<label>@text/channel-group-type.shelly.meter2.label</label>
113-
</channel-group>
114-
<channel-group id="meter3" typeId="meter">
115-
<label>@text/channel-group-type.shelly.meter3.label</label>
116-
</channel-group>
117-
<channel-group id="meter4" typeId="meter">
118-
<label>@text/channel-group-type.shelly.meter4.label</label>
119-
</channel-group>
120-
<channel-group id="meter5" typeId="meter">
121-
<label>@text/channel-group-type.shelly.meter4.label</label>
122-
</channel-group>
76+
<channel-group id="channel1" typeId="rgbw2Channel">
77+
<label>@text/channel-group-type.shelly.rgbw2Channel1.label</label>
78+
</channel-group>
79+
<channel-group id="channel2" typeId="rgbw2Channel">
80+
<label>@text/channel-group-type.shelly.rgbw2Channel2.label</label>
81+
</channel-group>
82+
<channel-group id="channel3" typeId="rgbw2Channel">
83+
<label>@text/channel-group-type.shelly.rgbw2Channel3.label</label>
84+
</channel-group>
85+
<channel-group id="channel4" typeId="rgbw2Channel">
86+
<label>@text/channel-group-type.shelly.rgbw2Channel4.label</label>
87+
</channel-group>
88+
<channel-group id="channel5" typeId="rgbw2Channel">
89+
<label>@text/channel-group-type.shelly.rgbw2Channel4.label</label>
90+
</channel-group>
91+
92+
<channel-group id="status1" typeId="ixChannel">
93+
<label>@text/channel-group-type.shelly.iXChannel1.label</label>
94+
</channel-group>
95+
<channel-group id="status2" typeId="ixChannel">
96+
<label>@text/channel-group-type.shelly.iXChannel2.label</label>
97+
</channel-group>
98+
<channel-group id="status3" typeId="ixChannel">
99+
<label>@text/channel-group-type.shelly.iXChannel3.label</label>
100+
</channel-group>
101+
<channel-group id="status4" typeId="ixChannel">
102+
<label>@text/channel-group-type.shelly.iXChannel4.label</label>
103+
</channel-group>
104+
<channel-group id="status5" typeId="ixChannel">
105+
<label>@text/channel-group-type.shelly.iXChannel4.label</label>
106+
</channel-group>
107+
108+
<channel-group id="meter1" typeId="meter">
109+
<label>@text/channel-group-type.shelly.meter1.label</label>
110+
</channel-group>
111+
<channel-group id="meter2" typeId="meter">
112+
<label>@text/channel-group-type.shelly.meter2.label</label>
113+
</channel-group>
114+
<channel-group id="meter3" typeId="meter">
115+
<label>@text/channel-group-type.shelly.meter3.label</label>
116+
</channel-group>
117+
<channel-group id="meter4" typeId="meter">
118+
<label>@text/channel-group-type.shelly.meter4.label</label>
119+
</channel-group>
120+
<channel-group id="meter5" typeId="meter">
121+
<label>@text/channel-group-type.shelly.meter4.label</label>
122+
</channel-group>
123123

124124
</channel-groups>
125125

‎bundles/org.openhab.binding.shelly/src/test/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreatorTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,13 @@ private static Stream<Arguments> provideTestCasesForGetThingUIDReturnsThingUidAc
105105

106106
// Shelly Plus
107107
Arguments.of("shelly3em63g3-" + DEVICE_ID, "", THING_TYPE_SHELLYPLUS3EM63),
108-
Arguments.of("shellyplusrgbw-" + DEVICE_ID, "", "", THING_TYPE_SHELLYPLUSRGBWPM),
109-
Arguments.of("shellyplusrgbw-" + DEVICE_ID, "", "", THING_TYPE_SHELLYPLUSRGBWPM),
108+
Arguments.of("shellyplusrgbwpm-" + DEVICE_ID, "", THING_TYPE_SHELLYPLUSRGBWPM),
110109

111110
// Shelly Pro
112111
Arguments.of("shellypro3em-" + DEVICE_ID, "", THING_TYPE_SHELLYPRO3EM),
113112
Arguments.of("shellypro3em3ct63-" + DEVICE_ID, "", THING_TYPE_SHELLYPRO3EM63),
114113
Arguments.of("shellypro3em400-" + DEVICE_ID, "", THING_TYPE_SHELLYPRO3EM400), //
115-
Arguments.of("shellyprorgbw-" + DEVICE_ID, "", "", THING_TYPE_SHELLYPRORGBWPM),
114+
Arguments.of("shellyprorgbwpm-" + DEVICE_ID, "", THING_TYPE_SHELLYPRORGBWPM),
116115

117116
// Shelly BLU
118117
Arguments.of("shellyblubutton-" + DEVICE_ID, "", THING_TYPE_SHELLYBLUBUTTON), //

0 commit comments

Comments
 (0)