Skip to content
Snippets Groups Projects

Fix modifier order in tests, update mocks to use modern stream api calls

Merged Martin Lowe requested to merge malowe/main/reduce-codesmell into main
2 files
+ 25
26
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -22,83 +22,83 @@ import io.quarkus.test.junit.QuarkusTest;
@QuarkusTest
class WorkingGroupsResourceTest {
public final static String WGS_BASE_URL = "";
public static final String WGS_BASE_URL = "";
public final static String WG_STATUS_URL = WGS_BASE_URL + "?status={param}";
public final static String WG_STATUSES_URL = WGS_BASE_URL + "?status={param1}&status={param2}";
public static final String WG_STATUS_URL = WGS_BASE_URL + "?status={param}";
public static final String WG_STATUSES_URL = WGS_BASE_URL + "?status={param1}&status={param2}";
public final static String WG_BASE_URL = WGS_BASE_URL + "/{alias}";
public static final String WG_BASE_URL = WGS_BASE_URL + "/{alias}";
public final static String WG_RESOURCES_URL = WG_BASE_URL + "/resources";
public final static String WG_LEVELS_URL = WG_BASE_URL + "/levels";
public final static String WG_AGREEMENTS_URL = WG_BASE_URL + "/agreements";
public final static String WG_COMMITTEES_URL = WG_BASE_URL + "/committees/{relationType}";
public static final String WG_RESOURCES_URL = WG_BASE_URL + "/resources";
public static final String WG_LEVELS_URL = WG_BASE_URL + "/levels";
public static final String WG_AGREEMENTS_URL = WG_BASE_URL + "/agreements";
public static final String WG_COMMITTEES_URL = WG_BASE_URL + "/committees/{relationType}";
/*
* GET_ALL
*/
public final static EndpointTestCase GET_ALL_SUCCESS = TestCaseHelper
public static final EndpointTestCase GET_ALL_SUCCESS = TestCaseHelper
.buildSuccessCase(WGS_BASE_URL, new String[] {}, SchemaNamespaceHelper.WORKING_GROUPS_SCHEMA_PATH);
public final static EndpointTestCase GET_ALL_SINGLE_STATUS_SUCCESS = TestCaseHelper
public static final EndpointTestCase GET_ALL_SINGLE_STATUS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_STATUS_URL, new String[] { "active" }, SchemaNamespaceHelper.WORKING_GROUPS_SCHEMA_PATH);
public final static EndpointTestCase GET_ALL_MULTI_STATUS_SUCCESS = TestCaseHelper
public static final EndpointTestCase GET_ALL_MULTI_STATUS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_STATUSES_URL, new String[] { "active", "archived" }, SchemaNamespaceHelper.WORKING_GROUPS_SCHEMA_PATH);
/*
* GET_BY_ALIAS
*/
public final static EndpointTestCase GET_BY_ALIAS_SUCCESS = TestCaseHelper
public static final EndpointTestCase GET_BY_ALIAS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_BASE_URL, new String[] { "awful-group" }, SchemaNamespaceHelper.WORKING_GROUP_SCHEMA_PATH);
public final static EndpointTestCase GET_BY_ALIAS_404 = TestCaseHelper
public static final EndpointTestCase GET_BY_ALIAS_404 = TestCaseHelper
.buildNotFoundCase(WG_BASE_URL, new String[] { "invalid-Group" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
/*
* GET_RESOURCES
*/
public final static EndpointTestCase GET_RESOURCES_SUCCESS = TestCaseHelper
public static final EndpointTestCase GET_RESOURCES_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_RESOURCES_URL, new String[] { "important-group" },
SchemaNamespaceHelper.WORKING_GROUP_RESOURCES_SCHEMA_PATH);
public final static EndpointTestCase GET_RESOURCES_404 = TestCaseHelper
public static final EndpointTestCase GET_RESOURCES_404 = TestCaseHelper
.buildNotFoundCase(WG_RESOURCES_URL, new String[] { "invalid-Group" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
/*
* GET_LEVELS
*/
public final static EndpointTestCase GET_LEVELS_SUCCESS = TestCaseHelper
public static final EndpointTestCase GET_LEVELS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_LEVELS_URL, new String[] { "mediocre-group" }, SchemaNamespaceHelper.WORKING_GROUP_LEVELS_SCHEMA_PATH);
public final static EndpointTestCase GET_LEVELS_404 = TestCaseHelper
public static final EndpointTestCase GET_LEVELS_404 = TestCaseHelper
.buildNotFoundCase(WG_LEVELS_URL, new String[] { "invalid-Group" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
/*
* GET_AGREEMENTS
*/
public final static EndpointTestCase GET_AGREEMENTS_SUCCESS = TestCaseHelper
public static final EndpointTestCase GET_AGREEMENTS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_AGREEMENTS_URL, new String[] { "important-group" },
SchemaNamespaceHelper.WORKING_GROUP_AGREEMENTS_SCHEMA_PATH);
public final static EndpointTestCase GET_AGREEMENTS_404 = TestCaseHelper
public static final EndpointTestCase GET_AGREEMENTS_404 = TestCaseHelper
.buildNotFoundCase(WG_AGREEMENTS_URL, new String[] { "invalid-Group" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
/*
* GET_COMMITTEE
*/
public final static EndpointTestCase GET_COMMITTEES_SUCCESS_STEERING = TestCaseHelper
public static final EndpointTestCase GET_COMMITTEES_SUCCESS_STEERING = TestCaseHelper
.buildSuccessCase(WG_COMMITTEES_URL, new String[] { "important-group", "wmc" },
SchemaNamespaceHelper.WORKING_GROUP_COMMITTEE_SCHEMA_PATH);
public final static EndpointTestCase GET_COMMITTEES_SUCCESS_MARKETING = TestCaseHelper
public static final EndpointTestCase GET_COMMITTEES_SUCCESS_MARKETING = TestCaseHelper
.buildSuccessCase(WG_COMMITTEES_URL, new String[] { "mediocre-group", "wsc" },
SchemaNamespaceHelper.WORKING_GROUP_COMMITTEE_SCHEMA_PATH);
public final static EndpointTestCase GET_COMMITTEE_INVALID_ALIAS = TestCaseHelper
public static final EndpointTestCase GET_COMMITTEE_INVALID_ALIAS = TestCaseHelper
.buildBadRequestCase(WG_COMMITTEES_URL, new String[] { "invalid-Group", "WMC" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
public final static EndpointTestCase GET_COMMITTEE_INVALID_GROUP = TestCaseHelper
public static final EndpointTestCase GET_COMMITTEE_INVALID_GROUP = TestCaseHelper
.buildBadRequestCase(WG_COMMITTEES_URL, new String[] { "mediocre-Group", "WSC" }, SchemaNamespaceHelper.ERROR_SCHEMA_PATH);
/*
Loading