Issue eiffel-community#145, Minor issues fixed

Umadevi-Kapu · Jun 30, 2017 · 4d07f8c · 4d07f8c
1 parent 11a801d
commit 4d07f8c
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 10 deletions.
diff --git a/eiffel-vocabulary/EiffelTestCaseFinishedEvent.md b/eiffel-vocabulary/EiffelTestCaseFinishedEvent.md
@@ -60,12 +60,12 @@ __Description:__ A list of metrics collected during the test case execution. Not
 
 ##### data.outcome.metrics.name
 __Type:__ String  
-__Required:__ No  
+__Required:__ Yes  
 __Description:__ The metrics name.
 
 ##### data.outcome.metrics.value
 __Type:__ Any  
-__Required:__ No  
+__Required:__ Yes  
 __Description:__ The metrics value.
 
 ### data.persistentLogs
@@ -86,7 +86,7 @@ __Description:__ The URI at which the log can be retrieved.
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
+| 1.0.1     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Current version.                        |
 
 ## Examples
 * [Simple example](../examples/events/EiffelTestCaseFinishedEvent/simple.json)
diff --git a/eiffel-vocabulary/EiffelTestExecutionRecipeCollectionCreatedEvent.md b/eiffel-vocabulary/EiffelTestExecutionRecipeCollectionCreatedEvent.md
@@ -24,7 +24,7 @@ How the test selection service generates the recipe collection is, from the poin
 
 The __data__ object consists of two main parts. __data.selectionStrategy__ identifies the strategy used to select the test cases and generate the recipe collection, while __data.batches__ or __data.batchesUri__ contain or reference, respectively, the recipes. The recipes are grouped in batches, which are used to control the order of execution of test cases. Every batch has a priority to let the test executor order them in sequence, but within each batch no assumptions are made as to the execution order the test cases. This way the recipe collection can either allow the executor a high degree of freedom in scheduling the test executions, and/or prescribe the exact sequential order in which they must be executed. Each event SHALL include one and only one of __data.batches__ and __data.batchesUri__.
 
-Finally, each recipe (__data.batches.recipes__) consists of two parts: the test case to execute, and the constraints of that execution. The EiffelTestExecutionRecipeCollectionCreatedEvent does control the syntax of these constraints, as the nature of such constraints are highly dependent on technology domain and test execution framework. That being said, there are three questions that typically need to be answered: what is the item under test, in what kind of environment is it to be tested, and what are the test parameters? Note the distinction between test case and test execution: it is perfectly legal for a single test case to appear multiple times within the same EiffelTestExecutionRecipeCollectionCreatedEvent, but (presumably) with different constraints.
+Finally, each recipe (__data.batches.recipes__) consists of two parts: the test case to execute, and the constraints of that execution. The EiffelTestExecutionRecipeCollectionCreatedEvent does not control the syntax of these constraints, as the nature of such constraints are highly dependent on technology domain and test execution framework. That being said, there are three questions that typically need to be answered: what is the item under test, in what kind of environment is it to be tested, and what are the test parameters? Note the distinction between test case and test execution: it is perfectly legal for a single test case to appear multiple times within the same EiffelTestExecutionRecipeCollectionCreatedEvent, but (presumably) with different constraints.
 
 ## Data Members
 ### data.selectionStrategy

diff --git a/...events/EiffelTestCaseCanceled/simple.json → ...s/EiffelTestCaseCanceledEvent/simple.json b/...events/EiffelTestCaseCanceled/simple.json → ...s/EiffelTestCaseCanceledEvent/simple.json
diff --git a/examples/events/EiffelTestCaseFinishedEvent/simple.json b/examples/events/EiffelTestCaseFinishedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelTestCaseFinishedEvent",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
   },

diff --git a/schemas/EiffelActivityTriggeredEvent/1.0.0.json b/schemas/EiffelActivityTriggeredEvent/1.0.0.json
@@ -113,7 +113,14 @@
             "type": "object",
             "properties": {
               "type": {
-                "type": "string"
+                "type": "string",
+                "enum": [
+                  "MANUAL",
+                  "EIFFEL_EVENT",
+                  "SOURCE_CHANGE",
+                  "TIMER",
+                  "OTHER"
+                ]
               },
               "description": {
                 "type": "string"

diff --git a/...as/EiffelTestCaseFinishedEvent/1.0.0.json → ...as/EiffelTestCaseFinishedEvent/1.0.1.json b/...as/EiffelTestCaseFinishedEvent/1.0.0.json → ...as/EiffelTestCaseFinishedEvent/1.0.1.json
@@ -14,7 +14,7 @@
         },
         "version": {
           "type": "string",
-          "enum": [ "1.0.0" ],
+          "enum": [ "1.0.0", "1.0.1" ],
           "default": "1.0.0"
         },
         "time": {

diff --git a/schemas/EiffelTestCaseTriggeredEvent/1.0.0.json b/schemas/EiffelTestCaseTriggeredEvent/1.0.0.json
@@ -129,7 +129,14 @@
             "type": "object",
             "properties": {
               "type": {
-                "type": "string"
+                "type": "string",
+                "enum": [
+                  "MANUAL",
+                  "EIFFEL_EVENT",
+                  "SOURCE_CHANGE",
+                  "TIMER",
+                  "OTHER"
+                ]
               },
               "description": {
                 "type": "string"

diff --git a/schemas/EiffelTestExecutionRecipeCollectionCreatedEvent/1.0.0.json b/schemas/EiffelTestExecutionRecipeCollectionCreatedEvent/1.0.0.json
@@ -163,8 +163,7 @@
                   },
                   "required": [
                     "id",
-                    "testCase",
-                    "constraints"
+                    "testCase"
                   ],
                   "additionalProperties": false
                 }