From 958771d71cfa40449ae10051d6cc234a76534059 Mon Sep 17 00:00:00 2001
From: Joshua Darnell <darnjo@users.noreply.github.com>
Date: Mon, 18 Jul 2022 20:40:54 -0700
Subject: [PATCH] 126 revert cucumberio dependencies to 72x (#127)

* #126: Reverted dependencies

* #126: Build field map when metadata loaded from a file
---
 build.gradle                                  | 35 +++++++------------
 .../containers/WebAPITestContainer.java       |  2 +-
 .../stepdefs/DataDictionary.java              |  3 ++
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8d05ce6..50754c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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 {
@@ -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' +
@@ -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"
@@ -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'
@@ -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"
@@ -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"
@@ -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'
       ]
     }
   }
 }
-
-
diff --git a/src/main/java/org/reso/certification/containers/WebAPITestContainer.java b/src/main/java/org/reso/certification/containers/WebAPITestContainer.java
index c05a54c..ed4cca2 100644
--- a/src/main/java/org/reso/certification/containers/WebAPITestContainer.java
+++ b/src/main/java/org/reso/certification/containers/WebAPITestContainer.java
@@ -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
    */
-  private void buildFieldMap() {
+  public void buildFieldMap() {
     try {
       if (fieldMap.get() == null) {
         fieldMap.set(new LinkedHashMap<>());
diff --git a/src/main/java/org/reso/certification/stepdefs/DataDictionary.java b/src/main/java/org/reso/certification/stepdefs/DataDictionary.java
index 59f2dc2..40cb3a2 100644
--- a/src/main/java/org/reso/certification/stepdefs/DataDictionary.java
+++ b/src/main/java/org/reso/certification/stepdefs/DataDictionary.java
@@ -189,6 +189,9 @@ public class DataDictionary {
         //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);
       }