Refactor tests

Author: adrian-palanques-cloudappi

generator-core/src/test/java/org/apiaddicts/apitools/apigen/generatorcore/config/extractors/ConfigurationExtractorTest.java

@@ -13,7 +13,6 @@
 import org.apiaddicts.apitools.apigen.generatorcore.config.validation.Validation;
 import org.apiaddicts.apitools.apigen.generatorcore.config.validation.ValidationType;
 import org.apiaddicts.apitools.apigen.generatorcore.spec.OpenAPIExtended;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
@@ -26,15 +25,6 @@
 // TODO #14909 refactor tests to use individualized api fragments
 class ConfigurationExtractorTest {
 
-    private static Configuration configuration;
-
-    @BeforeAll
-    static void prepareTest() {
-        OpenAPIExtended openAPIExtended = load("testApi.yaml");
-        configuration = new ConfigurationExtractor(openAPIExtended).extract();
-        assertNotNull(configuration);
-    }
-
     private static OpenAPIExtended load(String fileName) {
         ParseOptions parseOptions = new ParseOptions();
         parseOptions.setResolveFully(true);
@@ -44,6 +34,8 @@ private static OpenAPIExtended load(String fileName) {
 
     @Test
     void checkExtractedProjectInfoFromYAML() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertEquals(configuration.getName(), "test");
         assertEquals(configuration.getDescription(), "test");
         assertEquals("the.test", configuration.getGroup());
@@ -53,6 +45,8 @@ void checkExtractedProjectInfoFromYAML() {
 
     @Test
     void checkExtractedEntitiesFromYAML() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertNotNull(configuration.getEntities());
 
         List<Entity> entities = configuration.getEntities();
@@ -107,6 +101,8 @@ void checkExtractedEntitiesFromYAML() {
 
     @Test
     void checkExtractedValidationsFromYAMLModels() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertNotNull(configuration.getEntities());
 
         List<Validation> validations = configuration.getEntities().get(0).getAttributes().get(0).getValidations();
@@ -162,12 +158,16 @@ void checkExtractedValidationsFromYAMLModels() {
 
     @Test
     void checkExtractedValidationsFromYAMLResources() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         List<Validation> validations = configuration.getControllers().get(0).getEndpoints().get(0).getRequest().getAttributes().get(0).getValidations();
         assertEquals(ValidationType.NOT_NULL, validations.get(0).getType(), "Check NotNull Validation");
     }
 
     @Test
     void checkExtractedControllersFromYAML() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertNotNull(configuration.getControllers());
 
         List<Controller> controllers = configuration.getControllers();
@@ -197,6 +197,8 @@ void checkExtractedControllersFromYAML() {
 
     @Test
     void checkExtractedEndpointsParametersFromYAML() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertNotNull(configuration.getControllers());
         Controller controller = configuration.getControllers().get(0);
 
@@ -273,7 +275,6 @@ private void checkBooleanParameter(Parameter parameter) {
     @Test
     void allOfWithProperties() {
         OpenAPIExtended openAPIExtended = load("0001_allOffProps.yaml");
-        configuration = new ConfigurationExtractor(openAPIExtended).extract();
         Schema<?> schema = openAPIExtended.getSchemas().get("standard_response_res_one");
         Map<String, Schema> props = schema.getProperties();
         assertTrue(props.containsKey("data"), "'data' property expected");