From 4f1a7b507d754d2ea90df397ce8162dbf0aca2a0 Mon Sep 17 00:00:00 2001 From: bischoffz Date: Thu, 9 May 2024 12:37:21 -0400 Subject: [PATCH] rename files --- .../testsupport/AT_PipelineTestSupport.java | 44 +++++++++---------- ....json => globalPropertiesPluginData1.json} | 0 ....json => globalPropertiesPluginData2.json} | 0 ....json => globalPropertiesPluginData3.json} | 0 ....json => globalPropertiesPluginData4.json} | 0 5 files changed, 21 insertions(+), 23 deletions(-) rename src/test/resources/{globalpropertiesPluginData1.json => globalPropertiesPluginData1.json} (100%) rename src/test/resources/{globalpropertiesPluginData2.json => globalPropertiesPluginData2.json} (100%) rename src/test/resources/{globalpropertiesPluginData3.json => globalPropertiesPluginData3.json} (100%) rename src/test/resources/{globalpropertiesPluginData4.json => globalPropertiesPluginData4.json} (100%) diff --git a/src/test/java/gov/hhs/aspr/ms/gcm/pipeline/testsupport/AT_PipelineTestSupport.java b/src/test/java/gov/hhs/aspr/ms/gcm/pipeline/testsupport/AT_PipelineTestSupport.java index 0200920..e1a08fa 100644 --- a/src/test/java/gov/hhs/aspr/ms/gcm/pipeline/testsupport/AT_PipelineTestSupport.java +++ b/src/test/java/gov/hhs/aspr/ms/gcm/pipeline/testsupport/AT_PipelineTestSupport.java @@ -32,29 +32,27 @@ import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; public class AT_PipelineTestSupport { - Path REOURCE_DIR = ResourceHelper.getResourceDir(this.getClass()); - String TEST_OUTPUT_DIR_NAME = "testOutput"; - Path TEST_OUTPUT_DIR = getResolvedResourcePath(TEST_OUTPUT_DIR_NAME); - String TEST_FILE_NAME = "pipeline_tester.json"; - String TEST_FILE_DIR_NAME = "pipeline_tester_dir.json"; - String TEST_FILE_PREV_NAME = "pipeline_tester_prev.json"; - String TEST_FILE_BAD_NAME = "pipeline_tester_bad.json"; - String TEST_FILE_NAME_RESOLVED = "pipeline_tester_resolved.json"; - - String TEST_GP_FILE_1 = "globalPropertiesPluginData1.json"; - String TEST_GP_FILE_2 = "globalPropertiesPluginData2.json"; - String TEST_GP_FILE_3 = "globalPropertiesPluginData3.json"; - String TEST_GP_FILE_4 = "globalPropertiesPluginData4.json"; - - Path TEST_GP_FILE_1_PATH = getResolvedResourcePath(TEST_GP_FILE_1); - Path TEST_GP_FILE_2_PATH = getResolvedResourcePath(TEST_GP_FILE_2); - Path TEST_GP_FILE_3_PATH = getResolvedResourcePath(TEST_GP_FILE_3); - Path TEST_GP_FILE_4_PATH = getResolvedResourcePath(TEST_GP_FILE_4); - - Path getResolvedResourcePath(String path) { - Path resolvedPath = REOURCE_DIR.resolve(path).toAbsolutePath(); - System.out.println(resolvedPath.toString()); - return resolvedPath; + private final Path REOURCE_DIR = ResourceHelper.getResourceDir(this.getClass()); + private final String TEST_OUTPUT_DIR_NAME = "testOutput"; + private final Path TEST_OUTPUT_DIR = getResolvedResourcePath(TEST_OUTPUT_DIR_NAME); + private final String TEST_FILE_NAME = "pipeline_tester.json"; + private final String TEST_FILE_DIR_NAME = "pipeline_tester_dir.json"; + private final String TEST_FILE_PREV_NAME = "pipeline_tester_prev.json"; + private final String TEST_FILE_BAD_NAME = "pipeline_tester_bad.json"; + private final String TEST_FILE_NAME_RESOLVED = "pipeline_tester_resolved.json"; + + private final String TEST_GP_FILE_1 = "globalPropertiesPluginData1.json"; + private final String TEST_GP_FILE_2 = "globalPropertiesPluginData2.json"; + private final String TEST_GP_FILE_3 = "globalPropertiesPluginData3.json"; + private final String TEST_GP_FILE_4 = "globalPropertiesPluginData4.json"; + + private final Path TEST_GP_FILE_1_PATH = getResolvedResourcePath(TEST_GP_FILE_1); + private final Path TEST_GP_FILE_2_PATH = getResolvedResourcePath(TEST_GP_FILE_2); + private final Path TEST_GP_FILE_3_PATH = getResolvedResourcePath(TEST_GP_FILE_3); + private final Path TEST_GP_FILE_4_PATH = getResolvedResourcePath(TEST_GP_FILE_4); + + private final Path getResolvedResourcePath(String path) { + return REOURCE_DIR.resolve(path).toAbsolutePath(); } @Test diff --git a/src/test/resources/globalpropertiesPluginData1.json b/src/test/resources/globalPropertiesPluginData1.json similarity index 100% rename from src/test/resources/globalpropertiesPluginData1.json rename to src/test/resources/globalPropertiesPluginData1.json diff --git a/src/test/resources/globalpropertiesPluginData2.json b/src/test/resources/globalPropertiesPluginData2.json similarity index 100% rename from src/test/resources/globalpropertiesPluginData2.json rename to src/test/resources/globalPropertiesPluginData2.json diff --git a/src/test/resources/globalpropertiesPluginData3.json b/src/test/resources/globalPropertiesPluginData3.json similarity index 100% rename from src/test/resources/globalpropertiesPluginData3.json rename to src/test/resources/globalPropertiesPluginData3.json diff --git a/src/test/resources/globalpropertiesPluginData4.json b/src/test/resources/globalPropertiesPluginData4.json similarity index 100% rename from src/test/resources/globalpropertiesPluginData4.json rename to src/test/resources/globalPropertiesPluginData4.json