fix up some unit test resource files

aodn · Nov 13, 2023 · 9e9a0dd · 9e9a0dd
1 parent 40ac4a6
commit 9e9a0dd
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 5 deletions.
diff --git a/aggregation-worker/src/main/java/au/org/emii/aggregationworker/AggregationWorker.java b/aggregation-worker/src/main/java/au/org/emii/aggregationworker/AggregationWorker.java
@@ -20,7 +20,6 @@
 import au.org.aodn.aws.geoserver.client.HttpIndexReader;
 import au.org.aodn.aws.geoserver.client.SubsetParameters;
 import au.org.aodn.aws.geoserver.client.TimeNotSupportedException;
-import au.org.emii.util.IntegerHelper;
 import au.org.emii.util.NumberRange;
 import au.org.emii.util.ProvenanceWriter;
 import com.amazonaws.AmazonServiceException;
@@ -369,7 +368,7 @@ public void start() {
 
                 //  Search for the metadata record for the layer by layer name
                 String catalogueURL = WpsConfig.getProperty(GEONETWORK_CATALOGUE_URL_CONFIG_KEY);
-                String layerSearchField = WpsConfig.getProperty(GEONETWORK_LAYER_SEARCH_FIELD_CONFIG_KEY);
+                String layerSearchField = WpsConfig.getProperty(GEONETWORK_CATALOGUE_LAYER_FIELD_CONFIG_KEY);
                 CatalogueReader catalogueReader = new CatalogueReader(catalogueURL, layerSearchField);
 
                 //TODO: You need to report failure in the status report, otherwise the client keep waiting
@@ -590,7 +589,7 @@ private String getCollectionTitle(JobFileManager jobFileManager) throws Exceptio
 
         //  Search for the metadata record for the layer by layer name
         String catalogueURL = WpsConfig.getProperty(GEONETWORK_CATALOGUE_URL_CONFIG_KEY);
-        String layerSearchField = WpsConfig.getProperty(GEONETWORK_LAYER_SEARCH_FIELD_CONFIG_KEY);
+        String layerSearchField = WpsConfig.getProperty(GEONETWORK_CATALOGUE_LAYER_FIELD_CONFIG_KEY);
         CatalogueReader catalogueReader = new CatalogueReader(catalogueURL, layerSearchField);
 
         String metadataResponseXML = catalogueReader.getMetadataSummaryXML(layer);

diff --git a/...gation-worker/src/test/java/au/org/emii/aggregationworker/YmlToSystemEnvConfigRunner.java b/...gation-worker/src/test/java/au/org/emii/aggregationworker/YmlToSystemEnvConfigRunner.java
@@ -92,7 +92,7 @@ public void run(String... args) {
         System.setProperty(WpsConfig.REQUEST_S3_FILENAME_CONFIG_KEY, requestFileName.orElse(null));
         System.setProperty(WpsConfig.WPS_ENDPOINT_URL_CONFIG_KEY, endPointUrl.orElse(null));
         System.setProperty(WpsConfig.GEONETWORK_CATALOGUE_URL_CONFIG_KEY, geoNetworkUrl.orElse(null));
-        System.setProperty(WpsConfig.GEONETWORK_LAYER_SEARCH_FIELD_CONFIG_KEY, geonetworkLayerSearchField.orElse(null));
+        System.setProperty(WpsConfig.GEONETWORK_CATALOGUE_LAYER_FIELD_CONFIG_KEY, geonetworkLayerSearchField.orElse(null));
         System.setProperty(WpsConfig.ADMINISTRATOR_EMAIL, administratorEmail.orElse(null));
         System.setProperty(WpsConfig.OUTPUT_S3_BUCKET_CONFIG_KEY, outputBucket.orElse(null));
         System.setProperty(WpsConfig.AWS_REGION_SES_CONFIG_KEY, region.orElse(null));

diff --git a/aggregator/src/test/resources/au/org/emii/aggregator/gsla-expected.nc b/aggregator/src/test/resources/au/org/emii/aggregator/gsla-expected.nc
diff --git a/aggregator/src/test/resources/au/org/emii/aggregator/projection-expected.nc b/aggregator/src/test/resources/au/org/emii/aggregator/projection-expected.nc
diff --git a/aggregator/src/test/resources/au/org/emii/aggregator/projection-point-outside-expected.nc b/aggregator/src/test/resources/au/org/emii/aggregator/projection-point-outside-expected.nc
diff --git a/aggregator/src/test/resources/au/org/emii/aggregator/projection-point-within-expected.nc b/aggregator/src/test/resources/au/org/emii/aggregator/projection-point-within-expected.nc
diff --git a/aggregator/src/test/resources/au/org/emii/aggregator/temporal-expected.nc b/aggregator/src/test/resources/au/org/emii/aggregator/temporal-expected.nc
diff --git a/aggregator/src/test/resources/au/org/emii/aggregator/unpack-expected.nc b/aggregator/src/test/resources/au/org/emii/aggregator/unpack-expected.nc
diff --git a/lambda/job-status-service-lambda-package.zip b/lambda/job-status-service-lambda-package.zip
diff --git a/lambda/request-handler-lambda-package.zip b/lambda/request-handler-lambda-package.zip
diff --git a/wps-common/src/main/java/au/org/aodn/aws/wps/status/WpsConfig.java b/wps-common/src/main/java/au/org/aodn/aws/wps/status/WpsConfig.java
@@ -51,7 +51,7 @@ public class WpsConfig {
     public static final String DOWNLOAD_READ_TIMEOUT_CONFIG_KEY = "DOWNLOAD_READ_TIMEOUT";
 
     public static final String GEONETWORK_CATALOGUE_URL_CONFIG_KEY = "GEONETWORK_CATALOGUE_URL";
-    public static final String GEONETWORK_LAYER_SEARCH_FIELD_CONFIG_KEY = "GEONETWORK_LAYER_SEARCH_FIELD";
+    public static final String GEONETWORK_CATALOGUE_LAYER_FIELD_CONFIG_KEY = "GEONETWORK_LAYER_SEARCH_FIELD";
 
     public static final String STATUS_SERVICE_JOB_ID_PARAMETER_NAME = "jobId";
     public static final String STATUS_SERVICE_FORMAT_PARAMETER_NAME = "format";