Skip to content
Snippets Groups Projects
Commit 4697260e authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

Merge branch 'malowe/master/v0.8-test-mig' into 'master' 

Update to 0.8.0 api common, migrate tests to new format

See merge request !37
parents 6ac2acbe 2918c93f
No related branches found
No related tags found
1 merge request!37Update to 0.8.0 api common, migrate tests to new format
Pipeline #30887 passed
Hide whitespace changes
Inline Side-by-side
pom.xml
+ 1
− 1
View file @ 4697260e
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id> <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>2.16.7.Final</quarkus.platform.version> <quarkus.platform.version>2.16.7.Final</quarkus.platform.version>
<eclipse-api-version>0.7.7</eclipse-api-version> <eclipse-api-version>0.8.0</eclipse-api-version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version> <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
......
src/main/resources/application.properties
+ 1
− 0
View file @ 4697260e
...@@ -5,6 +5,7 @@ quarkus.http.port=8080 ...@@ -5,6 +5,7 @@ quarkus.http.port=8080
quarkus.oidc.enabled=false quarkus.oidc.enabled=false
quarkus.keycloak.devservices.enabled=false quarkus.keycloak.devservices.enabled=false
eclipse.pagination.filter.enabled=false
# Pagination configs # Pagination configs
eclipse.pagination.filter.enabled=false eclipse.pagination.filter.enabled=false
......
src/test/java/org/eclipsefoundation/geoip/client/resources/CityResourceTest.java
+ 14
− 13
View file @ 4697260e
...@@ -13,8 +13,9 @@ package org.eclipsefoundation.geoip.client.resources; ...@@ -13,8 +13,9 @@ package org.eclipsefoundation.geoip.client.resources;
import org.eclipsefoundation.geoip.client.test.namespaces.SchemaNamespaceHelper; import org.eclipsefoundation.geoip.client.test.namespaces.SchemaNamespaceHelper;
import org.eclipsefoundation.testing.helpers.TestCaseHelper; 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.Test;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
...@@ -42,20 +43,20 @@ class CityResourceTest { ...@@ -42,20 +43,20 @@ class CityResourceTest {
@Test @Test
void testCities_success() { void testCities_success() {
RestAssuredTemplates.testGet(IPV4_SUCCESS); EndpointTestBuilder.from(IPV4_SUCCESS).run();
RestAssuredTemplates.testGet(IPV6_SUCCESS); EndpointTestBuilder.from(IPV6_SUCCESS).run();
} }
@Test @Test
void testCities_success_validSchema() { void testCities_success_validSchema() {
RestAssuredTemplates.testGet_validateSchema(IPV4_SUCCESS); EndpointTestBuilder.from(IPV4_SUCCESS).andCheckSchema().run();
RestAssuredTemplates.testGet_validateSchema(IPV6_SUCCESS); EndpointTestBuilder.from(IPV6_SUCCESS).andCheckSchema().run();
} }
@Test @Test
void testCities_success_validateResponseFormat() { void testCities_success_validateResponseFormat() {
RestAssuredTemplates.testGet_validateResponseFormat(IPV4_SUCCESS); EndpointTestBuilder.from(IPV4_SUCCESS).andCheckFormat().run();
RestAssuredTemplates.testGet_validateResponseFormat(IPV6_SUCCESS); EndpointTestBuilder.from(IPV6_SUCCESS).andCheckFormat().run();
} }
@Test @Test
...@@ -69,17 +70,17 @@ class CityResourceTest { ...@@ -69,17 +70,17 @@ class CityResourceTest {
// IPv4 tests // IPv4 tests
for (String ip : badIPV4s) { for (String ip : badIPV4s) {
testCase = TestCaseHelper.buildBadRequestCase(CITIES_ENDPOINT_URL, new String[] { ip }, ""); testCase = TestCaseHelper.buildBadRequestCase(CITIES_ENDPOINT_URL, new String[] { ip }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
// seems to be an issue with Google Guava code, only gets detected by MaxMind // seems to be an issue with Google Guava code, only gets detected by MaxMind
testCase = TestCaseHelper.prepareTestCase(CITIES_ENDPOINT_URL, new String[] { "0.1.1.1" }, "") testCase = TestCaseHelper.prepareTestCase(CITIES_ENDPOINT_URL, new String[] { "0.1.1.1" }, "")
.setStatusCode(500).build(); .setStatusCode(500).build();
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
// IPv6 test // IPv6 test
testCase = TestCaseHelper.buildBadRequestCase(CITIES_ENDPOINT_URL, new String[] { "bad:ip:add::res" }, ""); testCase = TestCaseHelper.buildBadRequestCase(CITIES_ENDPOINT_URL, new String[] { "bad:ip:add::res" }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
@Test @Test
...@@ -91,12 +92,12 @@ class CityResourceTest { ...@@ -91,12 +92,12 @@ class CityResourceTest {
for (String ip : badIPV4s) { for (String ip : badIPV4s) {
testCase = TestCaseHelper.buildBadRequestCase(CITIES_ENDPOINT_URL, new String[] { ip }, ""); testCase = TestCaseHelper.buildBadRequestCase(CITIES_ENDPOINT_URL, new String[] { ip }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
for (String ip : badIPV6s) { for (String ip : badIPV6s) {
testCase = TestCaseHelper.buildBadRequestCase(CITIES_ENDPOINT_URL, new String[] { ip }, ""); testCase = TestCaseHelper.buildBadRequestCase(CITIES_ENDPOINT_URL, new String[] { ip }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
} }
} }
src/test/java/org/eclipsefoundation/geoip/client/resources/CountryResourceTest.java
+ 14
− 13
View file @ 4697260e
...@@ -13,8 +13,9 @@ package org.eclipsefoundation.geoip.client.resources; ...@@ -13,8 +13,9 @@ package org.eclipsefoundation.geoip.client.resources;
import org.eclipsefoundation.geoip.client.test.namespaces.SchemaNamespaceHelper; import org.eclipsefoundation.geoip.client.test.namespaces.SchemaNamespaceHelper;
import org.eclipsefoundation.testing.helpers.TestCaseHelper; 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.Test;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
...@@ -43,20 +44,20 @@ class CountryResourceTest { ...@@ -43,20 +44,20 @@ class CountryResourceTest {
@Test @Test
void testCountries_success() { void testCountries_success() {
RestAssuredTemplates.testGet(IPV4_SUCCESS); EndpointTestBuilder.from(IPV4_SUCCESS).run();
RestAssuredTemplates.testGet(IPV6_SUCCESS); EndpointTestBuilder.from(IPV6_SUCCESS).run();
} }
@Test @Test
void testCities_success_validSchema() { void testCities_success_validSchema() {
RestAssuredTemplates.testGet_validateSchema(IPV4_SUCCESS); EndpointTestBuilder.from(IPV4_SUCCESS).andCheckSchema().run();
RestAssuredTemplates.testGet_validateSchema(IPV6_SUCCESS); EndpointTestBuilder.from(IPV6_SUCCESS).andCheckSchema().run();
} }
@Test @Test
void testCities_success_validateResponseFormat() { void testCities_success_validateResponseFormat() {
RestAssuredTemplates.testGet_validateResponseFormat(IPV4_SUCCESS); EndpointTestBuilder.from(IPV4_SUCCESS).andCheckFormat().run();
RestAssuredTemplates.testGet_validateResponseFormat(IPV6_SUCCESS); EndpointTestBuilder.from(IPV6_SUCCESS).andCheckFormat().run();
} }
@Test @Test
...@@ -70,17 +71,17 @@ class CountryResourceTest { ...@@ -70,17 +71,17 @@ class CountryResourceTest {
// IPv4 tests // IPv4 tests
for (String ip : badIPV4s) { for (String ip : badIPV4s) {
testCase = TestCaseHelper.buildBadRequestCase(COUNTRY_ENDPOINT_URL, new String[] { ip }, ""); testCase = TestCaseHelper.buildBadRequestCase(COUNTRY_ENDPOINT_URL, new String[] { ip }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
// seems to be an issue with Google Guava code, only gets detected by MaxMind // seems to be an issue with Google Guava code, only gets detected by MaxMind
testCase = TestCaseHelper.prepareTestCase(COUNTRY_ENDPOINT_URL, new String[] { "0.1.1.1" }, "") testCase = TestCaseHelper.prepareTestCase(COUNTRY_ENDPOINT_URL, new String[] { "0.1.1.1" }, "")
.setStatusCode(500).build(); .setStatusCode(500).build();
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
// IPv6 test // IPv6 test
testCase = TestCaseHelper.buildBadRequestCase(COUNTRY_ENDPOINT_URL, new String[] { "bad:ip:add::res" }, ""); testCase = TestCaseHelper.buildBadRequestCase(COUNTRY_ENDPOINT_URL, new String[] { "bad:ip:add::res" }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
@Test @Test
...@@ -92,12 +93,12 @@ class CountryResourceTest { ...@@ -92,12 +93,12 @@ class CountryResourceTest {
for (String ip : badIPV4s) { for (String ip : badIPV4s) {
testCase = TestCaseHelper.buildBadRequestCase(COUNTRY_ENDPOINT_URL, new String[] { ip }, ""); testCase = TestCaseHelper.buildBadRequestCase(COUNTRY_ENDPOINT_URL, new String[] { ip }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
for (String ip : badIPV6s) { for (String ip : badIPV6s) {
testCase = TestCaseHelper.buildBadRequestCase(COUNTRY_ENDPOINT_URL, new String[] { ip }, ""); testCase = TestCaseHelper.buildBadRequestCase(COUNTRY_ENDPOINT_URL, new String[] { ip }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
} }
} }
src/test/java/org/eclipsefoundation/geoip/client/resources/SubnetResourceTest.java
+ 12
− 11
View file @ 4697260e
...@@ -13,8 +13,9 @@ package org.eclipsefoundation.geoip.client.resources; ...@@ -13,8 +13,9 @@ package org.eclipsefoundation.geoip.client.resources;
import org.eclipsefoundation.geoip.client.test.namespaces.SchemaNamespaceHelper; import org.eclipsefoundation.geoip.client.test.namespaces.SchemaNamespaceHelper;
import org.eclipsefoundation.testing.helpers.TestCaseHelper; 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.Test;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
...@@ -38,20 +39,20 @@ class SubnetResourceTest { ...@@ -38,20 +39,20 @@ class SubnetResourceTest {
@Test @Test
void testSubnets_success() { void testSubnets_success() {
RestAssuredTemplates.testGet(IPV4_SUCCESS); EndpointTestBuilder.from(IPV4_SUCCESS).run();
RestAssuredTemplates.testGet(IPV6_SUCCESS); EndpointTestBuilder.from(IPV6_SUCCESS).run();
} }
@Test @Test
void testSubnets_success_validSchema() { void testSubnets_success_validSchema() {
RestAssuredTemplates.testGet_validateSchema(IPV4_SUCCESS); EndpointTestBuilder.from(IPV4_SUCCESS).andCheckSchema().run();
RestAssuredTemplates.testGet_validateSchema(IPV6_SUCCESS); EndpointTestBuilder.from(IPV6_SUCCESS).andCheckSchema().run();
} }
@Test @Test
void testSubnets_success_validateResponseFormat() { void testSubnets_success_validateResponseFormat() {
RestAssuredTemplates.testGet_validateResponseFormat(IPV4_SUCCESS); EndpointTestBuilder.from(IPV4_SUCCESS).andCheckFormat().run();
RestAssuredTemplates.testGet_validateResponseFormat(IPV6_SUCCESS); EndpointTestBuilder.from(IPV6_SUCCESS).andCheckFormat().run();
} }
@Test @Test
...@@ -62,13 +63,13 @@ class SubnetResourceTest { ...@@ -62,13 +63,13 @@ class SubnetResourceTest {
// bad ipv4 calls // bad ipv4 calls
for (String locale : badLocales) { for (String locale : badLocales) {
testCase = TestCaseHelper.buildNotFoundCase(SUBNETS_ENDPOINT_URL, new String[] { "ipv4", locale }, ""); testCase = TestCaseHelper.buildNotFoundCase(SUBNETS_ENDPOINT_URL, new String[] { "ipv4", locale }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
// bad ipv6 calls // bad ipv6 calls
for (String locale : badLocales) { for (String locale : badLocales) {
testCase = TestCaseHelper.buildNotFoundCase(SUBNETS_ENDPOINT_URL, new String[] { "ipv6", locale }, ""); testCase = TestCaseHelper.buildNotFoundCase(SUBNETS_ENDPOINT_URL, new String[] { "ipv6", locale }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
} }
...@@ -80,7 +81,7 @@ class SubnetResourceTest { ...@@ -80,7 +81,7 @@ class SubnetResourceTest {
// check other permutations (regex endpoint) // check other permutations (regex endpoint)
for (String subnet : badSubnets) { for (String subnet : badSubnets) {
testCase = TestCaseHelper.buildNotFoundCase(SUBNETS_ENDPOINT_URL, new String[] { subnet, "ca" }, ""); testCase = TestCaseHelper.buildNotFoundCase(SUBNETS_ENDPOINT_URL, new String[] { subnet, "ca" }, "");
RestAssuredTemplates.testGet(testCase); EndpointTestBuilder.from(testCase).run();
} }
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent