126 revert cucumberio dependencies to 72x (#127)

* #126: Reverted dependencies

* #126: Build field map when metadata loaded from a file
This commit is contained in:
Joshua Darnell 2022-07-18 20:40:54 -07:00 committed by GitHub
parent 4a5f0333be
commit 958771d71c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 23 deletions

View File

@ -39,19 +39,17 @@ dependencies {
compile 'io.rest-assured:json-path:5.1.1' compile 'io.rest-assured:json-path:5.1.1'
compile 'io.rest-assured:json-schema-validator:5.1.1' compile 'io.rest-assured:json-schema-validator:5.1.1'
compile 'io.cucumber:cucumber-java8:7.3.3' compile 'io.cucumber:cucumber-java8:7.1.0'
compile 'io.cucumber:cucumber-java:7.1.0' compile 'io.cucumber:cucumber-java:7.1.0'
compile 'io.cucumber:cucumber-junit:7.3.3' compile 'io.cucumber:cucumber-junit:7.1.0'
compile 'io.cucumber:cucumber-guice:7.3.3' compile 'io.cucumber:cucumber-guice:7.1.0'
compile 'io.cucumber:cucumber-core:7.3.3' compile 'io.cucumber:cucumber-core:7.1.0'
//TODO: choose one schema validator between this and rest-assured //TODO: choose one schema validator between this and rest-assured
compile 'com.networknt:json-schema-validator:1.0.70' compile 'com.networknt:json-schema-validator:1.0.70'
compile 'com.google.code.gson:gson:2.9.0' compile 'com.google.code.gson:gson:2.9.0'
compile 'org.apache.commons:commons-text:1.9' compile 'org.apache.commons:commons-text:1.9'
compile 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.3'
} }
configurations { configurations {
@ -89,11 +87,6 @@ final String certOutputDir = 'build/certification',
certReportsDir = certOutputDir + '/reports' certReportsDir = certOutputDir + '/reports'
task prepareEnvironment() {
delete certOutputDir
}
task testWebApiCore_2_0_0() { task testWebApiCore_2_0_0() {
group = 'RESO Certification' group = 'RESO Certification'
description = 'Web API Core 2.0.0 Acceptance Tests' + description = 'Web API Core 2.0.0 Acceptance Tests' +
@ -106,7 +99,7 @@ task testWebApiCore_2_0_0() {
String reportName = 'web-api-server.core.2.0.0' String reportName = 'web-api-server.core.2.0.0'
dependsOn jar, prepareEnvironment dependsOn jar
doLast { doLast {
javaexec { javaexec {
main = "io.cucumber.core.cli.Main" main = "io.cucumber.core.cli.Main"
@ -143,7 +136,7 @@ task testDataDictionary_1_7() {
String reportName = 'data-dictionary-1.7' String reportName = 'data-dictionary-1.7'
dependsOn jar, prepareEnvironment dependsOn jar
doLast { doLast {
javaexec { javaexec {
main = 'io.cucumber.core.cli.Main' main = 'io.cucumber.core.cli.Main'
@ -191,7 +184,7 @@ task testDataAvailability_1_7() {
String reportName = 'data-availability.dd-1.7' String reportName = 'data-availability.dd-1.7'
dependsOn jar, prepareEnvironment dependsOn jar
doLast { doLast {
javaexec { javaexec {
main = "io.cucumber.core.cli.Main" main = "io.cucumber.core.cli.Main"
@ -223,7 +216,7 @@ task testIdxPayload_1_7() {
String reportName = 'idx-payload.dd-1.7' String reportName = 'idx-payload.dd-1.7'
dependsOn jar, prepareEnvironment dependsOn jar
doLast { doLast {
javaexec { javaexec {
main = "io.cucumber.core.cli.Main" main = "io.cucumber.core.cli.Main"
@ -272,14 +265,12 @@ test {
main = "io.cucumber.core.cli.Main" main = "io.cucumber.core.cli.Main"
classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output
args = [ args = [
'--plugin', '--plugin',
'pretty', 'pretty',
'--glue', '--glue',
'org.reso.commander.test.stepdefs', 'org.reso.commander.test.stepdefs',
'src/test/java/org/reso/commander/test/features' 'src/test/java/org/reso/commander/test/features'
] ]
} }
} }
} }

View File

@ -213,7 +213,7 @@ public final class WebAPITestContainer implements TestContainer {
/** /**
* Creates a metadata field map for the given resource name and each set of fields found for that resource, if present * Creates a metadata field map for the given resource name and each set of fields found for that resource, if present
*/ */
private void buildFieldMap() { public void buildFieldMap() {
try { try {
if (fieldMap.get() == null) { if (fieldMap.get() == null) {
fieldMap.set(new LinkedHashMap<>()); fieldMap.set(new LinkedHashMap<>());

View File

@ -189,6 +189,9 @@ public class DataDictionary {
//create metadata report //create metadata report
Commander.generateMetadataReport(container.getEdm()); Commander.generateMetadataReport(container.getEdm());
//the container needs a field map built when the metadata is being loaded from a file
container.buildFieldMap();
} catch (IOException e) { } catch (IOException e) {
failAndExitWithErrorMessage(getDefaultErrorMessage(e), scenario); failAndExitWithErrorMessage(getDefaultErrorMessage(e), scenario);
} }