Migrate to 0.8.0 and fix broken tests

src/test/java/org/eclipsefoundation/cve/resources/CveResourceTest.java

@@ -13,14 +13,13 @@ package org.eclipsefoundation.cve.resources;
 
 import org.eclipsefoundation.cve.test.helpers.SchemaNamespaceHelper;
 import org.eclipsefoundation.testing.helpers.TestCaseHelper;
-import org.eclipsefoundation.testing.templates.RestAssuredTemplates;
-import org.eclipsefoundation.testing.templates.RestAssuredTemplates.EndpointTestCase;
+import org.eclipsefoundation.testing.models.EndpointTestBuilder;
+import org.eclipsefoundation.testing.models.EndpointTestCase;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.http.ContentType;
 
 @QuarkusTest
 @TestInstance(Lifecycle.PER_CLASS)
@@ -35,18 +34,12 @@ class CveResourceTest {
     public final static EndpointTestCase GET_ALL_SUCCESS = TestCaseHelper.buildSuccessCase(CVES_BASE_URL,
             new String[] {}, SchemaNamespaceHelper.CVES_SCHEMA_PATH);
 
-    public final static EndpointTestCase GET_ALL_INVALID_FORMAT = TestCaseHelper.buildInvalidFormatCase(CVES_BASE_URL,
-            new String[] {}, ContentType.TEXT);
-
     /*
      * GET ALL BY PROJECT
      */
     public final static EndpointTestCase GET_ALL_PROJECT_SUCCESS = TestCaseHelper.buildSuccessCase(CVES_PROJECT_URL,
             new String[] { "technology.dash" }, SchemaNamespaceHelper.CVES_SCHEMA_PATH);
 
-    public final static EndpointTestCase GET_ALL_PROJECT_INVALID_FORMAT = TestCaseHelper
-            .buildInvalidFormatCase(CVES_PROJECT_URL, new String[] { "technology.dash" }, ContentType.TEXT);
-
     /*
      * GET BY ID
      */
@@ -56,9 +49,6 @@ class CveResourceTest {
     public final static EndpointTestCase GET_BY_ID_NO_GH_SUCCESS = TestCaseHelper.buildSuccessCase(CVE_BASE_URL,
             new String[] { "CVE-2022-0105" }, SchemaNamespaceHelper.CVE_SCHEMA_PATH);
 
-    public final static EndpointTestCase GET_BY_ID_INVALID_FORMAT = TestCaseHelper.buildInvalidFormatCase(CVE_BASE_URL,
-            new String[] { "CVE-2022-0103" }, ContentType.TEXT);
-
     public final static EndpointTestCase GET_BY_ID_NOT_FOUND = TestCaseHelper.buildNotFoundCase(CVE_BASE_URL,
             new String[] { "CVE-2022-0104" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
 
@@ -67,22 +57,17 @@ class CveResourceTest {
      */
     @Test
     void getAll_success() {
-        RestAssuredTemplates.testGet(GET_ALL_SUCCESS);
+        EndpointTestBuilder.from(GET_ALL_SUCCESS).run();
     }
 
     @Test
     void getAll_success_validResponseFormat() {
-        RestAssuredTemplates.testGet_validateResponseFormat(GET_ALL_SUCCESS);
+        EndpointTestBuilder.from(GET_ALL_SUCCESS).andCheckFormat().run();
     }
 
     @Test
     void getAll_success_matchingSpec() {
-        RestAssuredTemplates.testGet_validateSchema(GET_ALL_SUCCESS);
-    }
-
-    @Test
-    void getAll_failure_invalidFormatTEXT() {
-        RestAssuredTemplates.testGet(GET_ALL_INVALID_FORMAT);
+        EndpointTestBuilder.from(GET_ALL_SUCCESS).andCheckSchema().run();
     }
 
     /*
@@ -90,22 +75,17 @@ class CveResourceTest {
      */
     @Test
     void getAllByProject_success() {
-        RestAssuredTemplates.testGet(GET_ALL_PROJECT_SUCCESS);
+        EndpointTestBuilder.from(GET_ALL_PROJECT_SUCCESS).run();
     }
 
     @Test
     void getAllByProject_success_validResponseFormat() {
-        RestAssuredTemplates.testGet_validateResponseFormat(GET_ALL_PROJECT_SUCCESS);
+        EndpointTestBuilder.from(GET_ALL_PROJECT_SUCCESS).andCheckFormat().run();
     }
 
     @Test
     void getAllByProject_success_matchingSpec() {
-        RestAssuredTemplates.testGet_validateSchema(GET_ALL_PROJECT_SUCCESS);
-    }
-
-    @Test
-    void getAllByProject_failure_invalidFormatTEXT() {
-        RestAssuredTemplates.testGet(GET_ALL_PROJECT_INVALID_FORMAT);
+        EndpointTestBuilder.from(GET_ALL_PROJECT_SUCCESS).andCheckSchema().run();
     }
 
     /*
@@ -113,41 +93,36 @@ class CveResourceTest {
      */
     @Test
     void getById_success() {
-        RestAssuredTemplates.testGet(GET_BY_ID_SUCCESS);
+        EndpointTestBuilder.from(GET_BY_ID_SUCCESS).run();
     }
 
     @Test
     void getById_success_validResponseFormat() {
-        RestAssuredTemplates.testGet_validateResponseFormat(GET_BY_ID_SUCCESS);
+        EndpointTestBuilder.from(GET_BY_ID_SUCCESS).andCheckFormat().run();
     }
 
     @Test
     void getById_success_matchingSpec() {
-        RestAssuredTemplates.testGet_validateSchema(GET_BY_ID_SUCCESS);
+        EndpointTestBuilder.from(GET_BY_ID_SUCCESS).andCheckSchema().run();
     }
 
     @Test
     void getByIdNoGH_success() {
-        RestAssuredTemplates.testGet(GET_BY_ID_NO_GH_SUCCESS);
+        EndpointTestBuilder.from(GET_BY_ID_NO_GH_SUCCESS).run();
     }
 
     @Test
     void getByIdNoGH_success_matchingSpec() {
-        RestAssuredTemplates.testGet_validateSchema(GET_BY_ID_NO_GH_SUCCESS);
-    }
-
-    @Test
-    void getById_failure_invalidFormatTEXT() {
-        RestAssuredTemplates.testGet(GET_BY_ID_INVALID_FORMAT);
+        EndpointTestBuilder.from(GET_BY_ID_NO_GH_SUCCESS).andCheckSchema().run();
     }
 
     @Test
     void getById_failure_invalidId() {
-        RestAssuredTemplates.testGet(GET_BY_ID_NOT_FOUND);
+        EndpointTestBuilder.from(GET_BY_ID_NOT_FOUND).run();
     }
 
     @Test
     void getById_failure_invalidId_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(GET_BY_ID_NOT_FOUND);
+        EndpointTestBuilder.from(GET_BY_ID_NOT_FOUND).andCheckSchema().run();
     }
 }
\ No newline at end of file