Update to commons v0.8, update tests to address removed classes

src/test/java/org/eclipsefoundation/downloads/resources/DownloadsResourceTest.java

@@ -14,8 +14,8 @@ package org.eclipsefoundation.downloads.resources;
 
 import org.eclipsefoundation.downloads.test.helper.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;
@@ -51,7 +51,8 @@ class DownloadsResourceTest {
      * LEGACY RELEASE
      */
     public static final EndpointTestCase LEGACY_RELEASE_SUCCESS_NAME = TestCaseHelper
-            .buildSuccessCase(LEGACY_RELEASE_NAME_URL, new String[] { "epp", "2021-12" }, SchemaNamespaceHelper.RELEASES_SCHEMA_PATH);
+            .buildSuccessCase(LEGACY_RELEASE_NAME_URL, new String[] { "epp", "2021-12" },
+                    SchemaNamespaceHelper.RELEASES_SCHEMA_PATH);
 
     public static final EndpointTestCase LEGACY_RELEASE_SUCCESS_NAME_VERSION = TestCaseHelper
             .buildSuccessCase(LEGACY_RELEASE_NAME_VERSION_URL, new String[] { "epp", "2021-12", "r" },
@@ -62,7 +63,8 @@ class DownloadsResourceTest {
                     SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
 
     public static final EndpointTestCase LEGACY_RELEASE_NO_NAME = TestCaseHelper
-            .buildSuccessCase(LEGACY_RELEASE_URL, new String[] { "eclipse_packages" }, SchemaNamespaceHelper.RELEASE_SCHEMA_PATH);
+            .buildSuccessCase(LEGACY_RELEASE_URL, new String[] { "eclipse_packages" },
+                    SchemaNamespaceHelper.RELEASE_SCHEMA_PATH);
 
     public static final EndpointTestCase LEGACY_RELEASE_NO_NAME_VERSION = TestCaseHelper
             .buildBadRequestCase(LEGACY_RELEASE_VERSION_URL, new String[] { "eclipse_packages", "r" },
@@ -80,13 +82,15 @@ class DownloadsResourceTest {
      * GET RELEASES
      */
     public static final EndpointTestCase GET_RELEASES_SUCCESS = TestCaseHelper
-            .buildSuccessCase(RELEASES_URL, new String[] { "epp", "2021-06" }, SchemaNamespaceHelper.RELEASES_SCHEMA_PATH);
+            .buildSuccessCase(RELEASES_URL, new String[] { "epp", "2021-06" },
+                    SchemaNamespaceHelper.RELEASES_SCHEMA_PATH);
 
     public static final EndpointTestCase GET_RELEASES_NOT_FOUND = TestCaseHelper
             .buildNotFoundCase(RELEASES_URL, new String[] { "epp", "nitro" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
 
     public static final EndpointTestCase GET_RELEASES_INVALID_TYPE = TestCaseHelper
-            .buildBadRequestCase(RELEASES_URL, new String[] { "new", "2021-06" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
+            .buildBadRequestCase(RELEASES_URL, new String[] { "new", "2021-06" },
+                    SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
 
     /*
      * GET RELEASE VERSION
@@ -100,179 +104,178 @@ class DownloadsResourceTest {
                     SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
 
     public static final EndpointTestCase GET_RELEASE_VERSION_NOT_FOUND_VERSION = TestCaseHelper
-            .buildNotFoundCase(RELEASE_VERSION_URL, new String[] { "epp", "2020-03", "version1" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
+            .buildNotFoundCase(RELEASE_VERSION_URL, new String[] { "epp", "2020-03", "version1" },
+                    SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
 
     public static final EndpointTestCase GET_RELEASE_VERSION_INVALID_TYPE = TestCaseHelper
-            .buildBadRequestCase(RELEASE_VERSION_URL, new String[] { "new", "2021-06", "r" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
+            .buildBadRequestCase(RELEASE_VERSION_URL, new String[] { "new", "2021-06", "r" },
+                    SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
 
     /*
      * FILE BY ID
      */
     @Test
     void getFileByID_success() {
-        RestAssuredTemplates.testGet(FILE_BY_ID_SUCCESS);
+        EndpointTestBuilder.from(FILE_BY_ID_SUCCESS).run();
     }
 
     @Test
     void getFileByID_success_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(FILE_BY_ID_SUCCESS);
+        EndpointTestBuilder.from(FILE_BY_ID_SUCCESS).andCheckSchema().run();
     }
 
     @Test
     void getFileByID_success_validResponseFormat() {
-        RestAssuredTemplates.testGet_validateResponseFormat(FILE_BY_ID_SUCCESS);
+        EndpointTestBuilder.from(FILE_BY_ID_SUCCESS).andCheckFormat().run();
     }
 
     @Test
     void getFileByID_failure_notFound() {
-        RestAssuredTemplates.testGet(FILE_BY_ID_NOT_FOUND);
+        EndpointTestBuilder.from(FILE_BY_ID_NOT_FOUND).run();
     }
 
     @Test
     void getFileByID_failure_notFound_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(FILE_BY_ID_NOT_FOUND);
+        EndpointTestBuilder.from(FILE_BY_ID_NOT_FOUND).andCheckSchema().run();
     }
-
     /*
      * LEGACY RELEASE
      */
     @Test
     void getReleaseLegacy_success() {
-        RestAssuredTemplates.testGet(LEGACY_RELEASE_SUCCESS_NAME);
-        RestAssuredTemplates.testGet(LEGACY_RELEASE_SUCCESS_NAME_VERSION);
+        EndpointTestBuilder.from(LEGACY_RELEASE_SUCCESS_NAME).run();
+        EndpointTestBuilder.from(LEGACY_RELEASE_SUCCESS_NAME_VERSION).run();
     }
 
     @Test
     void getReleaseLegacy_success_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(LEGACY_RELEASE_SUCCESS_NAME);
-        RestAssuredTemplates.testGet_validateSchema(LEGACY_RELEASE_SUCCESS_NAME_VERSION);
+        EndpointTestBuilder.from(LEGACY_RELEASE_SUCCESS_NAME).andCheckSchema().run();
+        EndpointTestBuilder.from(LEGACY_RELEASE_SUCCESS_NAME_VERSION).andCheckSchema().run();
     }
 
     @Test
     void getReleaseLegacy_success_validResponseFormat() {
-        RestAssuredTemplates.testGet_validateResponseFormat(LEGACY_RELEASE_SUCCESS_NAME);
-        RestAssuredTemplates.testGet_validateResponseFormat(LEGACY_RELEASE_SUCCESS_NAME_VERSION);
+        EndpointTestBuilder.from(LEGACY_RELEASE_SUCCESS_NAME).andCheckFormat().run();
+        EndpointTestBuilder.from(LEGACY_RELEASE_SUCCESS_NAME_VERSION).andCheckFormat().run();
     }
 
     @Test
     void getReleaseLegacy_failure_missingReleaseName() {
-        RestAssuredTemplates.testGet(LEGACY_RELEASE_NO_NAME);
-        RestAssuredTemplates.testGet(LEGACY_RELEASE_NO_NAME_VERSION);
+        EndpointTestBuilder.from(LEGACY_RELEASE_NO_NAME).run();
+        EndpointTestBuilder.from(LEGACY_RELEASE_NO_NAME_VERSION).run();
     }
 
     @Test
     void getReleaseLegacy_failure_invalidReleaseType() {
-        RestAssuredTemplates.testGet(LEGACY_RELEASE_INVALID_TYPE);
+        EndpointTestBuilder.from(LEGACY_RELEASE_INVALID_TYPE).run();
     }
 
     @Test
     void getReleaseLegacy_failure_invalidReleaseType_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(LEGACY_RELEASE_INVALID_TYPE);
+        EndpointTestBuilder.from(LEGACY_RELEASE_INVALID_TYPE).andCheckSchema().run();
     }
 
     @Test
     void getReleaseLEgacy_failure_nameNotFound() {
-        RestAssuredTemplates.testGet(LEGACY_RELEASE_NAME_NOT_FOUND);
+        EndpointTestBuilder.from(LEGACY_RELEASE_NAME_NOT_FOUND).run();
     }
 
     @Test
     void getReleaseLEgacy_failure_nameNotFound_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(LEGACY_RELEASE_NAME_NOT_FOUND);
+        EndpointTestBuilder.from(LEGACY_RELEASE_NAME_NOT_FOUND).andCheckSchema().run();
     }
 
     @Test
     void getReleaseLEgacy_failure_versionNotFound() {
-        RestAssuredTemplates.testGet(LEGACY_RELEASE_VERSION_NOT_FOUND);
+        EndpointTestBuilder.from(LEGACY_RELEASE_VERSION_NOT_FOUND).run();
     }
 
     @Test
     void getReleaseLEgacy_failure_versionNotFound_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(LEGACY_RELEASE_VERSION_NOT_FOUND);
+        EndpointTestBuilder.from(LEGACY_RELEASE_VERSION_NOT_FOUND).andCheckSchema().run();
     }
-
     /*
      * GET RELEASE
      */
     @Test
     void getRelease_success() {
-        RestAssuredTemplates.testGet(GET_RELEASES_SUCCESS);
+        EndpointTestBuilder.from(GET_RELEASES_SUCCESS).run();
     }
 
     @Test
     void getRelease_success_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(GET_RELEASES_SUCCESS);
+        EndpointTestBuilder.from(GET_RELEASES_SUCCESS).andCheckSchema().run();
     }
 
     @Test
     void getRelease_success_validResponseFormat() {
-        RestAssuredTemplates.testGet_validateResponseFormat(GET_RELEASES_SUCCESS);
+        EndpointTestBuilder.from(GET_RELEASES_SUCCESS).andCheckFormat().run();
     }
 
     @Test
     void getRelease_failure_notFound() {
-        RestAssuredTemplates.testGet(GET_RELEASES_NOT_FOUND);
+        EndpointTestBuilder.from(GET_RELEASES_NOT_FOUND).run();
     }
 
     @Test
     void getRelease_failure_notFound_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(GET_RELEASES_NOT_FOUND);
+        EndpointTestBuilder.from(GET_RELEASES_NOT_FOUND).andCheckSchema().run();
     }
 
     @Test
     void getRelease_failure_invalidReleaseType() {
-        RestAssuredTemplates.testGet(GET_RELEASES_INVALID_TYPE);
+        EndpointTestBuilder.from(GET_RELEASES_INVALID_TYPE).run();
     }
 
     @Test
     void getRelease_failure_invalidReleaseType_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(GET_RELEASES_INVALID_TYPE);
+        EndpointTestBuilder.from(GET_RELEASES_INVALID_TYPE).andCheckSchema().run();
     }
-
     /*
      * GET RELEASE VERSION
      */
     @Test
     void getReleaseVersion_success() {
-        RestAssuredTemplates.testGet(GET_RELEASE_VERSION_SUCCESS);
+        EndpointTestBuilder.from(GET_RELEASE_VERSION_SUCCESS).run();
     }
 
     @Test
     void getReleaseVersion_success_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(GET_RELEASE_VERSION_SUCCESS);
+        EndpointTestBuilder.from(GET_RELEASE_VERSION_SUCCESS).andCheckSchema().run();
     }
 
     @Test
     void getReleaseVersion_success_validResponseFormat() {
-        RestAssuredTemplates.testGet_validateResponseFormat(GET_RELEASE_VERSION_SUCCESS);
+        EndpointTestBuilder.from(GET_RELEASE_VERSION_SUCCESS).andCheckFormat().run();
     }
 
     @Test
     void getReleaseVersion_failure_nameNotFound() {
-        RestAssuredTemplates.testGet(GET_RELEASE_VERSION_NOT_FOUND_NAME);
+        EndpointTestBuilder.from(GET_RELEASE_VERSION_NOT_FOUND_NAME).run();
     }
 
     @Test
     void getReleaseVersion_failure_nameNotFound_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(GET_RELEASE_VERSION_NOT_FOUND_NAME);
