Skip to content

126 revert cucumberio dependencies to 72x #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 13 additions & 22 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,17 @@ dependencies {
compile 'io.rest-assured:json-path: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-junit:7.3.3'
compile 'io.cucumber:cucumber-guice:7.3.3'
compile 'io.cucumber:cucumber-core:7.3.3'
compile 'io.cucumber:cucumber-junit:7.1.0'
compile 'io.cucumber:cucumber-guice:7.1.0'
compile 'io.cucumber:cucumber-core:7.1.0'

//TODO: choose one schema validator between this and rest-assured
compile 'com.networknt:json-schema-validator:1.0.70'
compile 'com.google.code.gson:gson:2.9.0'
compile 'org.apache.commons:commons-text:1.9'

compile 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.3'

}

configurations {
Expand Down Expand Up @@ -89,11 +87,6 @@ final String certOutputDir = 'build/certification',
certReportsDir = certOutputDir + '/reports'


task prepareEnvironment() {
delete certOutputDir
}


task testWebApiCore_2_0_0() {
group = 'RESO Certification'
description = 'Web API Core 2.0.0 Acceptance Tests' +
Expand All @@ -106,7 +99,7 @@ task testWebApiCore_2_0_0() {

String reportName = 'web-api-server.core.2.0.0'

dependsOn jar, prepareEnvironment
dependsOn jar
doLast {
javaexec {
main = "io.cucumber.core.cli.Main"
Expand Down Expand Up @@ -143,7 +136,7 @@ task testDataDictionary_1_7() {

String reportName = 'data-dictionary-1.7'

dependsOn jar, prepareEnvironment
dependsOn jar
doLast {
javaexec {
main = 'io.cucumber.core.cli.Main'
Expand Down Expand Up @@ -191,7 +184,7 @@ task testDataAvailability_1_7() {

String reportName = 'data-availability.dd-1.7'

dependsOn jar, prepareEnvironment
dependsOn jar
doLast {
javaexec {
main = "io.cucumber.core.cli.Main"
Expand Down Expand Up @@ -223,7 +216,7 @@ task testIdxPayload_1_7() {

String reportName = 'idx-payload.dd-1.7'

dependsOn jar, prepareEnvironment
dependsOn jar
doLast {
javaexec {
main = "io.cucumber.core.cli.Main"
Expand Down Expand Up @@ -272,14 +265,12 @@ test {
main = "io.cucumber.core.cli.Main"
classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output
args = [
'--plugin',
'pretty',
'--glue',
'org.reso.commander.test.stepdefs',
'src/test/java/org/reso/commander/test/features'
'--plugin',
'pretty',
'--glue',
'org.reso.commander.test.stepdefs',
'src/test/java/org/reso/commander/test/features'
]
}
}
}


Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public Map<String, CsdlProperty> getFieldMap(String entityTypeName) {
/**
* 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 {
if (fieldMap.get() == null) {
fieldMap.set(new LinkedHashMap<>());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ public void validMetadataAreLoadedIntoTheTestContainer() {
//create metadata report
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) {
failAndExitWithErrorMessage(getDefaultErrorMessage(e), scenario);
}
Expand Down