From 0d1784ee548b84338856a4dc903ea3cae7d6b4bc Mon Sep 17 00:00:00 2001 From: Julia Pampus Date: Mon, 24 Apr 2023 13:28:32 +0200 Subject: [PATCH] fix: resolve conflicts of rebase --- .../edc/protocol/dsp/transform}/util/TypeUtilTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename {extensions/common/json-ld/src/test/java/org/eclipse/edc/jsonld => data-protocols/dsp/dsp-transform/src/test/java/org/eclipse/edc/protocol/dsp/transform}/util/TypeUtilTest.java (93%) diff --git a/extensions/common/json-ld/src/test/java/org/eclipse/edc/jsonld/util/TypeUtilTest.java b/data-protocols/dsp/dsp-transform/src/test/java/org/eclipse/edc/protocol/dsp/transform/util/TypeUtilTest.java similarity index 93% rename from extensions/common/json-ld/src/test/java/org/eclipse/edc/jsonld/util/TypeUtilTest.java rename to data-protocols/dsp/dsp-transform/src/test/java/org/eclipse/edc/protocol/dsp/transform/util/TypeUtilTest.java index 9204349f8dd..1196de7ce3b 100644 --- a/extensions/common/json-ld/src/test/java/org/eclipse/edc/jsonld/util/TypeUtilTest.java +++ b/data-protocols/dsp/dsp-transform/src/test/java/org/eclipse/edc/protocol/dsp/transform/util/TypeUtilTest.java @@ -15,12 +15,11 @@ package org.eclipse.edc.protocol.dsp.transform.util; import jakarta.json.Json; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; class TypeUtilTest { @@ -91,7 +90,7 @@ public void isOfExpectedType_false() { var actual = TypeUtil.isOfExpectedType(object, "invalid_type"); - assertFalse(actual); + Assertions.assertFalse(actual); } @Test @@ -103,6 +102,6 @@ public void isOfExpectedType_true() { var actual = TypeUtil.isOfExpectedType(object, expected); - assertTrue(actual); + Assertions.assertTrue(actual); } } \ No newline at end of file