From c2d006b996af62a4c6101fa2a5f086dc1794a039 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 25 Nov 2019 10:54:01 +0100 Subject: [PATCH] Changed the file naming (i.e. remove -rule and -values) --- .../datamodel/validations/validators/TestRules.java | 4 ++-- ...-generate-values.csv => AuthorizationService-generate.csv} | 0 ...-generate-rule.json => AuthorizationService-generate.json} | 0 ...-retrieve-values.csv => AuthorizationService-retrieve.csv} | 0 ...-retrieve-rule.json => AuthorizationService-retrieve.json} | 0 ...vice-scopes-values.csv => AuthorizationService-scopes.csv} | 0 ...vice-scopes-rule.json => AuthorizationService-scopes.json} | 0 ...talogue-WS-UNKNOWN-values.csv => Catalogue-WS-UNKNOWN.csv} | 0 ...talogue-WS-UNKNOWN-rule.json => Catalogue-WS-UNKNOWN.json} | 0 ...logue-WS-licenses-values.csv => Catalogue-WS-licenses.csv} | 0 ...logue-WS-licenses-rule.json => Catalogue-WS-licenses.json} | 0 ...rganizations-values.csv => Catalogue-WS-organizations.csv} | 0 ...rganizations-rule.json => Catalogue-WS-organizations.json} | 0 ...Connector-connect-values.csv => CkanConnector-connect.csv} | 0 ...Connector-connect-rule.json => CkanConnector-connect.json} | 0 ...tor-disconnect-values.csv => CkanConnector-disconnect.csv} | 0 ...tor-disconnect-rule.json => CkanConnector-disconnect.json} | 0 ...dexNode-delete-values.csv => FullTextIndexNode-delete.csv} | 0 ...dexNode-delete-rule.json => FullTextIndexNode-delete.json} | 0 ...ection-values.csv => FullTextIndexNode-dropCollection.csv} | 0 ...ection-rule.json => FullTextIndexNode-dropCollection.json} | 0 ...dexNode-insert-values.csv => FullTextIndexNode-insert.csv} | 0 ...dexNode-insert-rule.json => FullTextIndexNode-insert.json} | 0 ...tions-values.csv => FullTextIndexNode-listCollections.csv} | 0 ...tions-rule.json => FullTextIndexNode-listCollections.json} | 0 ...dexNode-search-values.csv => FullTextIndexNode-search.csv} | 0 ...dexNode-search-rule.json => FullTextIndexNode-search.json} | 0 .../{GeoNetwork-login-values.csv => GeoNetwork-login.csv} | 0 .../{GeoNetwork-login-rule.json => GeoNetwork-login.json} | 0 .../{RConnector-UNKNOWN-values.csv => RConnector-UNKNOWN.csv} | 0 .../{RConnector-UNKNOWN-rule.json => RConnector-UNKNOWN.json} | 0 .../{RConnector-connect-values.csv => RConnector-connect.csv} | 0 .../{RConnector-connect-rule.json => RConnector-connect.json} | 0 .../{ShareLatex-connect-values.csv => ShareLatex-connect.csv} | 0 .../{ShareLatex-connect-rule.json => ShareLatex-connect.json} | 0 ...eLatex-disconnect-values.csv => ShareLatex-disconnect.csv} | 0 ...eLatex-disconnect-rule.json => ShareLatex-disconnect.json} | 0 ...y-values.csv => SimulFishGrowthData-BroodstockQuality.csv} | 0 ...y-rule.json => SimulFishGrowthData-BroodstockQuality.json} | 0 ...ating-values.csv => SimulFishGrowthData-CurrentRating.csv} | 0 ...ating-rule.json => SimulFishGrowthData-CurrentRating.json} | 0 ...Quality-values.csv => SimulFishGrowthData-FeedQuality.csv} | 0 ...Quality-rule.json => SimulFishGrowthData-FeedQuality.json} | 0 ...ata-Modeler-values.csv => SimulFishGrowthData-Modeler.csv} | 0 ...ata-Modeler-rule.json => SimulFishGrowthData-Modeler.json} | 0 ...Rating-values.csv => SimulFishGrowthData-OxygenRating.csv} | 0 ...Rating-rule.json => SimulFishGrowthData-OxygenRating.json} | 0 ...hData-Region-values.csv => SimulFishGrowthData-Region.csv} | 0 ...hData-Region-rule.json => SimulFishGrowthData-Region.json} | 0 ...a-Scenario-values.csv => SimulFishGrowthData-Scenario.csv} | 0 ...a-Scenario-rule.json => SimulFishGrowthData-Scenario.json} | 0 ...rowthData-Site-values.csv => SimulFishGrowthData-Site.csv} | 0 ...rowthData-Site-rule.json => SimulFishGrowthData-Site.json} | 0 ...ata-Species-values.csv => SimulFishGrowthData-Species.csv} | 0 ...ata-Species-rule.json => SimulFishGrowthData-Species.json} | 0 ...ata-UNKNOWN-values.csv => SimulFishGrowthData-UNKNOWN.csv} | 0 ...ata-UNKNOWN-rule.json => SimulFishGrowthData-UNKNOWN.json} | 0 .../resources/rules/{TagMe-tag-values.csv => TagMe-tag.csv} | 0 .../resources/rules/{TagMe-tag-rule.json => TagMe-tag.json} | 0 ...s-values.csv => data-transfer-service-getCapabilities.csv} | 0 ...s-rule.json => data-transfer-service-getCapabilities.json} | 0 ...ice-upload-values.csv => data-transfer-service-upload.csv} | 0 ...ice-upload-rule.json => data-transfer-service-upload.json} | 0 ...KNOWN-values.csv => geoanalytics-main-service-UNKNOWN.csv} | 0 ...KNOWN-rule.json => geoanalytics-main-service-UNKNOWN.json} | 0 .../rules/{storage-UNKNOWN-values.csv => storage-UNKNOWN.csv} | 0 .../rules/{storage-UNKNOWN-rule.json => storage-UNKNOWN.json} | 0 67 files changed, 2 insertions(+), 2 deletions(-) rename src/test/resources/rules/{AuthorizationService-generate-values.csv => AuthorizationService-generate.csv} (100%) rename src/test/resources/rules/{AuthorizationService-generate-rule.json => AuthorizationService-generate.json} (100%) rename src/test/resources/rules/{AuthorizationService-retrieve-values.csv => AuthorizationService-retrieve.csv} (100%) rename src/test/resources/rules/{AuthorizationService-retrieve-rule.json => AuthorizationService-retrieve.json} (100%) rename src/test/resources/rules/{AuthorizationService-scopes-values.csv => AuthorizationService-scopes.csv} (100%) rename src/test/resources/rules/{AuthorizationService-scopes-rule.json => AuthorizationService-scopes.json} (100%) rename src/test/resources/rules/{Catalogue-WS-UNKNOWN-values.csv => Catalogue-WS-UNKNOWN.csv} (100%) rename src/test/resources/rules/{Catalogue-WS-UNKNOWN-rule.json => Catalogue-WS-UNKNOWN.json} (100%) rename src/test/resources/rules/{Catalogue-WS-licenses-values.csv => Catalogue-WS-licenses.csv} (100%) rename src/test/resources/rules/{Catalogue-WS-licenses-rule.json => Catalogue-WS-licenses.json} (100%) rename src/test/resources/rules/{Catalogue-WS-organizations-values.csv => Catalogue-WS-organizations.csv} (100%) rename src/test/resources/rules/{Catalogue-WS-organizations-rule.json => Catalogue-WS-organizations.json} (100%) rename src/test/resources/rules/{CkanConnector-connect-values.csv => CkanConnector-connect.csv} (100%) rename src/test/resources/rules/{CkanConnector-connect-rule.json => CkanConnector-connect.json} (100%) rename src/test/resources/rules/{CkanConnector-disconnect-values.csv => CkanConnector-disconnect.csv} (100%) rename src/test/resources/rules/{CkanConnector-disconnect-rule.json => CkanConnector-disconnect.json} (100%) rename src/test/resources/rules/{FullTextIndexNode-delete-values.csv => FullTextIndexNode-delete.csv} (100%) rename src/test/resources/rules/{FullTextIndexNode-delete-rule.json => FullTextIndexNode-delete.json} (100%) rename src/test/resources/rules/{FullTextIndexNode-dropCollection-values.csv => FullTextIndexNode-dropCollection.csv} (100%) rename src/test/resources/rules/{FullTextIndexNode-dropCollection-rule.json => FullTextIndexNode-dropCollection.json} (100%) rename src/test/resources/rules/{FullTextIndexNode-insert-values.csv => FullTextIndexNode-insert.csv} (100%) rename src/test/resources/rules/{FullTextIndexNode-insert-rule.json => FullTextIndexNode-insert.json} (100%) rename src/test/resources/rules/{FullTextIndexNode-listCollections-values.csv => FullTextIndexNode-listCollections.csv} (100%) rename src/test/resources/rules/{FullTextIndexNode-listCollections-rule.json => FullTextIndexNode-listCollections.json} (100%) rename src/test/resources/rules/{FullTextIndexNode-search-values.csv => FullTextIndexNode-search.csv} (100%) rename src/test/resources/rules/{FullTextIndexNode-search-rule.json => FullTextIndexNode-search.json} (100%) rename src/test/resources/rules/{GeoNetwork-login-values.csv => GeoNetwork-login.csv} (100%) rename src/test/resources/rules/{GeoNetwork-login-rule.json => GeoNetwork-login.json} (100%) rename src/test/resources/rules/{RConnector-UNKNOWN-values.csv => RConnector-UNKNOWN.csv} (100%) rename src/test/resources/rules/{RConnector-UNKNOWN-rule.json => RConnector-UNKNOWN.json} (100%) rename src/test/resources/rules/{RConnector-connect-values.csv => RConnector-connect.csv} (100%) rename src/test/resources/rules/{RConnector-connect-rule.json => RConnector-connect.json} (100%) rename src/test/resources/rules/{ShareLatex-connect-values.csv => ShareLatex-connect.csv} (100%) rename src/test/resources/rules/{ShareLatex-connect-rule.json => ShareLatex-connect.json} (100%) rename src/test/resources/rules/{ShareLatex-disconnect-values.csv => ShareLatex-disconnect.csv} (100%) rename src/test/resources/rules/{ShareLatex-disconnect-rule.json => ShareLatex-disconnect.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-BroodstockQuality-values.csv => SimulFishGrowthData-BroodstockQuality.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-BroodstockQuality-rule.json => SimulFishGrowthData-BroodstockQuality.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-CurrentRating-values.csv => SimulFishGrowthData-CurrentRating.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-CurrentRating-rule.json => SimulFishGrowthData-CurrentRating.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-FeedQuality-values.csv => SimulFishGrowthData-FeedQuality.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-FeedQuality-rule.json => SimulFishGrowthData-FeedQuality.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Modeler-values.csv => SimulFishGrowthData-Modeler.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Modeler-rule.json => SimulFishGrowthData-Modeler.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-OxygenRating-values.csv => SimulFishGrowthData-OxygenRating.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-OxygenRating-rule.json => SimulFishGrowthData-OxygenRating.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Region-values.csv => SimulFishGrowthData-Region.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Region-rule.json => SimulFishGrowthData-Region.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Scenario-values.csv => SimulFishGrowthData-Scenario.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Scenario-rule.json => SimulFishGrowthData-Scenario.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Site-values.csv => SimulFishGrowthData-Site.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Site-rule.json => SimulFishGrowthData-Site.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Species-values.csv => SimulFishGrowthData-Species.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-Species-rule.json => SimulFishGrowthData-Species.json} (100%) rename src/test/resources/rules/{SimulFishGrowthData-UNKNOWN-values.csv => SimulFishGrowthData-UNKNOWN.csv} (100%) rename src/test/resources/rules/{SimulFishGrowthData-UNKNOWN-rule.json => SimulFishGrowthData-UNKNOWN.json} (100%) rename src/test/resources/rules/{TagMe-tag-values.csv => TagMe-tag.csv} (100%) rename src/test/resources/rules/{TagMe-tag-rule.json => TagMe-tag.json} (100%) rename src/test/resources/rules/{data-transfer-service-getCapabilities-values.csv => data-transfer-service-getCapabilities.csv} (100%) rename src/test/resources/rules/{data-transfer-service-getCapabilities-rule.json => data-transfer-service-getCapabilities.json} (100%) rename src/test/resources/rules/{data-transfer-service-upload-values.csv => data-transfer-service-upload.csv} (100%) rename src/test/resources/rules/{data-transfer-service-upload-rule.json => data-transfer-service-upload.json} (100%) rename src/test/resources/rules/{geoanalytics-main-service-UNKNOWN-values.csv => geoanalytics-main-service-UNKNOWN.csv} (100%) rename src/test/resources/rules/{geoanalytics-main-service-UNKNOWN-rule.json => geoanalytics-main-service-UNKNOWN.json} (100%) rename src/test/resources/rules/{storage-UNKNOWN-values.csv => storage-UNKNOWN.csv} (100%) rename src/test/resources/rules/{storage-UNKNOWN-rule.json => storage-UNKNOWN.json} (100%) diff --git a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java index e93aff1..0ba298e 100644 --- a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java +++ b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java @@ -71,12 +71,12 @@ public class TestRules { public void testRule(String rulePrefix) throws Exception { File rulesDirectory = getRulesDirectory(); - File rulesFile = new File(rulesDirectory, rulePrefix + "-rule.json"); + File rulesFile = new File(rulesDirectory, rulePrefix + ".json"); ObjectMapper mapper = DSMapper.getObjectMapper(); MatcherReplace matcherReplace = mapper.readValue(rulesFile, MatcherReplace.class); Replacer replacer = matcherReplace.getReplacer(); - File elaborationFile = new File(rulesDirectory,rulePrefix + "-values.csv"); + File elaborationFile = new File(rulesDirectory,rulePrefix + ".csv"); try(BufferedReader br = new BufferedReader(new FileReader(elaborationFile))) { for(String line; (line = br.readLine()) != null;) { String[] splittedLine = line.split(","); diff --git a/src/test/resources/rules/AuthorizationService-generate-values.csv b/src/test/resources/rules/AuthorizationService-generate.csv similarity index 100% rename from src/test/resources/rules/AuthorizationService-generate-values.csv rename to src/test/resources/rules/AuthorizationService-generate.csv diff --git a/src/test/resources/rules/AuthorizationService-generate-rule.json b/src/test/resources/rules/AuthorizationService-generate.json similarity index 100% rename from src/test/resources/rules/AuthorizationService-generate-rule.json rename to src/test/resources/rules/AuthorizationService-generate.json diff --git a/src/test/resources/rules/AuthorizationService-retrieve-values.csv b/src/test/resources/rules/AuthorizationService-retrieve.csv similarity index 100% rename from src/test/resources/rules/AuthorizationService-retrieve-values.csv rename to src/test/resources/rules/AuthorizationService-retrieve.csv diff --git a/src/test/resources/rules/AuthorizationService-retrieve-rule.json b/src/test/resources/rules/AuthorizationService-retrieve.json similarity index 100% rename from src/test/resources/rules/AuthorizationService-retrieve-rule.json rename to src/test/resources/rules/AuthorizationService-retrieve.json diff --git a/src/test/resources/rules/AuthorizationService-scopes-values.csv b/src/test/resources/rules/AuthorizationService-scopes.csv similarity index 100% rename from src/test/resources/rules/AuthorizationService-scopes-values.csv rename to src/test/resources/rules/AuthorizationService-scopes.csv diff --git a/src/test/resources/rules/AuthorizationService-scopes-rule.json b/src/test/resources/rules/AuthorizationService-scopes.json similarity index 100% rename from src/test/resources/rules/AuthorizationService-scopes-rule.json rename to src/test/resources/rules/AuthorizationService-scopes.json diff --git a/src/test/resources/rules/Catalogue-WS-UNKNOWN-values.csv b/src/test/resources/rules/Catalogue-WS-UNKNOWN.csv similarity index 100% rename from src/test/resources/rules/Catalogue-WS-UNKNOWN-values.csv rename to src/test/resources/rules/Catalogue-WS-UNKNOWN.csv diff --git a/src/test/resources/rules/Catalogue-WS-UNKNOWN-rule.json b/src/test/resources/rules/Catalogue-WS-UNKNOWN.json similarity index 100% rename from src/test/resources/rules/Catalogue-WS-UNKNOWN-rule.json rename to src/test/resources/rules/Catalogue-WS-UNKNOWN.json diff --git a/src/test/resources/rules/Catalogue-WS-licenses-values.csv b/src/test/resources/rules/Catalogue-WS-licenses.csv similarity index 100% rename from src/test/resources/rules/Catalogue-WS-licenses-values.csv rename to src/test/resources/rules/Catalogue-WS-licenses.csv diff --git a/src/test/resources/rules/Catalogue-WS-licenses-rule.json b/src/test/resources/rules/Catalogue-WS-licenses.json similarity index 100% rename from src/test/resources/rules/Catalogue-WS-licenses-rule.json rename to src/test/resources/rules/Catalogue-WS-licenses.json diff --git a/src/test/resources/rules/Catalogue-WS-organizations-values.csv b/src/test/resources/rules/Catalogue-WS-organizations.csv similarity index 100% rename from src/test/resources/rules/Catalogue-WS-organizations-values.csv rename to src/test/resources/rules/Catalogue-WS-organizations.csv diff --git a/src/test/resources/rules/Catalogue-WS-organizations-rule.json b/src/test/resources/rules/Catalogue-WS-organizations.json similarity index 100% rename from src/test/resources/rules/Catalogue-WS-organizations-rule.json rename to src/test/resources/rules/Catalogue-WS-organizations.json diff --git a/src/test/resources/rules/CkanConnector-connect-values.csv b/src/test/resources/rules/CkanConnector-connect.csv similarity index 100% rename from src/test/resources/rules/CkanConnector-connect-values.csv rename to src/test/resources/rules/CkanConnector-connect.csv diff --git a/src/test/resources/rules/CkanConnector-connect-rule.json b/src/test/resources/rules/CkanConnector-connect.json similarity index 100% rename from src/test/resources/rules/CkanConnector-connect-rule.json rename to src/test/resources/rules/CkanConnector-connect.json diff --git a/src/test/resources/rules/CkanConnector-disconnect-values.csv b/src/test/resources/rules/CkanConnector-disconnect.csv similarity index 100% rename from src/test/resources/rules/CkanConnector-disconnect-values.csv rename to src/test/resources/rules/CkanConnector-disconnect.csv diff --git a/src/test/resources/rules/CkanConnector-disconnect-rule.json b/src/test/resources/rules/CkanConnector-disconnect.json similarity index 100% rename from src/test/resources/rules/CkanConnector-disconnect-rule.json rename to src/test/resources/rules/CkanConnector-disconnect.json diff --git a/src/test/resources/rules/FullTextIndexNode-delete-values.csv b/src/test/resources/rules/FullTextIndexNode-delete.csv similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-delete-values.csv rename to src/test/resources/rules/FullTextIndexNode-delete.csv diff --git a/src/test/resources/rules/FullTextIndexNode-delete-rule.json b/src/test/resources/rules/FullTextIndexNode-delete.json similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-delete-rule.json rename to src/test/resources/rules/FullTextIndexNode-delete.json diff --git a/src/test/resources/rules/FullTextIndexNode-dropCollection-values.csv b/src/test/resources/rules/FullTextIndexNode-dropCollection.csv similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-dropCollection-values.csv rename to src/test/resources/rules/FullTextIndexNode-dropCollection.csv diff --git a/src/test/resources/rules/FullTextIndexNode-dropCollection-rule.json b/src/test/resources/rules/FullTextIndexNode-dropCollection.json similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-dropCollection-rule.json rename to src/test/resources/rules/FullTextIndexNode-dropCollection.json diff --git a/src/test/resources/rules/FullTextIndexNode-insert-values.csv b/src/test/resources/rules/FullTextIndexNode-insert.csv similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-insert-values.csv rename to src/test/resources/rules/FullTextIndexNode-insert.csv diff --git a/src/test/resources/rules/FullTextIndexNode-insert-rule.json b/src/test/resources/rules/FullTextIndexNode-insert.json similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-insert-rule.json rename to src/test/resources/rules/FullTextIndexNode-insert.json diff --git a/src/test/resources/rules/FullTextIndexNode-listCollections-values.csv b/src/test/resources/rules/FullTextIndexNode-listCollections.csv similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-listCollections-values.csv rename to src/test/resources/rules/FullTextIndexNode-listCollections.csv diff --git a/src/test/resources/rules/FullTextIndexNode-listCollections-rule.json b/src/test/resources/rules/FullTextIndexNode-listCollections.json similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-listCollections-rule.json rename to src/test/resources/rules/FullTextIndexNode-listCollections.json diff --git a/src/test/resources/rules/FullTextIndexNode-search-values.csv b/src/test/resources/rules/FullTextIndexNode-search.csv similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-search-values.csv rename to src/test/resources/rules/FullTextIndexNode-search.csv diff --git a/src/test/resources/rules/FullTextIndexNode-search-rule.json b/src/test/resources/rules/FullTextIndexNode-search.json similarity index 100% rename from src/test/resources/rules/FullTextIndexNode-search-rule.json rename to src/test/resources/rules/FullTextIndexNode-search.json diff --git a/src/test/resources/rules/GeoNetwork-login-values.csv b/src/test/resources/rules/GeoNetwork-login.csv similarity index 100% rename from src/test/resources/rules/GeoNetwork-login-values.csv rename to src/test/resources/rules/GeoNetwork-login.csv diff --git a/src/test/resources/rules/GeoNetwork-login-rule.json b/src/test/resources/rules/GeoNetwork-login.json similarity index 100% rename from src/test/resources/rules/GeoNetwork-login-rule.json rename to src/test/resources/rules/GeoNetwork-login.json diff --git a/src/test/resources/rules/RConnector-UNKNOWN-values.csv b/src/test/resources/rules/RConnector-UNKNOWN.csv similarity index 100% rename from src/test/resources/rules/RConnector-UNKNOWN-values.csv rename to src/test/resources/rules/RConnector-UNKNOWN.csv diff --git a/src/test/resources/rules/RConnector-UNKNOWN-rule.json b/src/test/resources/rules/RConnector-UNKNOWN.json similarity index 100% rename from src/test/resources/rules/RConnector-UNKNOWN-rule.json rename to src/test/resources/rules/RConnector-UNKNOWN.json diff --git a/src/test/resources/rules/RConnector-connect-values.csv b/src/test/resources/rules/RConnector-connect.csv similarity index 100% rename from src/test/resources/rules/RConnector-connect-values.csv rename to src/test/resources/rules/RConnector-connect.csv diff --git a/src/test/resources/rules/RConnector-connect-rule.json b/src/test/resources/rules/RConnector-connect.json similarity index 100% rename from src/test/resources/rules/RConnector-connect-rule.json rename to src/test/resources/rules/RConnector-connect.json diff --git a/src/test/resources/rules/ShareLatex-connect-values.csv b/src/test/resources/rules/ShareLatex-connect.csv similarity index 100% rename from src/test/resources/rules/ShareLatex-connect-values.csv rename to src/test/resources/rules/ShareLatex-connect.csv diff --git a/src/test/resources/rules/ShareLatex-connect-rule.json b/src/test/resources/rules/ShareLatex-connect.json similarity index 100% rename from src/test/resources/rules/ShareLatex-connect-rule.json rename to src/test/resources/rules/ShareLatex-connect.json diff --git a/src/test/resources/rules/ShareLatex-disconnect-values.csv b/src/test/resources/rules/ShareLatex-disconnect.csv similarity index 100% rename from src/test/resources/rules/ShareLatex-disconnect-values.csv rename to src/test/resources/rules/ShareLatex-disconnect.csv diff --git a/src/test/resources/rules/ShareLatex-disconnect-rule.json b/src/test/resources/rules/ShareLatex-disconnect.json similarity index 100% rename from src/test/resources/rules/ShareLatex-disconnect-rule.json rename to src/test/resources/rules/ShareLatex-disconnect.json diff --git a/src/test/resources/rules/SimulFishGrowthData-BroodstockQuality-values.csv b/src/test/resources/rules/SimulFishGrowthData-BroodstockQuality.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-BroodstockQuality-values.csv rename to src/test/resources/rules/SimulFishGrowthData-BroodstockQuality.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-BroodstockQuality-rule.json b/src/test/resources/rules/SimulFishGrowthData-BroodstockQuality.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-BroodstockQuality-rule.json rename to src/test/resources/rules/SimulFishGrowthData-BroodstockQuality.json diff --git a/src/test/resources/rules/SimulFishGrowthData-CurrentRating-values.csv b/src/test/resources/rules/SimulFishGrowthData-CurrentRating.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-CurrentRating-values.csv rename to src/test/resources/rules/SimulFishGrowthData-CurrentRating.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-CurrentRating-rule.json b/src/test/resources/rules/SimulFishGrowthData-CurrentRating.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-CurrentRating-rule.json rename to src/test/resources/rules/SimulFishGrowthData-CurrentRating.json diff --git a/src/test/resources/rules/SimulFishGrowthData-FeedQuality-values.csv b/src/test/resources/rules/SimulFishGrowthData-FeedQuality.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-FeedQuality-values.csv rename to src/test/resources/rules/SimulFishGrowthData-FeedQuality.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-FeedQuality-rule.json b/src/test/resources/rules/SimulFishGrowthData-FeedQuality.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-FeedQuality-rule.json rename to src/test/resources/rules/SimulFishGrowthData-FeedQuality.json diff --git a/src/test/resources/rules/SimulFishGrowthData-Modeler-values.csv b/src/test/resources/rules/SimulFishGrowthData-Modeler.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Modeler-values.csv rename to src/test/resources/rules/SimulFishGrowthData-Modeler.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-Modeler-rule.json b/src/test/resources/rules/SimulFishGrowthData-Modeler.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Modeler-rule.json rename to src/test/resources/rules/SimulFishGrowthData-Modeler.json diff --git a/src/test/resources/rules/SimulFishGrowthData-OxygenRating-values.csv b/src/test/resources/rules/SimulFishGrowthData-OxygenRating.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-OxygenRating-values.csv rename to src/test/resources/rules/SimulFishGrowthData-OxygenRating.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-OxygenRating-rule.json b/src/test/resources/rules/SimulFishGrowthData-OxygenRating.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-OxygenRating-rule.json rename to src/test/resources/rules/SimulFishGrowthData-OxygenRating.json diff --git a/src/test/resources/rules/SimulFishGrowthData-Region-values.csv b/src/test/resources/rules/SimulFishGrowthData-Region.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Region-values.csv rename to src/test/resources/rules/SimulFishGrowthData-Region.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-Region-rule.json b/src/test/resources/rules/SimulFishGrowthData-Region.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Region-rule.json rename to src/test/resources/rules/SimulFishGrowthData-Region.json diff --git a/src/test/resources/rules/SimulFishGrowthData-Scenario-values.csv b/src/test/resources/rules/SimulFishGrowthData-Scenario.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Scenario-values.csv rename to src/test/resources/rules/SimulFishGrowthData-Scenario.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-Scenario-rule.json b/src/test/resources/rules/SimulFishGrowthData-Scenario.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Scenario-rule.json rename to src/test/resources/rules/SimulFishGrowthData-Scenario.json diff --git a/src/test/resources/rules/SimulFishGrowthData-Site-values.csv b/src/test/resources/rules/SimulFishGrowthData-Site.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Site-values.csv rename to src/test/resources/rules/SimulFishGrowthData-Site.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-Site-rule.json b/src/test/resources/rules/SimulFishGrowthData-Site.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Site-rule.json rename to src/test/resources/rules/SimulFishGrowthData-Site.json diff --git a/src/test/resources/rules/SimulFishGrowthData-Species-values.csv b/src/test/resources/rules/SimulFishGrowthData-Species.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Species-values.csv rename to src/test/resources/rules/SimulFishGrowthData-Species.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-Species-rule.json b/src/test/resources/rules/SimulFishGrowthData-Species.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-Species-rule.json rename to src/test/resources/rules/SimulFishGrowthData-Species.json diff --git a/src/test/resources/rules/SimulFishGrowthData-UNKNOWN-values.csv b/src/test/resources/rules/SimulFishGrowthData-UNKNOWN.csv similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-UNKNOWN-values.csv rename to src/test/resources/rules/SimulFishGrowthData-UNKNOWN.csv diff --git a/src/test/resources/rules/SimulFishGrowthData-UNKNOWN-rule.json b/src/test/resources/rules/SimulFishGrowthData-UNKNOWN.json similarity index 100% rename from src/test/resources/rules/SimulFishGrowthData-UNKNOWN-rule.json rename to src/test/resources/rules/SimulFishGrowthData-UNKNOWN.json diff --git a/src/test/resources/rules/TagMe-tag-values.csv b/src/test/resources/rules/TagMe-tag.csv similarity index 100% rename from src/test/resources/rules/TagMe-tag-values.csv rename to src/test/resources/rules/TagMe-tag.csv diff --git a/src/test/resources/rules/TagMe-tag-rule.json b/src/test/resources/rules/TagMe-tag.json similarity index 100% rename from src/test/resources/rules/TagMe-tag-rule.json rename to src/test/resources/rules/TagMe-tag.json diff --git a/src/test/resources/rules/data-transfer-service-getCapabilities-values.csv b/src/test/resources/rules/data-transfer-service-getCapabilities.csv similarity index 100% rename from src/test/resources/rules/data-transfer-service-getCapabilities-values.csv rename to src/test/resources/rules/data-transfer-service-getCapabilities.csv diff --git a/src/test/resources/rules/data-transfer-service-getCapabilities-rule.json b/src/test/resources/rules/data-transfer-service-getCapabilities.json similarity index 100% rename from src/test/resources/rules/data-transfer-service-getCapabilities-rule.json rename to src/test/resources/rules/data-transfer-service-getCapabilities.json diff --git a/src/test/resources/rules/data-transfer-service-upload-values.csv b/src/test/resources/rules/data-transfer-service-upload.csv similarity index 100% rename from src/test/resources/rules/data-transfer-service-upload-values.csv rename to src/test/resources/rules/data-transfer-service-upload.csv diff --git a/src/test/resources/rules/data-transfer-service-upload-rule.json b/src/test/resources/rules/data-transfer-service-upload.json similarity index 100% rename from src/test/resources/rules/data-transfer-service-upload-rule.json rename to src/test/resources/rules/data-transfer-service-upload.json diff --git a/src/test/resources/rules/geoanalytics-main-service-UNKNOWN-values.csv b/src/test/resources/rules/geoanalytics-main-service-UNKNOWN.csv similarity index 100% rename from src/test/resources/rules/geoanalytics-main-service-UNKNOWN-values.csv rename to src/test/resources/rules/geoanalytics-main-service-UNKNOWN.csv diff --git a/src/test/resources/rules/geoanalytics-main-service-UNKNOWN-rule.json b/src/test/resources/rules/geoanalytics-main-service-UNKNOWN.json similarity index 100% rename from src/test/resources/rules/geoanalytics-main-service-UNKNOWN-rule.json rename to src/test/resources/rules/geoanalytics-main-service-UNKNOWN.json diff --git a/src/test/resources/rules/storage-UNKNOWN-values.csv b/src/test/resources/rules/storage-UNKNOWN.csv similarity index 100% rename from src/test/resources/rules/storage-UNKNOWN-values.csv rename to src/test/resources/rules/storage-UNKNOWN.csv diff --git a/src/test/resources/rules/storage-UNKNOWN-rule.json b/src/test/resources/rules/storage-UNKNOWN.json similarity index 100% rename from src/test/resources/rules/storage-UNKNOWN-rule.json rename to src/test/resources/rules/storage-UNKNOWN.json