From 889c64c04cdb43cb35b3882f5afc1813951ee4ea Mon Sep 17 00:00:00 2001 From: Yug Vajani <yvajani2@illinois.edu> Date: Thu, 5 Dec 2024 14:06:50 -0600 Subject: [PATCH] Fixed a few non deterministic tests in the repository Signed-off-by: Yug Vajani <yvajani2@illinois.edu> --- .../discovery/inbox/events/InboxEventFactoryTest.java | 3 ++- .../openhab/core/io/rest/Stream2JSONInputStreamTest.java | 7 +++++-- .../core/thing/link/events/LinkEventFactoryTest.java | 5 +++-- .../openhab/core/items/events/ItemEventFactoryTest.java | 5 +++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java index eb233dbe2eb..4d5d3da9b10 100644 --- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java +++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java @@ -25,6 +25,7 @@ import org.openhab.core.thing.ThingUID; import com.google.gson.Gson; +import com.google.gson.JsonParser; /** * {@link InboxEventFactoryTest} tests the {@link InboxEventFactory}. @@ -71,7 +72,7 @@ public void inboxEventFactoryCreatesInboxAddedEventCorrectly() { assertThat(event.getType(), is(INBOX_ADDED_EVENT_TYPE)); assertThat(event.getTopic(), is(INBOX_ADDED_EVENT_TOPIC)); - assertThat(event.getPayload(), is(INBOX_ADDED_EVENT_PAYLOAD)); + assertThat(JsonParser.parseString(event.getPayload()), is(JsonParser.parseString(INBOX_ADDED_EVENT_PAYLOAD))); assertThat(event.getDiscoveryResult(), not(nullValue())); assertThat(event.getDiscoveryResult().thingUID, is(THING_UID.getAsString())); } diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java index e78632602a2..3e4c129f8dc 100644 --- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java +++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java @@ -27,6 +27,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonParser; /** * Tests {@link Stream2JSONInputStream}. @@ -52,7 +53,8 @@ public void shouldStreamSingleObjectToJSON() throws Exception { List<DummyObject> dummyList = List.of(dummyObject); Stream2JSONInputStream collection2InputStream = new Stream2JSONInputStream(Stream.of(dummyObject)); - assertThat(inputStreamToString(collection2InputStream), is(GSON.toJson(dummyList))); + assertThat(JsonParser.parseString(inputStreamToString(collection2InputStream)), + is(JsonParser.parseString(GSON.toJson(dummyList)))); } @Test @@ -62,7 +64,8 @@ public void shouldStreamCollectionStreamToJSON() throws Exception { List<DummyObject> dummyCollection = List.of(dummyObject1, dummyObject2); Stream2JSONInputStream collection2InputStream = new Stream2JSONInputStream(dummyCollection.stream()); - assertThat(inputStreamToString(collection2InputStream), is(GSON.toJson(dummyCollection))); + assertThat(JsonParser.parseString(inputStreamToString(collection2InputStream)), + is(JsonParser.parseString(GSON.toJson(dummyCollection)))); } private String inputStreamToString(InputStream in) throws IOException { diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/link/events/LinkEventFactoryTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/link/events/LinkEventFactoryTest.java index 0983870c1be..d52428201ae 100644 --- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/link/events/LinkEventFactoryTest.java +++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/link/events/LinkEventFactoryTest.java @@ -24,6 +24,7 @@ import org.openhab.core.thing.link.dto.ItemChannelLinkDTO; import com.google.gson.Gson; +import com.google.gson.JsonParser; /** * {@link LinkEventFactoryTest} tests the {@link LinkEventFactory}. @@ -52,7 +53,7 @@ public void testCreateItemChannelLinkAddedEvent() { assertEquals(ItemChannelLinkAddedEvent.TYPE, event.getType()); assertEquals(LINK_ADDED_EVENT_TOPIC, event.getTopic()); - assertEquals(LINK_EVENT_PAYLOAD, event.getPayload()); + assertEquals(JsonParser.parseString(LINK_EVENT_PAYLOAD), JsonParser.parseString(event.getPayload())); } @Test @@ -73,7 +74,7 @@ public void testCreateItemChannelLinkRemovedEvent() { assertEquals(ItemChannelLinkRemovedEvent.TYPE, event.getType()); assertEquals(LINK_REMOVED_EVENT_TOPIC, event.getTopic()); - assertEquals(LINK_EVENT_PAYLOAD, event.getPayload()); + assertEquals(JsonParser.parseString(LINK_EVENT_PAYLOAD), JsonParser.parseString(event.getPayload())); } @Test diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java index 7335a2504c0..79fafb8d3cf 100644 --- a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java +++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java @@ -31,6 +31,7 @@ import org.openhab.core.types.UnDefType; import com.google.gson.Gson; +import com.google.gson.JsonParser; /** * {@link ItemEventFactoryTest} tests the {@link ItemEventFactory}. @@ -96,7 +97,7 @@ public void testCreateCommandEventOnOffType() throws Exception { assertEquals(ITEM_COMMAND_EVENT_TYPE, event.getType()); assertEquals(ITEM_COMMAND_EVENT_TOPIC, event.getTopic()); - assertEquals(ITEM_COMMAND_EVENT_PAYLOAD, event.getPayload()); + assertEquals(JsonParser.parseString(ITEM_COMMAND_EVENT_PAYLOAD), JsonParser.parseString(event.getPayload())); assertEquals(ITEM_NAME, event.getItemName()); assertEquals(SOURCE, event.getSource()); assertEquals(OnOffType.class, event.getItemCommand().getClass()); @@ -189,7 +190,7 @@ public void testCreateStateEventOnOffType() { assertThat(event.getType(), is(ITEM_STATE_EVENT_TYPE)); assertThat(event.getTopic(), is(ITEM_STATE_EVENT_TOPIC)); - assertThat(event.getPayload(), is(ITEM_STATE_EVENT_PAYLOAD)); + assertThat(JsonParser.parseString(event.getPayload()), is(JsonParser.parseString(ITEM_STATE_EVENT_PAYLOAD))); assertThat(event.getItemName(), is(ITEM_NAME)); assertThat(event.getSource(), is(SOURCE)); assertEquals(OnOffType.class, event.getItemState().getClass());