From eea6be05aee909d29698e1f8f655378831a4395f Mon Sep 17 00:00:00 2001 From: kindlich Date: Tue, 18 May 2021 20:04:31 +0200 Subject: [PATCH] Switch to assertj assertions --- .../api/item/IngredientConverterTest.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/test/java/com/blamejared/crafttweaker/api/item/IngredientConverterTest.java b/src/test/java/com/blamejared/crafttweaker/api/item/IngredientConverterTest.java index da5b3cce7..225e55cfb 100644 --- a/src/test/java/com/blamejared/crafttweaker/api/item/IngredientConverterTest.java +++ b/src/test/java/com/blamejared/crafttweaker/api/item/IngredientConverterTest.java @@ -8,17 +8,14 @@ import java.util.*; +import static org.assertj.core.api.Assertions.*; + class IngredientConverterTest extends CraftTweakerTest { private static void assertIsEmptyStack(IIngredient result) { - Assertions.assertTrue(result instanceof IItemStack); - Assertions.assertSame(ItemStack.EMPTY, ((IItemStack) result).getInternal()); - } - - private static void assertInstanceOf(T object, Class cls) { - - Assertions.assertTrue(cls.isInstance(object), "Expected " + object + " to be instanceof " + cls.getCanonicalName()); + assertThat(result).isInstanceOfSatisfying(IItemStack.class, + stack -> assertThat(stack.getInternal()).isSameAs(ItemStack.EMPTY)); } @Test @@ -43,7 +40,7 @@ void itemStackReturnsIItemStack() { final IIngredient result = IngredientConverter.fromIngredient(ingredient); //Assert - Assertions.assertEquals(expectedStack, result); + assertThat(expectedStack).isEqualTo(result); } @Test @@ -64,8 +61,8 @@ void itemListReturnsListIngredient() { final IIngredient result = IngredientConverter.fromIngredient(ingredient); //Assert - assertInstanceOf(result, MCIngredientList.class); - Assertions.assertArrayEquals(expectedIngredients, ((MCIngredientList) result).getIngredients()); + assertThat(result).isInstanceOfSatisfying(MCIngredientList.class, + list -> assertThat(list.getIngredients()).contains(expectedIngredients)); } //TODO, how to test tags here?