Clean up

enofex · Dec 8, 2023 · d08e2e7 · d08e2e7
1 parent 1733272
commit d08e2e7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/test/java/com/enofex/naikan/model/deserializer/DeserializerFactoryTest.java b/src/test/java/com/enofex/naikan/model/deserializer/DeserializerFactoryTest.java
@@ -1,6 +1,7 @@
 package com.enofex.naikan.model.deserializer;
 
 
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.enofex.naikan.model.deserializer.json.DefaultJsonDeserializer;
@@ -12,6 +13,6 @@ class DeserializerFactoryTest {
   void shouldReturnJsonDeserializer() {
     Deserializer deserializer = DeserializerFactory.newJsonDeserializer();
 
-    assertTrue(deserializer instanceof DefaultJsonDeserializer);
+    assertInstanceOf(DefaultJsonDeserializer.class, deserializer);
   }
 }
diff --git a/src/test/java/com/enofex/naikan/model/serializer/SerializerFactoryTest.java b/src/test/java/com/enofex/naikan/model/serializer/SerializerFactoryTest.java
@@ -1,6 +1,7 @@
 package com.enofex.naikan.model.serializer;
 
 
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.enofex.naikan.model.BomSchema;
@@ -13,6 +14,6 @@ class SerializerFactoryTest {
   void shouldReturnJsonSerializer() {
     Serializer serializer = SerializerFactory.newJsonSerializer(BomSchema.Version.VERSION_10);
 
-    assertTrue(serializer instanceof JsonSerializer);
+    assertInstanceOf(JsonSerializer.class, serializer);
   }
 }
diff --git a/src/test/java/com/enofex/naikan/model/serializer/json/JsonSerializerTest.java b/src/test/java/com/enofex/naikan/model/serializer/json/JsonSerializerTest.java
@@ -3,6 +3,7 @@
 
 import static com.enofex.naikan.test.model.Boms.validBom0asInputStream;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.enofex.naikan.model.Bom;
@@ -41,7 +42,7 @@ void shouldBeValid() {
 
     JsonSerializer serializer = (JsonSerializer) SerializerFactory.newJsonSerializer(
         BomSchema.Version.VERSION_10);
-    assertTrue(serializer instanceof JsonSerializer10);
+    assertInstanceOf(JsonSerializer10.class, serializer);
     assertEquals(BomSchema.Version.VERSION_10, serializer.getSchemaVersion());
 
     File file = serializer.toFile(bom, this.tempFile.getAbsolutePath());

diff --git a/src/test/java/com/enofex/naikan/model/validator/DefaultValidatorTest.java b/src/test/java/com/enofex/naikan/model/validator/DefaultValidatorTest.java
@@ -30,12 +30,12 @@ Collection<DynamicTest> dynamicTestsWithCollection() throws Exception {
       for (BomFile file : files) {
         if (file.name().endsWith(".json")) {
 
-          if (file.name().startsWith("valid") && schemaVersion != null) {
+          if (file.name().startsWith("valid")) {
             dynamicTests.add(
                 DynamicTest.dynamicTest(file.name(),
                     () -> assertTrue(isValidJson(schemaVersion, file))
                 ));
-          } else if (file.name().startsWith("invalid") && schemaVersion != null) {
+          } else if (file.name().startsWith("invalid")) {
             dynamicTests.add(
                 DynamicTest.dynamicTest(file.name(),
                     () -> assertFalse(isValidJson(schemaVersion, file))