Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify assertions #3996

Merged
merged 3 commits into from
Jan 3, 2024
Merged

Simplify assertions #3996

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75e6f94
Simplify assertions
wborn Jan 2, 2024
ebc612e
Improve testTokenNotExpiredEvenWithBuffer message
wborn Jan 3, 2024
5396ee9
Improve testTokenNotExpiredEvenWithBuffer message
wborn Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../org/openhab/core/automation/thingsupport/AnnotatedThingActionModuleTypeProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public void testMultiServiceAnnotationActions() {
assertEquals(ACTION_INPUT1_DEFAULT_VALUE, in.getDefaultValue());
assertEquals(ACTION_INPUT1_DESCRIPTION, in.getDescription());
assertEquals(ACTION_INPUT1_REFERENCE, in.getReference());
assertEquals(true, in.isRequired());
assertTrue(in.isRequired());
assertEquals("Item", in.getType());

Set<String> inputTags = in.getTags();
Expand Down
12 changes: 6 additions & 6 deletions ....automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@ public void testModuleInputResolving() {
@Test
public void testSplitReferenceToTokens() {
assertNull(ReferenceResolver.splitReferenceToTokens(null));
assertTrue(ReferenceResolver.splitReferenceToTokens("").length == 0);
assertEquals(0, ReferenceResolver.splitReferenceToTokens("").length);
final String[] referenceTokens = ReferenceResolver
.splitReferenceToTokens(".module.array[\".na[m}.\"e\"][1].values1");
assertTrue("module".equals(referenceTokens[0]));
assertTrue("array".equals(referenceTokens[1]));
assertTrue(".na[m}.\"e".equals(referenceTokens[2]));
assertTrue("1".equals(referenceTokens[3]));
assertTrue("values1".equals(referenceTokens[4]));
assertEquals("module", referenceTokens[0]);
assertEquals("array", referenceTokens[1]);
assertEquals(".na[m}.\"e", referenceTokens[2]);
assertEquals("1", referenceTokens[3]);
assertEquals("values1", referenceTokens[4]);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.test/src/test/java/org/openhab/core/test/java/JavaTestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void waitForAssertShouldRunAfterLastCallWhenAssertionSucceeds() {
public void waitForAssertShouldRunAfterLastCallWhenAssertionFails() {
Runnable afterLastCall = mock(Runnable.class);
try {
javaTest.waitForAssert(() -> assertTrue(false), null, afterLastCall, 100, 50);
javaTest.waitForAssert(() -> fail(), null, afterLastCall, 100, 50);
} catch (final AssertionError ex) {
}
verify(afterLastCall, times(1)).run();
Expand Down
2 changes: 1 addition & 1 deletion ...enhab.core/src/test/java/org/openhab/core/auth/client/oauth2/AccessTokenResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ public void testTokenNotExpiredEvenWithBuffer() {
// token has a life time of 60 seconds
token.setExpiresIn(60);

assertTrue(!token.isExpired(Instant.now(), 10), "Token should have been expired due to buffer");
assertFalse(token.isExpired(Instant.now(), 10), "Token should have been expired due to buffer");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the test and the message a contradiction? We test isExpired == false and the failure message says the token should have expired?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the text. I think it was copied from testTokenExpiredDueToBuffer to testTokenNotExpiredEvenWithBuffer

}
}
8 changes: 4 additions & 4 deletions bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void simpleLRUPutAndGetTest() throws IOException {
LRUMediaCacheEntry<MetadataSample> cacheEntry = new LRUMediaCacheEntry<>("key1");
lruCache.put(cacheEntry);
assertEquals(cacheEntry, lruCache.cachedResults.get("key1"));
assertEquals(null, lruCache.cachedResults.get("key2"));
assertNull(lruCache.cachedResults.get("key2"));
}

/**
Expand Down Expand Up @@ -121,15 +121,15 @@ public void putAndGetAndEvictionOrderLRUTest() throws IOException {
lruCache.makeSpace();
// cacheEntry1 should be evicted now (size limit is 10, and effective size is 12 when we try to put the
// cacheEntry4)
assertEquals(null, lruCache.cachedResults.get("key1"));
assertNull(lruCache.cachedResults.get("key1"));

// getting cacheEntry2 will put it in head, cacheEntry3 is now tail
assertEquals(cacheEntry2, lruCache.cachedResults.get("key2"));

// putting again cacheEntry1 should expel tail, which is cacheEntry3
lruCache.cachedResults.put(cacheEntry1.getKey(), cacheEntry1);
lruCache.makeSpace();
assertEquals(null, lruCache.cachedResults.get("key3"));
assertNull(lruCache.cachedResults.get("key3"));
}

/**
Expand Down Expand Up @@ -201,7 +201,7 @@ public void putExistingResultLRUTest() throws IOException {
lruCache.makeSpace();

// key2 should be expelled now
assertEquals(null, lruCache.cachedResults.get("key2"));
assertNull(lruCache.cachedResults.get("key2"));

// key1 and key3 are a hit
assertEquals(cacheEntry, lruCache.cachedResults.get("key1"));
Expand Down
8 changes: 4 additions & 4 deletions ...les/org.openhab.core/src/test/java/org/openhab/core/internal/items/ExpireManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,23 +349,23 @@ void testExpireConfig() {
cfg = new ExpireManager.ExpireConfig(testItem, "1h,15 °C", Map.of());
assertEquals(Duration.ofHours(1), cfg.duration);
assertEquals(new QuantityType<Temperature>("15 °C"), cfg.expireState);
assertEquals(null, cfg.expireCommand);
assertNull(cfg.expireCommand);

testItem = new StringItem(ITEMNAME);
cfg = new ExpireManager.ExpireConfig(testItem, "1h,NULL", Map.of());
assertEquals(Duration.ofHours(1), cfg.duration);
assertEquals(UnDefType.NULL, cfg.expireState);
assertEquals(null, cfg.expireCommand);
assertNull(cfg.expireCommand);

cfg = new ExpireManager.ExpireConfig(testItem, "1h,'NULL'", Map.of());
assertEquals(Duration.ofHours(1), cfg.duration);
assertEquals(new StringType("NULL"), cfg.expireState);
assertEquals(null, cfg.expireCommand);
assertNull(cfg.expireCommand);

cfg = new ExpireManager.ExpireConfig(testItem, "1h,'UNDEF'", Map.of());
assertEquals(Duration.ofHours(1), cfg.duration);
assertEquals(new StringType("UNDEF"), cfg.expireState);
assertEquals(null, cfg.expireCommand);
assertNull(cfg.expireCommand);
}

private Metadata config(String metadata) {
Expand Down
4 changes: 2 additions & 2 deletions ...penhab.core/src/test/java/org/openhab/core/internal/items/ItemStateConverterImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.*;

import java.util.Locale;
Expand Down Expand Up @@ -88,7 +88,7 @@ public void testNoConversion(Locale locale) {
State originalState = new DecimalType(12.34);
State state = itemStateConverter.convertToAcceptedState(originalState, item);

assertTrue(originalState == state);
assertSame(originalState, state);
}

@ParameterizedTest
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/HSBTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void testConversionToPercentType() {
@Test
public void testConversionToPointType() {
// should not be possible => null
assertEquals(null, new HSBType("100,100,100").as(PointType.class));
assertNull(new HSBType("100,100,100").as(PointType.class));
}

@Test
Expand Down Expand Up @@ -203,7 +203,7 @@ public void testCloseTo() {
assertDoesNotThrow(() -> hsb1.closeTo(hsb2, 0.1));

assertTrue(hsb1.closeTo(hsb2, 0.01));
assertTrue(!hsb1.closeTo(hsb3, 0.01));
assertFalse(hsb1.closeTo(hsb3, 0.01));
assertTrue(hsb1.closeTo(hsb3, 0.5));
}
}
2 changes: 1 addition & 1 deletion bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PointTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public void testConstructorToString() {
// Ensure that constructor and toString are consistent
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=467612#c17
PointType point3 = PointType.valueOf("-100,200");
assertTrue(point3.equals(PointType.valueOf(point3.toString())));
assertEquals(point3, PointType.valueOf(point3.toString()));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public void testConvertionFromDimensionless() {
QuantityType<?> dt2 = QuantityType.valueOf("2");
QuantityType<?> dt3 = dt2.toUnit("m");
// Inconvertible units
assertTrue(dt3 == null);
assertNull(dt3);
}

@Test
Expand Down Expand Up @@ -343,7 +343,7 @@ public void testConversionToPercentType(Locale locale) {
new QuantityType<>(0.1, Units.RADIAN).as(PercentType.class));

// incompatible units
assertEquals(null, new QuantityType<>("0.5 m").as(PercentType.class));
assertNull(new QuantityType<>("0.5 m").as(PercentType.class));
}

@ParameterizedTest
Expand Down
8 changes: 4 additions & 4 deletions bundles/org.openhab.core/src/test/java/org/openhab/core/util/StringUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class StringUtilsTest {
@Test
public void chompTest() {
assertEquals("", StringUtils.chomp(""));
assertEquals(null, StringUtils.chomp(null));
assertNull(StringUtils.chomp(null));
assertEquals("abc ", StringUtils.chomp("abc \r"));
assertEquals("abc", StringUtils.chomp("abc\n"));
assertEquals("abc", StringUtils.chomp("abc\r\n"));
Expand All @@ -43,7 +43,7 @@ public void chompTest() {

@Test
public void escapeXmlTest() {
assertEquals(null, StringUtils.escapeXml(null));
assertNull(StringUtils.escapeXml(null));
assertEquals(" ", StringUtils.escapeXml(" "));
assertEquals("invalidxml", StringUtils.escapeXml("invalidxml"));
assertEquals("&lt;xmlExample&gt;&amp;&lt;/xmlExample&gt;", StringUtils.escapeXml("<xmlExample>&</xmlExample>"));
Expand All @@ -55,7 +55,7 @@ public void escapeXmlTest() {

@Test
public void capitalizeTest() {
assertEquals(null, StringUtils.capitalize(null));
assertNull(StringUtils.capitalize(null));
assertEquals(" ", StringUtils.capitalize(" "));
assertEquals("Cat", StringUtils.capitalize("cat"));
assertEquals("CAt", StringUtils.capitalize("cAt"));
Expand All @@ -64,7 +64,7 @@ public void capitalizeTest() {

@Test
public void capitalizeAllWordsTest() {
assertEquals(null, StringUtils.capitalizeByUnderscore(null));
assertNull(StringUtils.capitalizeByUnderscore(null));
assertEquals("Openhab_Is_Cool", StringUtils.capitalizeByUnderscore("openHAB_is_cool"));
assertEquals("Foobar_Example", StringUtils.capitalizeByUnderscore("foobar_Example"));
assertEquals("'another_Test'", StringUtils.capitalizeByUnderscore("'another_test'"));
Expand Down
28 changes: 14 additions & 14 deletions ...scovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,9 +905,9 @@ public void assertThatApproveAddsAllPropertiesOfDiscoveryResultToThingProperties
Thing approvedThing = inbox.approve(testThing.getUID(), testThingLabel, null);
Thing addedThing = registry.get(testThing.getUID());

assertFalse(addedThing == null);
assertFalse(approvedThing == null);
assertTrue(approvedThing.equals(addedThing));
assertNotNull(addedThing);
assertNotNull(approvedThing);
assertEquals(approvedThing, addedThing);
discoveryResultProperties.keySet().forEach(key -> {
String thingProperty = addedThing.getProperties().get(key);
String descResultParam = String.valueOf(discoveryResultProperties.get(key));
Expand Down Expand Up @@ -946,9 +946,9 @@ public void assertThatApproveSetsTheExplicitlyGivenThingId() {
Thing approvedThing = inbox.approve(testThing.getUID(), null, testId2);
Thing addedThing = registry.get(test2Thing.getUID());

assertFalse(addedThing == null);
assertFalse(approvedThing == null);
assertTrue(approvedThing.equals(addedThing));
assertNotNull(addedThing);
assertNotNull(approvedThing);
assertEquals(approvedThing, addedThing);
}

@Test
Expand Down Expand Up @@ -993,24 +993,24 @@ public Collection<ConfigDescription> getConfigDescriptions(@Nullable Locale loca

Thing approvedThing = inbox.approve(testThing.getUID(), testThingLabel, null);
Thing addedThing = registry.get(testThing.getUID());
assertTrue(approvedThing.equals(addedThing));
assertFalse(addedThing == null);
assertEquals(approvedThing, addedThing);
assertNotNull(addedThing);
for (String key : keysInConfigDescription) {
Object thingConfItem = addedThing.getConfiguration().get(key);
Object descResultParam = discoveryResultProperties.get(key);
if (descResultParam instanceof Number) {
descResultParam = new BigDecimal(descResultParam.toString());
}
assertFalse(thingConfItem == null);
assertFalse(descResultParam == null);
assertTrue(thingConfItem.equals(descResultParam));
assertNotNull(thingConfItem);
assertNotNull(descResultParam);
assertEquals(thingConfItem, descResultParam);
}
for (String key : keysNotInConfigDescription) {
String thingProperty = addedThing.getProperties().get(key);
String descResultParam = String.valueOf(discoveryResultProperties.get(key));
assertFalse(thingProperty == null);
assertFalse(descResultParam == null);
assertTrue(thingProperty.equals(descResultParam));
assertNotNull(thingProperty);
assertNotNull(descResultParam);
assertEquals(thingProperty, descResultParam);
}

services.forEach(this::unregisterService);
Expand Down
8 changes: 4 additions & 4 deletions ...src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResourceOSGITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ public void beforeEach() throws Exception {
public void assertThatApproveApprovesThingsWhichAreInTheInbox() {
when(inboxMock.approve(any(), any(), any())).thenReturn(testThing);

Response reponse = resource.approve(null, testThing.getUID().toString(), testThingLabel, null);
assertTrue(reponse.getStatusInfo().getStatusCode() == Status.OK.getStatusCode());
Response response = resource.approve(null, testThing.getUID().toString(), testThingLabel, null);
assertEquals(response.getStatusInfo().getStatusCode(), Status.OK.getStatusCode());
}

@Test
public void assertThatApproveDoesntApproveThingsWhichAreNotInTheInbox() {
when(inboxMock.approve(any(), any(), any())).thenThrow(new IllegalArgumentException());

Response reponse = resource.approve(null, testThing.getUID().toString(), testThingLabel, null);
assertTrue(reponse.getStatusInfo().getStatusCode() == Status.NOT_FOUND.getStatusCode());
Response response = resource.approve(null, testThing.getUID().toString(), testThingLabel, null);
assertEquals(response.getStatusInfo().getStatusCode(), Status.NOT_FOUND.getStatusCode());
}
}
2 changes: 1 addition & 1 deletion itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ItemRegistryImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ public void assertItemIsBeingDisposedOnRemove() {

ArgumentCaptor<Item> itemCaptor = ArgumentCaptor.forClass(Item.class);
verify(registryChangeListener).removed(itemCaptor.capture());
assertTrue(itemCaptor.getValue() == item);
assertSame(itemCaptor.getValue(), item);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions .../org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/ThingChannelsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ public void testThingChannelOrder() {
resultChannels = thing.getChannels();
assertEquals(CHANNEL_IDS.size(), resultChannels.size());
for (int i = 0; i < CHANNEL_IDS.size(); i++) {
assertTrue(CHANNEL_IDS.get(i).equals(resultChannels.get(i).getUID().getId()));
assertEquals(CHANNEL_IDS.get(i), resultChannels.get(i).getUID().getId());
}

// test #2: serialize/deserialize the thing via a DTO, and compare the resulting channel order
resultChannels = ThingDTOMapper.map(ThingDTOMapper.map(thing), false).getChannels();
assertEquals(CHANNEL_IDS.size(), resultChannels.size());
for (int i = 0; i < CHANNEL_IDS.size(); i++) {
assertTrue(CHANNEL_IDS.get(i).equals(resultChannels.get(i).getUID().getId()));
assertEquals(CHANNEL_IDS.get(i), resultChannels.get(i).getUID().getId());
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
Thing thing = thingRegistry.createThingOfType(expectedThingTypeUID, expectedThingUID, expectedBridgeUID,
expectedLabel, expectedConfiguration);
waitForAssert(() -> {
assertTrue(thingResultWrapper.get() != null);
assertNotNull(thingResultWrapper.get());
});

assertThat(thing, is(notNullValue()));
Expand Down