fix: changes in cardinality and corrections to tests

stencila · Apr 11, 2019 · a5258fc · a5258fc
1 parent 0fc0207
commit a5258fc
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 34 deletions.
diff --git a/examples/brand/simple.brand.yaml b/examples/brand/simple.brand.yaml
@@ -1,3 +1,4 @@
 type: Brand
 logo: https://stenci.la/img/icons/stencil-machine.svg
-review: 'Awful. Broke my computer and research.'
+reviews:
+  - 'Awful. Broke my computer and research.'
diff --git a/examples/invalid/invalid.brand.yaml b/examples/invalid/invalid.brand.yaml
@@ -1,7 +1,6 @@
 type: Brand
-logo:
-  42
+logo: 42
   # Incorrect type. Expected a URI.
-review:
-  https://stenci.la/review.html
-  # Incorrect type. Expected "string".
+reviews:
+  - []
+    # Incorrect type. Expected "string".
diff --git a/examples/invalid/invalid.organization.yaml b/examples/invalid/invalid.organization.yaml
@@ -2,17 +2,19 @@ type: Organization
 address:
   - '12 Random Road, Random Town, Aotearoa'
 # Incorrect type. Expected "string".
-brand:
-  logo:
-    - https://stenci.la/img/icons/stencil-machine.svg
-  review: 4567
-contactPoint:
-  availableLanguages: 'English'
-  email: 'english@email.com'
-  telephone: (00)64-9775673
+brands:
+  - logo:
+      - https://stenci.la/img/icons/stencil-machine.svg
+    review: 4567
+contactPoints:
+  - type: ContactPoint
+    availableLanguages: 'English'
+    email: 'english@email.com'
+    telephone: (00)64-9775673
 departments: Computer Science
 # Incorrect type. Expected "array".
-email: mailto:organization@organization.com
+emails:
+  - mailto:organization@organization.com
 # String is not an e-mail address.
 funders:
   - simple.person.yaml

diff --git a/examples/organization/simple.organization.yaml b/examples/organization/simple.organization.yaml
@@ -1,22 +1,23 @@
 type: Organization
 address: '12 Random Road, Random Town, Aotearoa'
-brand:
-  logo:
-    - https://stenci.la/img/icons/stencil-machine.svg
-  review:
-    - 'Awful. Broke my computer and research.'
-contactPoint:
-  availableLanguages:
-    - 'English'
-    - 'French'
-  emails:
-    - 'english@email.com'
-    - 'french@email.com'
-  telephone:
-    - '+649775673'
+brands:
+  - type: Brand
+    logo: https://stenci.la/img/icons/stencil-machine.svg
+    reviews:
+      - 'Awful. Broke my computer and research.'
+contactPoints:
+  - type: ContactPoint
+    availableLanguages:
+      - 'English'
+      - 'French'
+    emails:
+      - 'english@email.com'
+      - 'french@email.com'
+    telephone: '+649775673'
 departments:
   - type: Organization
-email: organization@organization.com
+emails:
+  - organization@organization.com
 funders:
   - type: Person
     givenNames:

diff --git a/examples/product/simple.product.yaml b/examples/product/simple.product.yaml
@@ -2,5 +2,6 @@ type: Product
 brand:
   type: Brand
   logo: https://stenci.la/img/icons/stencil-machine.svg
-  review: 'Awful. Broke my computer and research.'
+  reviews:
+    - 'Awful. Broke my computer and research.'
 productID: 675ef78
diff --git a/schema/organization/Brand.schema.yaml b/schema/organization/Brand.schema.yaml
@@ -11,8 +11,10 @@ properties:
     anyOf:
       - $ref: URL.schema.yaml
       - $ref: ImageObject.schema.yaml
-  review:
+  reviews:
     '@id': schema:review
     description: |
-      Short review of the brand and/or the products it represents.
-    type: string
+      Short reviews of the brand and/or the products it represents.
+    type: array
+    items:
+      type: string