fix tests execution (wiremock update)

Author: frantuma

modules/swagger-parser-v3/pom.xml

@@ -73,18 +73,16 @@
             <version>${slf4j-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.2-jre</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
-            <version>${wiremock-version}</version>
+            <artifactId>wiremock-jre8</artifactId>
             <scope>test</scope>
-
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/CustomOpenAPIDereferencer.java

@@ -19,12 +19,25 @@ public Visitor buildReferenceVisitor(DereferencerContext context, Reference refe
         return new CustomVisitor(reference, (OpenAPI31Traverser)traverser, new HashSet<>(), new HashMap<>());
     }
 
+    @Override
+    public ReferenceVisitor buildReferenceVisitorWithContext(DereferencerContext context, Reference reference, Traverser traverser) {
+        return new CustomVisitor(reference, (OpenAPI31Traverser)traverser, new HashSet<>(), new HashMap<>(), context);
+    }
+
     static public class CustomVisitor extends ReferenceVisitor {
 
         public CustomVisitor(Reference reference, OpenAPI31Traverser openAPITraverser, HashSet<Object> visited,
                              HashMap<Object, Object> visitedMap) {
             super(reference, openAPITraverser, visited, visitedMap);
         }
+        public CustomVisitor(
+                Reference reference,
+                OpenAPI31Traverser openAPITraverser,
+                HashSet<Object> visited,
+                HashMap<Object, Object> visitedMap,
+                DereferencerContext context) {
+            super(reference, openAPITraverser, visited, visitedMap, context);
+        }
 
         @Override
         public String readHttp(String uri, List<AuthorizationValue> auths) throws Exception {

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIResolverTest.java

@@ -8,7 +8,6 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import io.swagger.v3.core.util.Json;
-import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -34,20 +33,14 @@
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.parser.OpenAPIResolver;
 import io.swagger.v3.parser.OpenAPIV3Parser;
-import io.swagger.v3.parser.ResolverCache;
 import io.swagger.v3.parser.core.models.AuthorizationValue;
 import io.swagger.v3.parser.core.models.ParseOptions;
 import io.swagger.v3.parser.core.models.SwaggerParseResult;
-import io.swagger.v3.parser.processors.ComponentsProcessor;
-import io.swagger.v3.parser.processors.PathsProcessor;
 import io.swagger.v3.parser.reference.DereferencerContext;
 import io.swagger.v3.parser.reference.DereferencersFactory;
 import io.swagger.v3.parser.reference.OpenAPIDereferencer;
 import io.swagger.v3.parser.util.OpenAPIDeserializer;
 import io.swagger.v3.parser.util.ResolverFully;
-import mockit.Injectable;
-import mockit.Mocked;
-import mockit.Expectations;
 import org.apache.commons.io.FileUtils;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -79,12 +72,7 @@
 
 public class OpenAPIResolverTest {
 
-    @Injectable  OpenAPI swagger;
     List<AuthorizationValue> auths = new ArrayList<>();
-    @Mocked  ResolverCache cache;
-    @Injectable  ParseOptions parseOptions;
-    @Mocked  ComponentsProcessor componentsProcessor;
-    @Mocked  PathsProcessor pathsProcessor;
 
     protected int serverPort = getDynamicPort();
     protected WireMockServer wireMockServer;
@@ -1065,33 +1053,6 @@ public void allOfExampleGeneration() throws JsonProcessingException {
         Assert.assertEquals("{\"someProperty\":\"ABC\",\"someOtherProperty\":42}", Json.mapper().writeValueAsString(withExample));
     }
 
-    @Test
-    public void testSwaggerResolver() throws Exception {
-
-        new Expectations() {{
-            new ResolverCache(swagger, auths, null, new HashSet<>(), parseOptions);
-            result = cache;
-            times = 1;
-
-            new ComponentsProcessor(swagger, cache);
-            result = componentsProcessor;
-            times = 1;
-
-            new PathsProcessor(cache, swagger, withInstanceOf(OpenAPIResolver.Settings.class));
-            result = pathsProcessor;
-            times = 1;
-
-            pathsProcessor.processPaths();
-            times = 1;
-
-            componentsProcessor.processComponents();
-            times = 1;
-
-        }};
-
-        assertEquals(new OpenAPIResolver(swagger, auths, null, null, parseOptions).resolve(), swagger);
-    }
-
     @Test
     public void testSwaggerResolver_NullSwagger() throws Exception {
         assertNull(new OpenAPIResolver(null, null, null).resolve());

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserRemoteResolvingTest.java

@@ -302,7 +302,7 @@ public void testInlineModelResolverByUrl(){
     @Test
     public void testIssueSameRefsDifferentModel() throws IOException {
         String pathFile = FileUtils.readFileToString(new File("src/test/resources/same-refs-different-model-domain.yaml"), "UTF-8");
-        WireMock.stubFor(get(urlPathMatching("/issue-domain"))
+        WireMock.stubFor(get(urlPathMatching("/issue-domain/"))
                 .willReturn(aResponse()
                         .withStatus(HttpURLConnection.HTTP_OK)
                         .withHeader("Content-type", "application/json")

modules/swagger-parser/pom.xml

@@ -72,7 +72,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
+            <artifactId>wiremock-jre8</artifactId>
             <version>${wiremock-version}</version>
             <scope>test</scope>
             <exclusions>

pom.xml

@@ -374,7 +374,7 @@
             </dependency>
             <dependency>
                 <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock</artifactId>
+                <artifactId>wiremock-jre8</artifactId>
                 <version>${wiremock-version}</version>
                 <scope>test</scope>
             </dependency>
@@ -421,7 +421,7 @@
         <junit-version>4.13.2</junit-version>
         <testng-version>7.8.0</testng-version>
         <jmockit-version>1.49</jmockit-version>
-        <wiremock-version>2.27.2</wiremock-version>
+        <wiremock-version>2.35.0</wiremock-version>
         <surefire-version>3.0.0</surefire-version>
         <commons-lang-version>3.12.0</commons-lang-version>
         <jackson-version>2.15.1</jackson-version>