fix: resolve conflicts of rebase

eclipse-edc · Apr 24, 2023 · 0d1784e · 0d1784e
1 parent d6eb239
commit 0d1784e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...eclipse/edc/jsonld/util/TypeUtilTest.java → ...ocol/dsp/transform/util/TypeUtilTest.java b/...eclipse/edc/jsonld/util/TypeUtilTest.java → ...ocol/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);
     }
 }