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 03d1457..cace177 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 @@ -192,7 +192,6 @@ public class TestRules extends ContextTest { try { asur.aggregate(sur); throw new Exception("The record has been aggregated and it should NOT"); - } catch(NotAggregatableRecordsExceptions e) { //logger.trace("{} is not aggragable as expected", sur); } @@ -212,7 +211,7 @@ public class TestRules extends ContextTest { allRules(); File rulesDirectory = getRulesDirectory(); File rulesDirFile = new File(rulesDirectory, "Thredds"); - File rulesFile = new File(rulesDirFile, "Thredds_METADATA::COLLECTION.json"); + File rulesFile = new File(rulesDirFile, "Thredds_OTHER.json"); testRule(rulesFile); } diff --git a/src/test/resources/rules/Thredds/Thredds_OTHER.csv b/src/test/resources/rules/Thredds/Thredds_OTHER.csv index 61ffb45..e220107 100644 --- a/src/test/resources/rules/Thredds/Thredds_OTHER.csv +++ b/src/test/resources/rules/Thredds/Thredds_OTHER.csv @@ -1,4 +1,3 @@ -Service Class,Service Name,Called Method SDI,Thredds,/style/ncss/layout.css SDI,Thredds,/tds.css SDI,Thredds,/folder.gif diff --git a/src/test/resources/rules/Thredds/Thredds_OTHER.json b/src/test/resources/rules/Thredds/Thredds_OTHER.json new file mode 100644 index 0000000..b9d3b7c --- /dev/null +++ b/src/test/resources/rules/Thredds/Thredds_OTHER.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "SDI", + "serviceNameRegex": "Thredds", + "calledMethodRegex": "^(?!.*((\/public\/netcdf\/)|(::))).*$" + }, + "replace": { + "serviceClass": "SDI", + "serviceName": "Thredds", + "calledMethod": "OTHER" + } +} \ No newline at end of file