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
bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java
+5 -5
View File
@@ -98,17 +98,17 @@ public class ReferenceResolverUtilTest {
Module trigger = ModuleBuilder.createTrigger().withId("id1").withTypeUID("typeUID1")
.withConfiguration(new Configuration(MODULE_CONFIGURATION)).build();
ReferenceResolver.updateConfiguration(trigger.getConfiguration(), CONTEXT, logger);
assertEquals(trigger.getConfiguration(), new Configuration(EXPECTED_MODULE_CONFIGURATION));
assertEquals(new Configuration(EXPECTED_MODULE_CONFIGURATION), trigger.getConfiguration());
// test condition configuration.
Module condition = ModuleBuilder.createCondition().withId("id2").withTypeUID("typeUID2")
.withConfiguration(new Configuration(MODULE_CONFIGURATION)).build();
ReferenceResolver.updateConfiguration(condition.getConfiguration(), CONTEXT, logger);
assertEquals(condition.getConfiguration(), new Configuration(EXPECTED_MODULE_CONFIGURATION));
assertEquals(new Configuration(EXPECTED_MODULE_CONFIGURATION), condition.getConfiguration());
// test action configuration.
Module action = ModuleBuilder.createAction().withId("id3").withTypeUID("typeUID3")
.withConfiguration(new Configuration(MODULE_CONFIGURATION)).build();
ReferenceResolver.updateConfiguration(action.getConfiguration(), CONTEXT, logger);
assertEquals(action.getConfiguration(), new Configuration(EXPECTED_MODULE_CONFIGURATION));
assertEquals(new Configuration(EXPECTED_MODULE_CONFIGURATION), action.getConfiguration());
}
@Test
@@ -117,13 +117,13 @@ public class ReferenceResolverUtilTest {
Module condition = ModuleBuilder.createCondition().withId("id1").withTypeUID("typeUID1")
.withInputs(COMPOSITE_CHILD_MODULE_INPUTS_REFERENCES).build();
Map<String, Object> conditionContext = ReferenceResolver.getCompositeChildContext(condition, CONTEXT);
assertEquals(conditionContext, EXPECTED_COMPOSITE_CHILD_MODULE_CONTEXT);
assertEquals(EXPECTED_COMPOSITE_CHILD_MODULE_CONTEXT, conditionContext);
// test Composite child ModuleImpl(action) context
Module action = ModuleBuilder.createAction().withId("id2").withTypeUID("typeUID2")
.withInputs(COMPOSITE_CHILD_MODULE_INPUTS_REFERENCES).build();
assertEquals(EXPECTED_COMPOSITE_CHILD_MODULE_CONTEXT, conditionContext);
Map<String, Object> actionContext = ReferenceResolver.getCompositeChildContext(action, CONTEXT);
assertEquals(actionContext, EXPECTED_COMPOSITE_CHILD_MODULE_CONTEXT);
assertEquals(EXPECTED_COMPOSITE_CHILD_MODULE_CONTEXT, actionContext);
}
@Test
bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java
+2 -2
View File
@@ -331,8 +331,8 @@ public class MqttBrokerConnectionTests extends JavaTest {
public void setterGetterTests() {
MqttBrokerConnectionEx connection = new MqttBrokerConnectionEx("123.123.123.123", null, false, false,
"setterGetterTests");
assertEquals(connection.getHost(), "123.123.123.123", "URL getter");
assertEquals(connection.getPort(), 1883, "Name getter"); // Check for non-secure port
assertEquals("123.123.123.123", connection.getHost(), "URL getter");
assertEquals(1883, connection.getPort(), "Name getter"); // Check for non-secure port
assertFalse(connection.isSecure(), "Secure getter");
assertFalse(connection.isHostnameValidated(), "HostnameValidated getter");
assertEquals("setterGetterTests", connection.getClientId(), "ClientID getter");
bundles/org.openhab.core.model.script/src.moved/test/java/org/openhab/core/model/script/lib/NumberExtensionsTest.java
+10 -10
View File
@@ -253,7 +253,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_plus(x, y);
assertNotNull(result);
assertEquals(result, new BigDecimal(9));
assertEquals(new BigDecimal(9), result);
}
/**
@@ -267,7 +267,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_plus(x, y);
assertNotNull(result);
assertEquals(result, new BigDecimal(5));
assertEquals(new BigDecimal(5), result);
}
/**
@@ -281,7 +281,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_plus(x, y);
assertNotNull(result);
assertEquals(result, new BigDecimal(10));
assertEquals(new BigDecimal(10), result);
}
/**
@@ -294,7 +294,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_minus(x);
assertNotNull(result);
assertEquals(result, new BigDecimal(-2));
assertEquals(new BigDecimal(-2), result);
}
/**
@@ -320,7 +320,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_minus(x, y);
assertNotNull(result);
assertEquals(result, new BigDecimal(10 - 100));
assertEquals(new BigDecimal(10 - 100), result);
}
/**
@@ -334,7 +334,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_minus(x, y);
assertNotNull(result);
assertEquals(result, new BigDecimal(-100));
assertEquals(new BigDecimal(-100), result);
}
/**
@@ -348,7 +348,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_minus(x, y);
assertNotNull(result);
assertEquals(result, new BigDecimal(10));
assertEquals(new BigDecimal(10), result);
}
/**
@@ -362,7 +362,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_multiply(x, y);
assertNotNull(result);
assertEquals(result, new BigDecimal(20 * 30));
assertEquals(new BigDecimal(20 * 30), result);
}
/**
@@ -376,7 +376,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_multiply(x, y);
assertNotNull(result);
assertEquals(result, new BigDecimal(0));
assertEquals(new BigDecimal(0), result);
}
/**
@@ -390,7 +390,7 @@ public class NumberExtensionsTest {
BigDecimal result = NumberExtensions.operator_multiply(x, y);
assertNotNull(result);
assertEquals(result, new BigDecimal(0));
assertEquals(new BigDecimal(0), result);
}
/**
bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsMetadataProviderTest.java
+3 -3
View File
@@ -183,7 +183,7 @@ public class SemanticsMetadataProviderTest extends JavaTest {
Metadata metadata = Objects.requireNonNull(getMetadata(item));
assertEquals("Equipment_Door", metadata.getValue());
assertEquals(metadata.getConfiguration().get("hasLocation"), GROUP_ITEM_NAME);
assertEquals(GROUP_ITEM_NAME, metadata.getConfiguration().get("hasLocation"));
}
@Test
@@ -208,7 +208,7 @@ public class SemanticsMetadataProviderTest extends JavaTest {
Metadata metadata = Objects.requireNonNull(getMetadata(item));
assertEquals("Equipment_Door", oldMetadata.getValue());
assertEquals(metadata.getConfiguration().get("hasLocation"), GROUP_ITEM_NAME);
assertEquals(GROUP_ITEM_NAME, metadata.getConfiguration().get("hasLocation"));
}
@Test
@@ -228,7 +228,7 @@ public class SemanticsMetadataProviderTest extends JavaTest {
Metadata oldMetadata = Objects.requireNonNull(getMetadata(item));
assertEquals("Equipment_Door", oldMetadata.getValue());
assertEquals(oldMetadata.getConfiguration().get("hasLocation"), GROUP_ITEM_NAME);
assertEquals(GROUP_ITEM_NAME, oldMetadata.getConfiguration().get("hasLocation"));
when(itemRegistry.get(GROUP_ITEM_NAME)).thenReturn(null);
bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java
+12 -12
View File
@@ -107,10 +107,10 @@ public class JsonStorageTest extends JavaTest {
DummyObject dummy = objectStorage.get("DummyObject");
assertNotNull(dummy);
assertEquals(((BigDecimal) dummy.configuration.get("testShort")).scale(), 0);
assertEquals(((BigDecimal) dummy.configuration.get("testInt")).scale(), 0);
assertEquals(((BigDecimal) dummy.configuration.get("testLong")).scale(), 0);
assertEquals(((BigDecimal) dummy.configuration.get("testBigDecimal")).scale(), 0);
assertEquals(0, ((BigDecimal) dummy.configuration.get("testShort")).scale());
assertEquals(0, ((BigDecimal) dummy.configuration.get("testInt")).scale());
assertEquals(0, ((BigDecimal) dummy.configuration.get("testLong")).scale());
assertEquals(0, ((BigDecimal) dummy.configuration.get("testBigDecimal")).scale());
}
@SuppressWarnings("unchecked")
@@ -121,14 +121,14 @@ public class JsonStorageTest extends JavaTest {
DummyObject dummy = objectStorage.get("DummyObject");
assertNotNull(dummy);
assertEquals(((BigDecimal) dummy.configuration.get("testShort")).scale(), 0);
assertEquals(((BigDecimal) dummy.configuration.get("testInt")).scale(), 0);
assertEquals(((BigDecimal) dummy.configuration.get("testLong")).scale(), 0);
assertEquals(((BigDecimal) dummy.configuration.get("testBigDecimal")).scale(), 0);
assertEquals(((List<BigDecimal>) dummy.configuration.get("multiInt")).get(0).scale(), 0);
assertEquals(((List<BigDecimal>) dummy.configuration.get("multiInt")).get(1).scale(), 0);
assertEquals(((List<BigDecimal>) dummy.configuration.get("multiInt")).get(2).scale(), 0);
assertEquals(((BigDecimal) dummy.channels.get(0).configuration.get("testChildLong")).scale(), 0);
assertEquals(0, ((BigDecimal) dummy.configuration.get("testShort")).scale());
assertEquals(0, ((BigDecimal) dummy.configuration.get("testInt")).scale());
assertEquals(0, ((BigDecimal) dummy.configuration.get("testLong")).scale());
assertEquals(0, ((BigDecimal) dummy.configuration.get("testBigDecimal")).scale());
assertEquals(0, ((List<BigDecimal>) dummy.configuration.get("multiInt")).get(0).scale());
assertEquals(0, ((List<BigDecimal>) dummy.configuration.get("multiInt")).get(1).scale());
assertEquals(0, ((List<BigDecimal>) dummy.configuration.get("multiInt")).get(2).scale());
assertEquals(0, ((BigDecimal) dummy.channels.get(0).configuration.get("testChildLong")).scale());
}
@Test
bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/proxy/ProxyServletServiceTest.java
+12 -12
View File
@@ -147,7 +147,7 @@ public class ProxyServletServiceTest {
when(imageWidgetMock.getItem()).thenReturn(null);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_IMAGE_URL);
assertEquals(VALID_IMAGE_URL, uri.toString());
}
@Test
@@ -166,7 +166,7 @@ public class ProxyServletServiceTest {
when(imageWidgetMock.getItem()).thenReturn(ITEM_NAME_UNDEF_STATE);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_IMAGE_URL);
assertEquals(VALID_IMAGE_URL, uri.toString());
}
@Test
@@ -176,7 +176,7 @@ public class ProxyServletServiceTest {
when(imageWidgetMock.getItem()).thenReturn(ITEM_NAME_NULL_STATE);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_IMAGE_URL);
assertEquals(VALID_IMAGE_URL, uri.toString());
}
@Test
@@ -186,7 +186,7 @@ public class ProxyServletServiceTest {
when(imageWidgetMock.getItem()).thenReturn(ITEM_NAME_ON_STATE);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_IMAGE_URL);
assertEquals(VALID_IMAGE_URL, uri.toString());
}
@Test
@@ -196,7 +196,7 @@ public class ProxyServletServiceTest {
when(imageWidgetMock.getItem()).thenReturn(ITEM_NAME_INVALID_URL);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_IMAGE_URL);
assertEquals(VALID_IMAGE_URL, uri.toString());
}
@Test
@@ -206,7 +206,7 @@ public class ProxyServletServiceTest {
when(imageWidgetMock.getItem()).thenReturn(ITEM_NAME_VALID_IMAGE_URL);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), ITEM_VALID_IMAGE_URL);
assertEquals(ITEM_VALID_IMAGE_URL, uri.toString());
}
@Test
@@ -216,7 +216,7 @@ public class ProxyServletServiceTest {
when(videoWidgetMock.getItem()).thenReturn(null);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_VIDEO_URL);
assertEquals(VALID_VIDEO_URL, uri.toString());
}
@Test
@@ -235,7 +235,7 @@ public class ProxyServletServiceTest {
when(videoWidgetMock.getItem()).thenReturn(ITEM_NAME_UNDEF_STATE);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_VIDEO_URL);
assertEquals(VALID_VIDEO_URL, uri.toString());
}
@Test
@@ -245,7 +245,7 @@ public class ProxyServletServiceTest {
when(videoWidgetMock.getItem()).thenReturn(ITEM_NAME_NULL_STATE);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_VIDEO_URL);
assertEquals(VALID_VIDEO_URL, uri.toString());
}
@Test
@@ -255,7 +255,7 @@ public class ProxyServletServiceTest {
when(videoWidgetMock.getItem()).thenReturn(ITEM_NAME_ON_STATE);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_VIDEO_URL);
assertEquals(VALID_VIDEO_URL, uri.toString());
}
@Test
@@ -265,7 +265,7 @@ public class ProxyServletServiceTest {
when(videoWidgetMock.getItem()).thenReturn(ITEM_NAME_INVALID_URL);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), VALID_VIDEO_URL);
assertEquals(VALID_VIDEO_URL, uri.toString());
}
@Test
@@ -275,6 +275,6 @@ public class ProxyServletServiceTest {
when(videoWidgetMock.getItem()).thenReturn(ITEM_NAME_VALID_VIDEO_URL);
URI uri = service.uriFromRequest(requestMock);
assertNotNull(uri);
assertEquals(uri.toString(), ITEM_VALID_VIDEO_URL);
assertEquals(ITEM_VALID_VIDEO_URL, uri.toString());
}
}
bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheTest.java
Vendored
+4 -4
View File
@@ -279,13 +279,13 @@ public class LRUMediaCacheTest {
LRUMediaCacheEntry<MetadataSample> result1 = lruCache.cachedResults.get("key1");
assertNotNull(result1);
assertEquals(result1.getMetadata().getMeta2(), 1);
assertEquals(result1.getMetadata().getMeta1(), "text1");
assertEquals(1, result1.getMetadata().getMeta2());
assertEquals("text1", result1.getMetadata().getMeta1());
LRUMediaCacheEntry<MetadataSample> result2 = lruCache.cachedResults.get("key2");
assertNotNull(result2);
assertEquals(result2.getMetadata().getMeta1(), "text2");
assertEquals(result2.getMetadata().getMeta2(), 2);
assertEquals("text2", result2.getMetadata().getMeta1());
assertEquals(2, result2.getMetadata().getMeta2());
LRUMediaCacheEntry<MetadataSample> result3 = lruCache.cachedResults.get("key3");
assertNull(result3);
bundles/org.openhab.core/src/test/java/org/openhab/core/common/QueueingThreadPoolExecutorTest.java
+13 -13
View File
@@ -95,13 +95,13 @@ public class QueueingThreadPoolExecutorTest {
String poolName = "testQueuingTPEPoolSize2";
ThreadPoolExecutor pool = QueueingThreadPoolExecutor.createInstance(poolName, 2);
assertEquals(pool.getActiveCount(), 0);
assertEquals(0, pool.getActiveCount());
assertTrue(pool.allowsCoreThreadTimeOut());
assertEquals(pool.getCompletedTaskCount(), 0);
assertEquals(pool.getCorePoolSize(), 1);
assertEquals(pool.getMaximumPoolSize(), 2);
assertEquals(pool.getLargestPoolSize(), 0);
assertEquals(pool.getQueue().size(), 0);
assertEquals(0, pool.getCompletedTaskCount());
assertEquals(1, pool.getCorePoolSize());
assertEquals(2, pool.getMaximumPoolSize());
assertEquals(0, pool.getLargestPoolSize());
assertEquals(0, pool.getQueue().size());
// now expect that no threads have been created
assertFalse(areThreadsFromPoolRunning(poolName));
@@ -148,7 +148,7 @@ public class QueueingThreadPoolExecutorTest {
// pool 2 tasks, threads must exist
pool.execute(createRunnable10s());
assertEquals(pool.getActiveCount(), 1);
assertEquals(1, pool.getActiveCount());
assertTrue(isPoolThreadActive(poolName, 1));
Thread t1 = getThread(poolName + "-1");
assertFalse(t1.isDaemon());
@@ -158,7 +158,7 @@ public class QueueingThreadPoolExecutorTest {
assertEquals(t1.getPriority(), prio1);
pool.execute(createRunnable10s());
assertEquals(pool.getActiveCount(), 2);
assertEquals(2, pool.getActiveCount());
assertTrue(isPoolThreadActive(poolName, 2));
Thread t2 = getThread(poolName + "-2");
assertFalse(t2.isDaemon());
@@ -170,17 +170,17 @@ public class QueueingThreadPoolExecutorTest {
// 2 more tasks, will be queued, no threads
pool.execute(createRunnable1s());
// as pool size is 2, no more active threads, will stay at 2
assertEquals(pool.getActiveCount(), 2);
assertEquals(2, pool.getActiveCount());
assertFalse(isPoolThreadActive(poolName, 3));
assertEquals(pool.getQueue().size(), 1);
assertEquals(1, pool.getQueue().size());
pool.execute(createRunnable1s());
assertEquals(pool.getActiveCount(), 2);
assertEquals(2, pool.getActiveCount());
assertFalse(isPoolThreadActive(poolName, 4));
assertEquals(pool.getQueue().size(), 2);
assertEquals(2, pool.getQueue().size());
// 0 are yet executed
assertEquals(pool.getCompletedTaskCount(), 0);
assertEquals(0, pool.getCompletedTaskCount());
// needs to wait CORE_POOL_TIMEOUT + 2sec-queue-thread + x until all
// threads are down again
bundles/org.openhab.core/src/test/java/org/openhab/core/internal/auth/UserRegistryImplTest.java
+5 -5
View File
@@ -98,11 +98,11 @@ public class UserRegistryImplTest {
registry.addUserSession(user, session1);
registry.addUserSession(user, session2);
registry.addUserSession(user, session3);
assertEquals(user.getSessions().size(), 3);
assertEquals(3, user.getSessions().size());
registry.removeUserSession(user, session3);
assertEquals(user.getSessions().size(), 2);
assertEquals(2, user.getSessions().size());
registry.clearSessions(user);
assertEquals(user.getSessions().size(), 0);
assertEquals(0, user.getSessions().size());
}
@Test
@@ -113,7 +113,7 @@ public class UserRegistryImplTest {
String token1 = registry.addUserApiToken(user, "token1", "scope1");
String token2 = registry.addUserApiToken(user, "token2", "scope2");
String token3 = registry.addUserApiToken(user, "token3", "scope3");
assertEquals(user.getApiTokens().size(), 3);
assertEquals(3, user.getApiTokens().size());
registry.authenticate(new UserApiTokenCredentials(token1));
registry.authenticate(new UserApiTokenCredentials(token2));
registry.authenticate(new UserApiTokenCredentials(token3));
@@ -123,6 +123,6 @@ public class UserRegistryImplTest {
user.getApiTokens().stream().filter(t -> "token2".equals(t.getName())).findAny().get());
registry.removeUserApiToken(user,
user.getApiTokens().stream().filter(t -> "token3".equals(t.getName())).findAny().get());
assertEquals(user.getApiTokens().size(), 0);
assertEquals(0, user.getApiTokens().size());
}
}
bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/CallItemTest.java
+4 -4
View File
@@ -32,13 +32,13 @@ public class CallItemTest {
CallItem callItem1 = new CallItem("testItem");
callItem1.setState(callType1);
assertEquals(callItem1.toString(),
"testItem (Type=CallItem, State=0699222222,0179999998, Label=null, Category=null)");
assertEquals("testItem (Type=CallItem, State=0699222222,0179999998, Label=null, Category=null)",
callItem1.toString());
callType1 = new StringListType("0699222222,0179999998");
callItem1.setState(callType1);
assertEquals(callItem1.toString(),
"testItem (Type=CallItem, State=0699222222,0179999998, Label=null, Category=null)");
assertEquals("testItem (Type=CallItem, State=0699222222,0179999998, Label=null, Category=null)",
callItem1.toString());
}
@Test
bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DimmerItemTest.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class DimmerItemTest {
final BigDecimal origin = new BigDecimal(25);
final DimmerItem item = createDimmerItem(new PercentType(origin));
final BigDecimal result = getState(item, PercentType.class);
assertEquals(origin.compareTo(result), 0);
assertEquals(0, origin.compareTo(result));
}
@Test
bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/LocationItemTest.java
+2 -2
View File
@@ -37,10 +37,10 @@ public class LocationItemTest {
locationBerlin.setState(pointBerlin);
DecimalType distance = locationParis.distanceFrom(locationParis);
assertEquals(distance.intValue(), 0);
assertEquals(0, distance.intValue());
double parisBerlin = locationParis.distanceFrom(locationBerlin).doubleValue();
assertEquals(parisBerlin, 878400, 50);
assertEquals(878400, parisBerlin, 50);
}
@Test
bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PointTypeTest.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class PointTypeTest {
assertEquals(48.856614, pointParis.getLatitude().doubleValue(), 0.0000001);
double gravParis = pointParis.getGravity().doubleValue();
assertEquals(gravParis, 9.809, 0.001);
assertEquals(9.809, gravParis, 0.001);
}
@Test
bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java
+5 -5
View File
@@ -214,20 +214,20 @@ public class QuantityTypeTest {
public void testUnits() {
QuantityType<Length> dt2 = new QuantityType<>("2 m");
// Check that the unit has correctly been identified
assertEquals(dt2.getDimension(), UnitDimension.LENGTH);
assertEquals(dt2.getUnit(), SIUnits.METRE);
assertEquals(UnitDimension.LENGTH, dt2.getDimension());
assertEquals(SIUnits.METRE, dt2.getUnit());
assertEquals("2 m", dt2.toString());
QuantityType<Length> dt1 = new QuantityType<>("2.1cm");
// Check that the unit has correctly been identified
assertEquals(dt1.getDimension(), UnitDimension.LENGTH);
assertEquals(dt1.getUnit(), CENTI(SIUnits.METRE));
assertEquals(UnitDimension.LENGTH, dt1.getDimension());
assertEquals(CENTI(SIUnits.METRE), dt1.getUnit());
assertEquals("2.1 cm", dt1.toString());
assertEquals(dt1.intValue(), dt2.intValue());
QuantityType<Length> dt3 = new QuantityType<>("200cm");
assertEquals(dt3.compareTo(dt2), 0);
assertEquals(0, dt3.compareTo(dt2));
assertTrue(dt3.equals(dt2));
QuantityType dt4 = new QuantityType<>("2kg");
bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringListTypeTest.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class StringListTypeTest {
StringListType call2 = new StringListType("0699222222,0179999998");
assertEquals(call1.getValue(origIdx), call2.getValue(destIdx));
assertEquals(call2.toString(), "0699222222,0179999998");
assertEquals("0699222222,0179999998", call2.toString());
}
@Test
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))