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 ffb5de3..f92c41e 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 @@ -44,14 +44,22 @@ public class TestRules { } + public File getRulesDirectory() throws Exception { + URL logbackFileURL = TestRules.class.getClassLoader().getResource("logback-test.xml"); + File logbackFile = new File(logbackFileURL.toURI()); + File resourcesDirectory = logbackFile.getParentFile(); + return new File(resourcesDirectory, "rules"); + } + public void testRule(String rulePrefix) throws Exception { + File rulesDirectory = getRulesDirectory(); + + File rulesFile = new File(rulesDirectory, rulePrefix + "-rule.json"); ObjectMapper mapper = DSMapper.getObjectMapper(); - InputStream regexInputStream = TestRules.class.getClassLoader().getResourceAsStream(rulePrefix + "-rule.json"); - MatcherReplace matcherReplace = mapper.readValue(regexInputStream, MatcherReplace.class); + MatcherReplace matcherReplace = mapper.readValue(rulesFile, MatcherReplace.class); Replacer replacer = matcherReplace.getReplacer(); - URL url = TestRules.class.getClassLoader().getResource(rulePrefix + "-values.csv"); - File elaborationFile = new File(url.toURI()); + File elaborationFile = new File(rulesDirectory,rulePrefix + "-values.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/AuthorizationService-generate-rule.json b/src/test/resources/rules/AuthorizationService-generate-rule.json similarity index 100% rename from src/test/resources/AuthorizationService-generate-rule.json rename to src/test/resources/rules/AuthorizationService-generate-rule.json diff --git a/src/test/resources/AuthorizationService-generate-values.csv b/src/test/resources/rules/AuthorizationService-generate-values.csv similarity index 100% rename from src/test/resources/AuthorizationService-generate-values.csv rename to src/test/resources/rules/AuthorizationService-generate-values.csv diff --git a/src/test/resources/AuthorizationService-retrieve-rule.json b/src/test/resources/rules/AuthorizationService-retrieve-rule.json similarity index 100% rename from src/test/resources/AuthorizationService-retrieve-rule.json rename to src/test/resources/rules/AuthorizationService-retrieve-rule.json diff --git a/src/test/resources/AuthorizationService-retrieve-values.csv b/src/test/resources/rules/AuthorizationService-retrieve-values.csv similarity index 100% rename from src/test/resources/AuthorizationService-retrieve-values.csv rename to src/test/resources/rules/AuthorizationService-retrieve-values.csv diff --git a/src/test/resources/AuthorizationService-scopes-rule.json b/src/test/resources/rules/AuthorizationService-scopes-rule.json similarity index 100% rename from src/test/resources/AuthorizationService-scopes-rule.json rename to src/test/resources/rules/AuthorizationService-scopes-rule.json diff --git a/src/test/resources/AuthorizationService-scopes-values.csv b/src/test/resources/rules/AuthorizationService-scopes-values.csv similarity index 100% rename from src/test/resources/AuthorizationService-scopes-values.csv rename to src/test/resources/rules/AuthorizationService-scopes-values.csv diff --git a/src/test/resources/Catalogue-WS-UNKNOWN-rule.json b/src/test/resources/rules/Catalogue-WS-UNKNOWN-rule.json similarity index 100% rename from src/test/resources/Catalogue-WS-UNKNOWN-rule.json rename to src/test/resources/rules/Catalogue-WS-UNKNOWN-rule.json diff --git a/src/test/resources/Catalogue-WS-UNKNOWN-values.csv b/src/test/resources/rules/Catalogue-WS-UNKNOWN-values.csv similarity index 100% rename from src/test/resources/Catalogue-WS-UNKNOWN-values.csv rename to src/test/resources/rules/Catalogue-WS-UNKNOWN-values.csv diff --git a/src/test/resources/Catalogue-WS-licenses-rule.json b/src/test/resources/rules/Catalogue-WS-licenses-rule.json similarity index 100% rename from src/test/resources/Catalogue-WS-licenses-rule.json rename to src/test/resources/rules/Catalogue-WS-licenses-rule.json diff --git a/src/test/resources/Catalogue-WS-licenses-values.csv b/src/test/resources/rules/Catalogue-WS-licenses-values.csv similarity index 100% rename from src/test/resources/Catalogue-WS-licenses-values.csv rename to src/test/resources/rules/Catalogue-WS-licenses-values.csv diff --git a/src/test/resources/Catalogue-WS-organizations-rule.json b/src/test/resources/rules/Catalogue-WS-organizations-rule.json similarity index 100% rename from src/test/resources/Catalogue-WS-organizations-rule.json rename to src/test/resources/rules/Catalogue-WS-organizations-rule.json diff --git a/src/test/resources/Catalogue-WS-organizations-values.csv b/src/test/resources/rules/Catalogue-WS-organizations-values.csv similarity index 100% rename from src/test/resources/Catalogue-WS-organizations-values.csv rename to src/test/resources/rules/Catalogue-WS-organizations-values.csv diff --git a/src/test/resources/CkanConnector-connect-rule.json b/src/test/resources/rules/CkanConnector-connect-rule.json similarity index 100% rename from src/test/resources/CkanConnector-connect-rule.json rename to src/test/resources/rules/CkanConnector-connect-rule.json diff --git a/src/test/resources/CkanConnector-connect-values.csv b/src/test/resources/rules/CkanConnector-connect-values.csv similarity index 100% rename from src/test/resources/CkanConnector-connect-values.csv rename to src/test/resources/rules/CkanConnector-connect-values.csv diff --git a/src/test/resources/CkanConnector-disconnect-rule.json b/src/test/resources/rules/CkanConnector-disconnect-rule.json similarity index 100% rename from src/test/resources/CkanConnector-disconnect-rule.json rename to src/test/resources/rules/CkanConnector-disconnect-rule.json diff --git a/src/test/resources/CkanConnector-disconnect-values.csv b/src/test/resources/rules/CkanConnector-disconnect-values.csv similarity index 100% rename from src/test/resources/CkanConnector-disconnect-values.csv rename to src/test/resources/rules/CkanConnector-disconnect-values.csv diff --git a/src/test/resources/FullTextIndexNode-delete-rule.json b/src/test/resources/rules/FullTextIndexNode-delete-rule.json similarity index 100% rename from src/test/resources/FullTextIndexNode-delete-rule.json rename to src/test/resources/rules/FullTextIndexNode-delete-rule.json diff --git a/src/test/resources/FullTextIndexNode-delete-values.csv b/src/test/resources/rules/FullTextIndexNode-delete-values.csv similarity index 100% rename from src/test/resources/FullTextIndexNode-delete-values.csv rename to src/test/resources/rules/FullTextIndexNode-delete-values.csv diff --git a/src/test/resources/FullTextIndexNode-dropCollection-rule.json b/src/test/resources/rules/FullTextIndexNode-dropCollection-rule.json similarity index 100% rename from src/test/resources/FullTextIndexNode-dropCollection-rule.json rename to src/test/resources/rules/FullTextIndexNode-dropCollection-rule.json diff --git a/src/test/resources/FullTextIndexNode-dropCollection-values.csv b/src/test/resources/rules/FullTextIndexNode-dropCollection-values.csv similarity index 100% rename from src/test/resources/FullTextIndexNode-dropCollection-values.csv rename to src/test/resources/rules/FullTextIndexNode-dropCollection-values.csv diff --git a/src/test/resources/FullTextIndexNode-insert-rule.json b/src/test/resources/rules/FullTextIndexNode-insert-rule.json similarity index 100% rename from src/test/resources/FullTextIndexNode-insert-rule.json rename to src/test/resources/rules/FullTextIndexNode-insert-rule.json diff --git a/src/test/resources/FullTextIndexNode-insert-values.csv b/src/test/resources/rules/FullTextIndexNode-insert-values.csv similarity index 100% rename from src/test/resources/FullTextIndexNode-insert-values.csv rename to src/test/resources/rules/FullTextIndexNode-insert-values.csv diff --git a/src/test/resources/FullTextIndexNode-listCollections-rule.json b/src/test/resources/rules/FullTextIndexNode-listCollections-rule.json similarity index 100% rename from src/test/resources/FullTextIndexNode-listCollections-rule.json rename to src/test/resources/rules/FullTextIndexNode-listCollections-rule.json diff --git a/src/test/resources/FullTextIndexNode-listCollections-values.csv b/src/test/resources/rules/FullTextIndexNode-listCollections-values.csv similarity index 100% rename from src/test/resources/FullTextIndexNode-listCollections-values.csv rename to src/test/resources/rules/FullTextIndexNode-listCollections-values.csv diff --git a/src/test/resources/FullTextIndexNode-search-rule.json b/src/test/resources/rules/FullTextIndexNode-search-rule.json similarity index 100% rename from src/test/resources/FullTextIndexNode-search-rule.json rename to src/test/resources/rules/FullTextIndexNode-search-rule.json diff --git a/src/test/resources/FullTextIndexNode-search-values.csv b/src/test/resources/rules/FullTextIndexNode-search-values.csv similarity index 100% rename from src/test/resources/FullTextIndexNode-search-values.csv rename to src/test/resources/rules/FullTextIndexNode-search-values.csv diff --git a/src/test/resources/GeoNetwork-login-rule.json b/src/test/resources/rules/GeoNetwork-login-rule.json similarity index 100% rename from src/test/resources/GeoNetwork-login-rule.json rename to src/test/resources/rules/GeoNetwork-login-rule.json diff --git a/src/test/resources/GeoNetwork-login-values.csv b/src/test/resources/rules/GeoNetwork-login-values.csv similarity index 100% rename from src/test/resources/GeoNetwork-login-values.csv rename to src/test/resources/rules/GeoNetwork-login-values.csv diff --git a/src/test/resources/TagMe-tag-rule.json b/src/test/resources/rules/TagMe-tag-rule.json similarity index 100% rename from src/test/resources/TagMe-tag-rule.json rename to src/test/resources/rules/TagMe-tag-rule.json diff --git a/src/test/resources/TagMe-tag-values.csv b/src/test/resources/rules/TagMe-tag-values.csv similarity index 100% rename from src/test/resources/TagMe-tag-values.csv rename to src/test/resources/rules/TagMe-tag-values.csv