fix base path issue

Author: SergeyPirogov

src/main/java/io/reqover/rest/assured/CoverageFilter.java

@@ -9,19 +9,21 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 public abstract class CoverageFilter implements OrderedFilter {
 
     protected CoverageInfo collectCoverageInfo(FilterableRequestSpecification requestSpec, Response response) {
         Integer statusCode = response.statusCode();
         Map<String, String> unnamedPathParams = requestSpec.getUnnamedPathParams();
-        String uri = removeHostFromUri(requestSpec.getURI());
+        URI requestURI = convertUriStringToURI(requestSpec.getURI());
+
+        String uri = removeHostFromUri(Objects.requireNonNull(requestURI));
         String basePath = requestSpec.getBasePath();
-        String path = UrlPath.getPath(requestSpec.getUserDefinedPath(), unnamedPathParams);
+        String path = requestURI.getPath();
 
         String method = requestSpec.getMethod();
 
@@ -61,19 +63,21 @@ protected CoverageInfo collectCoverageInfo(FilterableRequestSpecification reques
         return coverageInfo;
     }
 
-    private String removeHostFromUri(String uri) {
+    private URI convertUriStringToURI(String uri) {
         try {
-            URI url = new URI(uri);
-            String query = url.getQuery();
-            String path = url.getPath();
-            if (StringUtils.isBlank(query)) {
-                return path;
-            }
-            return path + "?" + query;
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
+            return new URI(uri);
+        } catch (Exception e) {
+            throw new RuntimeException("Can not parse URI " + uri + " " + e);
+        }
+    }
+
+    private String removeHostFromUri(URI uri) {
+        String query = uri.getQuery();
+        String path = uri.getPath();
+        if (StringUtils.isBlank(query)) {
+            return path;
         }
-        return "";
+        return path + "?" + query;
     }
 
     @Override

src/test/java/io/reqover/test/TestOpenApiV3.java

@@ -0,0 +1,29 @@
+package io.reqover.test;
+
+import io.reqover.rest.assured.SwaggerCoverage;
+import io.restassured.RestAssured;
+import io.restassured.filter.log.RequestLoggingFilter;
+import io.restassured.specification.RequestSpecification;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class TestOpenApiV3 {
+  private final SwaggerCoverage swaggerCoverage = new SwaggerCoverage("build/reqover-results");
+
+  @BeforeAll
+  public static void setUp() {
+    RestAssured.baseURI = "https://canada-holidays.ca/api/v1";
+  }
+
+  private RequestSpecification setup() {
+    return RestAssured.given()
+        .filter(new RequestLoggingFilter())
+        .filter(swaggerCoverage);
+  }
+
+  @Test
+  void testGetPet() {
+    setup()
+        .get("/holidays/{holidayId}?year=2023&optional=false", 2);
+  }
+}