+        EndpointTestBuilder.from(GET_RELEASE_VERSION_NOT_FOUND_NAME).andCheckSchema().run();
     }
 
     @Test
     void getReleaseVersion_failure_versionNotFound() {
-        RestAssuredTemplates.testGet(GET_RELEASE_VERSION_NOT_FOUND_VERSION);
+        EndpointTestBuilder.from(GET_RELEASE_VERSION_NOT_FOUND_VERSION).run();
     }
 
     @Test
     void getReleaseVersion_failure_versionNotFound_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(GET_RELEASE_VERSION_NOT_FOUND_VERSION);
+        EndpointTestBuilder.from(GET_RELEASE_VERSION_NOT_FOUND_VERSION).andCheckSchema().run();
     }
 
     @Test
     void getReleaseVersion_failure_invalidReleaseType() {
-        RestAssuredTemplates.testGet(GET_RELEASE_VERSION_INVALID_TYPE);
+        EndpointTestBuilder.from(GET_RELEASE_VERSION_INVALID_TYPE).run();
     }
 
     @Test
     void getReleaseVersion_failure_invalidReleaseType_validSchema() {
-        RestAssuredTemplates.testGet_validateSchema(GET_RELEASE_VERSION_INVALID_TYPE);
+        EndpointTestBuilder.from(GET_RELEASE_VERSION_INVALID_TYPE).andCheckSchema().run();
     }
 }