From f925fcac5eeb2226163dad7f5e335bc77a61bb69 Mon Sep 17 00:00:00 2001 From: Danny Faught Date: Fri, 29 Sep 2023 16:23:57 -0700 Subject: [PATCH] refactor: use JUnit 5 expectations * JUnit 5 has a better way to assert on an expected exception. * Cleaned up an unncessary type specification. * Fixed a typo. * Cleaned up an import. --- .../identity/uaa/util/JsonUtilsTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/metrics-data/src/test/java/org/cloudfoundry/identity/uaa/util/JsonUtilsTest.java b/metrics-data/src/test/java/org/cloudfoundry/identity/uaa/util/JsonUtilsTest.java index c2ed6750de1..c4ba1e837b3 100644 --- a/metrics-data/src/test/java/org/cloudfoundry/identity/uaa/util/JsonUtilsTest.java +++ b/metrics-data/src/test/java/org/cloudfoundry/identity/uaa/util/JsonUtilsTest.java @@ -10,8 +10,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; class JsonUtilsTest { private static final String jsonTestObjectString = "{\"pattern\":\"/pattern\",\"group\":\"group\",\"limit\":1000,\"category\":\"category\"}"; @@ -69,13 +69,10 @@ void testSerializeExcludingProperties() { @Test void testSerializeExcludingPropertiesInnerCallFails() { - Map groupProperties = JsonUtils.readValue(jsonTestObjectString, new TypeReference>() {}); - try { - JsonUtils.serializeExcludingProperties(groupProperties, "limit.unkonwn"); - fail("not expected"); - } catch (Exception e) { - assertTrue(e instanceof JsonUtils.JsonUtilException); - } + Map groupProperties = JsonUtils.readValue(jsonTestObjectString, new TypeReference<>() {}); + assertThrows(JsonUtils.JsonUtilException.class, () -> { + JsonUtils.serializeExcludingProperties(groupProperties, "limit.unknown"); + }); } @Test