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 1d63391..31ff96a 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 @@ -36,6 +36,8 @@ public class TestRules { "GeoNetwork-login", "RConnector-connect", "RConnector-UNKNOWN", + "ShareLatex-connect", + "ShareLatex-disconnect", "TagMe-tag" }; @@ -80,7 +82,7 @@ public class TestRules { @Test public void testSingleRule() throws Exception { - testRule("RConnector-connect"); + testRule("ShareLatex-disconnect"); } } diff --git a/src/test/resources/rules/ShareLatex-connect-rule.json b/src/test/resources/rules/ShareLatex-connect-rule.json new file mode 100644 index 0000000..0926b5c --- /dev/null +++ b/src/test/resources/rules/ShareLatex-connect-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "DataAccess", + "serviceNameRegex": "ShareLatex", + "calledMethodRegex": "^\/{0,1}gcube\/service\/connect.*" + }, + "replace": { + "serviceClass": "DataAccess", + "serviceName": "ShareLatex", + "calledMethod": "connect" + } +} \ No newline at end of file diff --git a/src/test/resources/rules/ShareLatex-connect-values.csv b/src/test/resources/rules/ShareLatex-connect-values.csv new file mode 100644 index 0000000..49d74f5 --- /dev/null +++ b/src/test/resources/rules/ShareLatex-connect-values.csv @@ -0,0 +1,5 @@ +DataAccess,ShareLatex,/gcube/service/connect +DataAccess,ShareLatex,gcube/service/connect +DataAccess,ShareLatex,gcube/service/connect/ +DataAccess,ShareLatex,/gcube/service/connect/ +DataAccess,ShareLatex,/gcube/service/connect/347789 \ No newline at end of file diff --git a/src/test/resources/rules/ShareLatex-disconnect-rule.json b/src/test/resources/rules/ShareLatex-disconnect-rule.json new file mode 100644 index 0000000..0df175b --- /dev/null +++ b/src/test/resources/rules/ShareLatex-disconnect-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "DataAccess", + "serviceNameRegex": "ShareLatex", + "calledMethodRegex": "^\/{0,1}gcube\/service\/disconnect.*" + }, + "replace": { + "serviceClass": "DataAccess", + "serviceName": "ShareLatex", + "calledMethod": "disconnect" + } +} \ No newline at end of file diff --git a/src/test/resources/rules/ShareLatex-disconnect-values.csv b/src/test/resources/rules/ShareLatex-disconnect-values.csv new file mode 100644 index 0000000..9a4c2f5 --- /dev/null +++ b/src/test/resources/rules/ShareLatex-disconnect-values.csv @@ -0,0 +1,5 @@ +DataAccess,ShareLatex,/gcube/service/disconnect +DataAccess,ShareLatex,gcube/service/disconnect +DataAccess,ShareLatex,gcube/service/disconnect/ +DataAccess,ShareLatex,/gcube/service/disconnect/ +DataAccess,ShareLatex,/gcube/service/disconnect/347789 \ No newline at end of file