Consistent usage of TestNG

modules/swagger-core/pom.xml

@@ -147,11 +147,6 @@
             <version>1.0.5</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <!-- TODO increase coverage -->

modules/swagger-core/src/test/java/io/swagger/v3/core/deserialization/OpenAPI3_1DeserializationTest.java

@@ -13,11 +13,10 @@
 
 import java.io.IOException;
 
-import static org.junit.Assert.assertNull;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertNull;
 
 public class OpenAPI3_1DeserializationTest {
 
@@ -46,7 +45,7 @@ public void deserializePetstore3_0() throws IOException {
         final String jsonString = ResourceUtils.loadClassResource(getClass(), "specFiles/petstore-3.0.yaml");
         final OpenAPI swagger = Yaml.mapper().readValue(jsonString, OpenAPI.class);
         assertNotNull(swagger);
-        assertEquals(swagger.getInfo().getLicense().getIdentifier(), null);
+        assertNull(swagger.getInfo().getLicense().getIdentifier());
     }
 
     @Test
@@ -237,13 +236,13 @@ public void testBooleanSchemaDeserialization() throws Exception{
         String json = Json31.pretty(openAPI);
         String yaml = Yaml31.pretty(openAPI);
         OpenAPI oas = Json31.mapper().readValue(json, OpenAPI.class);
-        assertTrue(Boolean.TRUE.equals(oas.getComponents().getSchemas().get("test").getBooleanSchemaValue()));
+        assertEquals(oas.getComponents().getSchemas().get("test").getBooleanSchemaValue(), Boolean.TRUE);
         Schema schema = Json31.mapper().readValue("true", Schema.class);
-        assertTrue(Boolean.TRUE.equals(schema.getBooleanSchemaValue()));
+        assertEquals(schema.getBooleanSchemaValue(), Boolean.TRUE);
         oas = Yaml31.mapper().readValue(yaml, OpenAPI.class);
-        assertTrue(Boolean.TRUE.equals(oas.getComponents().getSchemas().get("test").getBooleanSchemaValue()));
+        assertEquals(oas.getComponents().getSchemas().get("test").getBooleanSchemaValue(), Boolean.TRUE);
         schema = Yaml31.mapper().readValue("true", Schema.class);
-        assertTrue(Boolean.TRUE.equals(schema.getBooleanSchemaValue()));
+        assertEquals(schema.getBooleanSchemaValue(), Boolean.TRUE);
 
         json = Json.pretty(openAPI);
         yaml = Yaml.pretty(openAPI);

modules/swagger-core/src/test/java/io/swagger/v3/core/deserialization/properties/MapPropertyDeserializerTest.java

@@ -8,11 +8,11 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.responses.ApiResponse;
-import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import static io.swagger.v3.core.util.TestUtils.normalizeLineEnds;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
@@ -143,7 +143,7 @@ public void testBooleanAdditionalPropertiesDeserialization() throws Exception {
         assertTrue(responseSchema instanceof ObjectSchema);
 
         assertTrue(responseSchema.getAdditionalProperties() instanceof Boolean);
-        Assert.assertFalse((Boolean)responseSchema.getAdditionalProperties());
+        assertFalse((Boolean)responseSchema.getAdditionalProperties());
 
         operation = Json.mapper().readValue(jsonAdditionalPropertiesBooleanTrue, Operation.class);
         response = operation.getResponses().get("200");
@@ -154,7 +154,7 @@ public void testBooleanAdditionalPropertiesDeserialization() throws Exception {
         assertTrue(responseSchema instanceof MapSchema);
 
         assertTrue(responseSchema.getAdditionalProperties() instanceof Boolean);
-        Assert.assertTrue((Boolean)responseSchema.getAdditionalProperties());
+        assertTrue((Boolean)responseSchema.getAdditionalProperties());
     }
 
     @Test(description = "it should serialize a boolean additionalProperties")

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/AnnotationsUtilsExtensionsTest.java

@@ -5,14 +5,15 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.extensions.Extension;
 import io.swagger.v3.oas.annotations.extensions.ExtensionProperty;
-import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Map;
 
+import static org.testng.Assert.assertEquals;
+
 public class AnnotationsUtilsExtensionsTest {
 
     @DataProvider
@@ -41,7 +42,7 @@ public void extensionsTest(String methodName, Map<String, Object> expected) thro
         final Extension[] extensions = method.getAnnotation(Operation.class).extensions();
         final Map<String, Object> map = AnnotationsUtils.getExtensions(extensions);
 
-        Assert.assertEquals(map, expected);
+        assertEquals(map, expected);
     }
 
     @Operation(description = "method")

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/AnnotationsUtilsHeadersTest.java

@@ -6,7 +6,6 @@
 import io.swagger.v3.oas.annotations.headers.Header;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.models.headers.Header.StyleEnum;
-import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -15,6 +14,8 @@
 import java.util.Map;
 import java.util.Optional;
 
+import static org.testng.Assert.assertEquals;
+
 public class AnnotationsUtilsHeadersTest {
 
     private io.swagger.v3.oas.models.headers.Header header() {
@@ -48,7 +49,7 @@ public void extensionsTest(String methodName,
         final Optional<Map<String, io.swagger.v3.oas.models.headers.Header>> optionalMap =
                 AnnotationsUtils.getHeaders(headers, null, null);
 
-        Assert.assertEquals(optionalMap, expected);
+        assertEquals(optionalMap, expected);
     }
 
     @Operation(description = "method")

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/BeanValidatorTest.java

@@ -7,12 +7,14 @@
 import io.swagger.v3.oas.models.media.NumberSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
-import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import java.math.BigDecimal;
 import java.util.Map;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
 public class BeanValidatorTest {
 
     @Test(description = "read bean validations")
@@ -21,33 +23,33 @@ public void readBeanValidatorTest() {
         final Schema model = schemas.get("BeanValidationsModel");
         final Map<String, Schema> properties = model.getProperties();
 
-        Assert.assertTrue(model.getRequired().contains("id"));
+        assertTrue(model.getRequired().contains("id"));
 
         final IntegerSchema age = (IntegerSchema) properties.get("age");
-        Assert.assertEquals(age.getMinimum(), new BigDecimal(13.0));
-        Assert.assertEquals(age.getMaximum(), new BigDecimal(99.0));
+        assertEquals(age.getMinimum(), new BigDecimal(13.0));
+        assertEquals(age.getMaximum(), new BigDecimal(99.0));
 
         final StringSchema password = (StringSchema) properties.get("password");
-        Assert.assertEquals((int) password.getMinLength(), 6);
-        Assert.assertEquals((int) password.getMaxLength(), 20);
+        assertEquals((int) password.getMinLength(), 6);
+        assertEquals((int) password.getMaxLength(), 20);
 
         final StringSchema email = (StringSchema) properties.get("email");
-        Assert.assertEquals((String) email.getPattern(), "(.+?)@(.+?)");
+        assertEquals(email.getPattern(), "(.+?)@(.+?)");
 
         final NumberSchema minBalance = (NumberSchema) properties.get("minBalance");
-        Assert.assertTrue(minBalance.getExclusiveMinimum());
+        assertTrue(minBalance.getExclusiveMinimum());
 
         final NumberSchema maxBalance = (NumberSchema) properties.get("maxBalance");
-        Assert.assertTrue(maxBalance.getExclusiveMaximum());
+        assertTrue(maxBalance.getExclusiveMaximum());
 
         final ArraySchema items = (ArraySchema) properties.get("items");
-        Assert.assertEquals((int) items.getMinItems(), 2);
-        Assert.assertEquals((int) items.getMaxItems(), 10);
-        Assert.assertEquals((int) items.getItems().getMinLength(), 3);
-        Assert.assertEquals((int) items.getItems().getMaxLength(), 4);
+        assertEquals((int) items.getMinItems(), 2);
+        assertEquals((int) items.getMaxItems(), 10);
+        assertEquals((int) items.getItems().getMinLength(), 3);
+        assertEquals((int) items.getItems().getMaxLength(), 4);
 
         final StringSchema optionalValue = (StringSchema) properties.get("optionalValue");
-        Assert.assertEquals((int) optionalValue.getMinLength(), 1);
-        Assert.assertEquals((int) optionalValue.getMaxLength(), 10);
+        assertEquals((int) optionalValue.getMinLength(), 1);
+        assertEquals((int) optionalValue.getMaxLength(), 10);
     }
 }