diff options
| author |   Serban Jora <jora@research.att.com> | 2017-10-02 13:20:50 -0400 |
|---|---|---|
| committer | Serban Jora <jora@research.att.com> | 2017-10-02 14:33:47 -0400 |
| commit | cba3b4f6a26aee3009a56b899a1cb9f093aba805 (patch) | |
| tree | 063d570fb8f3390ced12a4ed10efc4388d68d392 /javatoscachecker/checker/src/main | |
| parent | 53065490134870ead778bff590cfd9e43ddd9f77 (diff) | |
Add unit testing
JUnit based testing added to the checker lib and service, work in progress.
Includes grammar correction.
Change-Id: I8fa950f89faba24e7b45ef41cbc0402362b3f394
Issue-Id: MODELING-26
Signed-off-by: Serban Jora <jora@research.att.com>
Diffstat (limited to 'javatoscachecker/checker/src/main')
| -rw-r--r-- | javatoscachecker/checker/src/main/java/org/onap/tosca/checker/Checker.java | 2 | ||||
| -rw-r--r-- | javatoscachecker/checker/src/main/resources/tosca/tosca_simple_yaml_1_1.grammar | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/javatoscachecker/checker/src/main/java/org/onap/tosca/checker/Checker.java b/javatoscachecker/checker/src/main/java/org/onap/tosca/checker/Checker.java index 4218b85..358dc2b 100644 --- a/javatoscachecker/checker/src/main/java/org/onap/tosca/checker/Checker.java +++ b/javatoscachecker/checker/src/main/java/org/onap/tosca/checker/Checker.java @@ -3651,7 +3651,7 @@ System.out.println(" **** unassigned -> " + unassignedEntry.getKey() + " : " + u private String defaultImportsPath = null; private List<String> grammars = new LinkedList<String>(); - protected CheckerConfiguration() { + public CheckerConfiguration() { withGrammars(Checker.grammarFiles); } diff --git a/javatoscachecker/checker/src/main/resources/tosca/tosca_simple_yaml_1_1.grammar b/javatoscachecker/checker/src/main/resources/tosca/tosca_simple_yaml_1_1.grammar index 39b11d9..abd6c39 100644 --- a/javatoscachecker/checker/src/main/resources/tosca/tosca_simple_yaml_1_1.grammar +++ b/javatoscachecker/checker/src/main/resources/tosca/tosca_simple_yaml_1_1.grammar @@ -643,10 +643,9 @@ _workflow_step_definition: &workflow_step_definition type: str filter: desc: "Filter is a map of attribute name, list of constraint clause that allows to provide a filtering logic" - type: map - mapping: - =: - *constraints_sequence + type: seq + sequence: + - *constraints_sequence activities: desc: "The list of sequential activities to be performed in this step" type: seq |