demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix assertEquals order (#3995)

Browse Source 
The first parameter should be the expected value and the second parameter the actual value.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2024-01-02 22:27:53 +01:00
committed by GitHub
parent 896b05e177
commit dc5f50db63
18 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ManagedItemProviderOSGiTest.java
+5 -5
View File
@@ -309,7 +309,7 @@ public class ManagedItemProviderOSGiTest extends JavaOSGiTest {
GroupItem result1 = (GroupItem) itemProvider.remove("GroupItem");
assertThat(result1.getName(), is("GroupItem"));
assertEquals(result1.getFunction().getClass(), Avg.class);
assertEquals(Avg.class, result1.getFunction().getClass());
assertThat(itemProvider.getAll().size(), is(0));
}
@@ -325,11 +325,11 @@ public class ManagedItemProviderOSGiTest extends JavaOSGiTest {
GroupItem item2 = new GroupItem("GroupItem2", new NumberItem("Number"), function2);
assertThat(item1.getName(), is("GroupItem1"));
assertEquals(item1.getFunction().getClass(), And.class);
assertEquals(And.class, item1.getFunction().getClass());
assertThat(item1.getFunction().getParameters(), is(new State[] { OnOffType.ON, OnOffType.OFF }));
assertThat(item2.name, is("GroupItem2"));
assertEquals(item2.getFunction().getClass(), Sum.class);
assertEquals(Sum.class, item2.getFunction().getClass());
assertThat(item2.getFunction().getParameters(), is(new State[0]));
itemProvider.add(item1);
@@ -342,11 +342,11 @@ public class ManagedItemProviderOSGiTest extends JavaOSGiTest {
GroupItem result2 = (GroupItem) itemProvider.remove("GroupItem2");
assertThat(result1.getName(), is("GroupItem1"));
assertEquals(result1.getFunction().getClass(), And.class);
assertEquals(And.class, result1.getFunction().getClass());
assertThat(result1.function.getParameters(), is(new State[] { OnOffType.ON, OnOffType.OFF }));
assertThat(result2.getName(), is("GroupItem2"));
assertEquals(result2.getFunction().getClass(), Sum.class);
assertEquals(Sum.class, result2.getFunction().getClass());
assertThat(result2.function.getParameters(), is(new State[0]));
assertThat(itemProvider.getAll().size(), is(0));
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProviderOSGiTest.java
+1 -1
View File
@@ -311,7 +311,7 @@ public class ChannelCommandDescriptionProviderOSGiTest extends JavaOSGiTest {
@Nullable CommandDescription originalCommandDescription, @Nullable Locale locale) {
String id = channel.getUID().getIdWithoutGroup();
if ("7_2".equals(id)) {
assertEquals(channel.getChannelTypeUID(), CHANNEL_TYPE_UID);
assertEquals(CHANNEL_TYPE_UID, channel.getChannelTypeUID());
return newCommand;
}
return null;
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java
+6 -6
View File
@@ -343,12 +343,12 @@ public class ChannelStateDescriptionProviderOSGiTest extends JavaOSGiTest {
assertEquals(2, opts.size());
final StateOption opt0 = opts.get(0);
assertNotNull(opt0);
assertEquals(opt0.getValue(), "value0");
assertEquals(opt0.getLabel(), "label0");
assertEquals("value0", opt0.getValue());
assertEquals("label0", opt0.getLabel());
final StateOption opt1 = opts.get(1);
assertNotNull(opt1);
assertEquals(opt1.getValue(), "value1");
assertEquals(opt1.getLabel(), "label1");
assertEquals("value1", opt1.getValue());
assertEquals("label1", opt1.getLabel());
item = itemRegistry.getItem("TestItem7_2");
assertEquals(CoreItemFactory.NUMBER, item.getType());
@@ -426,10 +426,10 @@ public class ChannelStateDescriptionProviderOSGiTest extends JavaOSGiTest {
@Nullable Locale locale) {
String id = channel.getUID().getIdWithoutGroup();
if ("7_1".equals(id)) {
assertEquals(channel.getChannelTypeUID(), CHANNEL_TYPE_7_UID);
assertEquals(CHANNEL_TYPE_7_UID, channel.getChannelTypeUID());
return newState;
} else if ("7_2".equals(id)) {
assertEquals(channel.getChannelTypeUID(), CHANNEL_TYPE_7_UID);
assertEquals(CHANNEL_TYPE_7_UID, channel.getChannelTypeUID());
StateDescriptionFragmentBuilder builder = (original == null) ? StateDescriptionFragmentBuilder.create()
: StateDescriptionFragmentBuilder.create(original);
return builder.withMinimum(original.getMinimum().add(BigDecimal.ONE))