From 81a73c4bcc075a67133fb9a2235054d6e079687e Mon Sep 17 00:00:00 2001
From: Lars Trieloff <trieloff@adobe.com>
Date: Thu, 26 Apr 2018 15:29:17 +0000
Subject: [PATCH] Updated spec files for integration tests
---
examples/docs/README.md | 1 +
spec/examples/README.md | 1 +
spec/examples/abstract.schema.md | 6 +++---
spec/examples/arrays.schema.md | 6 +++---
spec/examples/complex.schema.md | 6 +++---
spec/examples/constants.schema.md | 6 +++---
spec/examples/custom.schema.md | 6 +++---
spec/examples/deepextending.schema.md | 10 +++++-----
spec/examples/definitions.schema.md | 10 +++++-----
spec/examples/enums.schema.md | 6 +++---
spec/examples/example.schema.md | 6 +++---
spec/examples/examples.schema.md | 6 +++---
spec/examples/extending.schema.md | 10 +++++-----
spec/examples/extensible.schema.md | 6 +++---
spec/examples/simple.schema.md | 6 +++---
spec/examples/simpletypes.schema.md | 6 +++---
spec/examples/stabilizing.schema.md | 6 +++---
spec/lib/integrationTest.spec.js | 2 +-
18 files changed, 54 insertions(+), 52 deletions(-)
diff --git a/examples/docs/README.md b/examples/docs/README.md
index 68536b7..b15a093 100644
--- a/examples/docs/README.md
+++ b/examples/docs/README.md
@@ -18,6 +18,7 @@
* [Examples](./examples.schema.md) – `https://example.com/schemas/examples`
* [Extending](./extending.schema.md) – `https://example.com/schemas/extending`
* [Extensible](./extensible.schema.md) – `https://example.com/schemas/extensible`
+* [Identifiable](./identifiable.schema.md) – `https://example.com/schemas/identifiable`
* [Simple](./simple.schema.md) – `https://example.com/schemas/simple`
* [Simple Types](./simpletypes.schema.md) – `https://example.com/schemas/simpletypes`
* [Stabilizing](./stabilizing.schema.md) – `https://example.com/schemas/stabilizing`
diff --git a/spec/examples/README.md b/spec/examples/README.md
index 68536b7..b15a093 100644
--- a/spec/examples/README.md
+++ b/spec/examples/README.md
@@ -18,6 +18,7 @@
* [Examples](./examples.schema.md) – `https://example.com/schemas/examples`
* [Extending](./extending.schema.md) – `https://example.com/schemas/extending`
* [Extensible](./extensible.schema.md) – `https://example.com/schemas/extensible`
+* [Identifiable](./identifiable.schema.md) – `https://example.com/schemas/identifiable`
* [Simple](./simple.schema.md) – `https://example.com/schemas/simple`
* [Simple Types](./simpletypes.schema.md) – `https://example.com/schemas/simpletypes`
* [Stabilizing](./stabilizing.schema.md) – `https://example.com/schemas/stabilizing`
diff --git a/spec/examples/abstract.schema.md b/spec/examples/abstract.schema.md
index a4e4b7e..fdd7b67 100644
--- a/spec/examples/abstract.schema.md
+++ b/spec/examples/abstract.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/abstract
This is an abstract schema. It has `definitions`, but does not declare any properties
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Cannot be instantiated | Yes | Experimental | Forbidden | Permitted | [abstract.schema.json](abstract.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Cannot be instantiated | Yes | Experimental | No | Forbidden | Permitted | [abstract.schema.json](abstract.schema.json) |
# Abstract Definitions
diff --git a/spec/examples/arrays.schema.md b/spec/examples/arrays.schema.md
index 7b224d4..15d3d81 100644
--- a/spec/examples/arrays.schema.md
+++ b/spec/examples/arrays.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/arrays
This is an example schema with examples for multiple array types and their constraints.
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | No | Experimental | Forbidden | Permitted | [arrays.schema.json](arrays.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Experimental | No | Forbidden | Permitted | [arrays.schema.json](arrays.schema.json) |
# Arrays Properties
diff --git a/spec/examples/complex.schema.md b/spec/examples/complex.schema.md
index 44679c2..1a04dcd 100644
--- a/spec/examples/complex.schema.md
+++ b/spec/examples/complex.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/complex
This is an example schema that uses types defined in other schemas.
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | No | Experimental | Forbidden | Permitted | [complex.schema.json](complex.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Experimental | No | Forbidden | Permitted | [complex.schema.json](complex.schema.json) |
## Schema Hierarchy
* Complex References `https://example.com/schemas/complex`
diff --git a/spec/examples/constants.schema.md b/spec/examples/constants.schema.md
index 4dce795..cf4c387 100644
--- a/spec/examples/constants.schema.md
+++ b/spec/examples/constants.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/constants
This is an example schema with examples for properties with constant values
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | No | Experimental | Forbidden | Permitted | [constants.schema.json](constants.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Experimental | No | Forbidden | Permitted | [constants.schema.json](constants.schema.json) |
# Constant Types Properties
diff --git a/spec/examples/custom.schema.md b/spec/examples/custom.schema.md
index fae3a98..d2971e1 100644
--- a/spec/examples/custom.schema.md
+++ b/spec/examples/custom.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/custom
This is an extensible schema. It has `definitions`, that can be used in other schemas. Additionally, it allows custom properties.
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | Yes | Experimental | Allowed | Permitted | [custom.schema.json](custom.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | Yes | Experimental | No | Allowed | Permitted | [custom.schema.json](custom.schema.json) |
# Custom Properties
diff --git a/spec/examples/deepextending.schema.md b/spec/examples/deepextending.schema.md
index 3c1fc44..b9b9d2d 100644
--- a/spec/examples/deepextending.schema.md
+++ b/spec/examples/deepextending.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/deepextending
This is an extending schema. It is extending another extending schema. It pulls `definitions` from other schemas.
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | Yes | Experimental | Forbidden | Permitted | [deepextending.schema.json](deepextending.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | Yes | Experimental | Yes | Forbidden | Permitted | [deepextending.schema.json](deepextending.schema.json) |
## Schema Hierarchy
* Deeply Extending `https://example.com/schemas/deepextending`
@@ -47,7 +47,7 @@ An `id` with an `@` in front of it. The `@` stands for "dot com"
`string`
-* format: `uri-reference` – URI Reference (according to [RFC3986](https://tools.ietf.org/html/rfc3986))
+* format: `uri` – Uniformous Resource Identifier (according to [RFC3986](http://tools.ietf.org/html/rfc3986))
@@ -142,7 +142,7 @@ A unique identifier given to every addressable thing.
`string`
-* format: `uri` – Uniformous Resource Identifier (according to [RFC3986](http://tools.ietf.org/html/rfc3986))
+* format: `uri-reference` – URI Reference (according to [RFC3986](https://tools.ietf.org/html/rfc3986))
diff --git a/spec/examples/definitions.schema.md b/spec/examples/definitions.schema.md
index 97bceaa..da43dcb 100644
--- a/spec/examples/definitions.schema.md
+++ b/spec/examples/definitions.schema.md
@@ -28,9 +28,9 @@ aks.
> Everything is better with a quote.
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | Yes | Experimental | Forbidden | Permitted | [definitions.schema.json](definitions.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | Yes | Experimental | Yes | Forbidden | Permitted | [definitions.schema.json](definitions.schema.json) |
# Definitions Properties
@@ -54,7 +54,7 @@ An `id` with an `@` in front of it. The `@` stands for "dot com"
`string`
-* format: `uri-reference` – URI Reference (according to [RFC3986](https://tools.ietf.org/html/rfc3986))
+* format: `uri` – Uniformous Resource Identifier (according to [RFC3986](http://tools.ietf.org/html/rfc3986))
@@ -74,7 +74,7 @@ A unique identifier given to every addressable thing.
`string`
-* format: `uri` – Uniformous Resource Identifier (according to [RFC3986](http://tools.ietf.org/html/rfc3986))
+* format: `uri-reference` – URI Reference (according to [RFC3986](https://tools.ietf.org/html/rfc3986))
diff --git a/spec/examples/enums.schema.md b/spec/examples/enums.schema.md
index 61b3a56..3b4ea10 100644
--- a/spec/examples/enums.schema.md
+++ b/spec/examples/enums.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/enums
This is an example schema with examples for properties with enum values
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | No | Experimental | Forbidden | Permitted | [enums.schema.json](enums.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Experimental | No | Forbidden | Permitted | [enums.schema.json](enums.schema.json) |
# Enumerated Properties
diff --git a/spec/examples/example.schema.md b/spec/examples/example.schema.md
index a606dbc..39a7d67 100644
--- a/spec/examples/example.schema.md
+++ b/spec/examples/example.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/example
This is an example schema with examples. Too many examples? There can never be too many examples!
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | No | Experimental | Forbidden | Permitted | [example.schema.json](example.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Experimental | No | Forbidden | Permitted | [example.schema.json](example.schema.json) |
## Example Example
```json
diff --git a/spec/examples/examples.schema.md b/spec/examples/examples.schema.md
index cddde01..5d4aa2c 100644
--- a/spec/examples/examples.schema.md
+++ b/spec/examples/examples.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/examples
This is an example schema with *multiple* examples. Too many examples? There can never be too many examples!
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | No | Experimental | Forbidden | Permitted | [examples.schema.json](examples.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Experimental | No | Forbidden | Permitted | [examples.schema.json](examples.schema.json) |
## Examples Examples
diff --git a/spec/examples/extending.schema.md b/spec/examples/extending.schema.md
index a34d9c6..17c7c21 100644
--- a/spec/examples/extending.schema.md
+++ b/spec/examples/extending.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/extending
This is an extending schema. It pulls `definitions` from other schemas.
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | Yes | Experimental | Forbidden | Permitted | [extending.schema.json](extending.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | Yes | Experimental | Yes | Forbidden | Permitted | [extending.schema.json](extending.schema.json) |
## Schema Hierarchy
* Extending `https://example.com/schemas/extending`
@@ -45,7 +45,7 @@ An `id` with an `@` in front of it. The `@` stands for "dot com"
`string`
-* format: `uri-reference` – URI Reference (according to [RFC3986](https://tools.ietf.org/html/rfc3986))
+* format: `uri` – Uniformous Resource Identifier (according to [RFC3986](http://tools.ietf.org/html/rfc3986))
@@ -121,7 +121,7 @@ A unique identifier given to every addressable thing.
`string`
-* format: `uri` – Uniformous Resource Identifier (according to [RFC3986](http://tools.ietf.org/html/rfc3986))
+* format: `uri-reference` – URI Reference (according to [RFC3986](https://tools.ietf.org/html/rfc3986))
diff --git a/spec/examples/extensible.schema.md b/spec/examples/extensible.schema.md
index 4582a93..edf1e5c 100644
--- a/spec/examples/extensible.schema.md
+++ b/spec/examples/extensible.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/extensible
This is an extensible schema. It has `definitions`, that can be used in other schemas
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Cannot be instantiated | Yes | Experimental | Forbidden | Permitted | [extensible.schema.json](extensible.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Cannot be instantiated | Yes | Experimental | No | Forbidden | Permitted | [extensible.schema.json](extensible.schema.json) |
# Extensible Definitions
diff --git a/spec/examples/simple.schema.md b/spec/examples/simple.schema.md
index 6327fbf..b801c02 100644
--- a/spec/examples/simple.schema.md
+++ b/spec/examples/simple.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/simple
This is a *very* simple example of a JSON schema. There is only one property.
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | No | Experimental | Forbidden | Permitted | [simple.schema.json](simple.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Experimental | No | Forbidden | Permitted | [simple.schema.json](simple.schema.json) |
# Simple Properties
diff --git a/spec/examples/simpletypes.schema.md b/spec/examples/simpletypes.schema.md
index 6e89018..b030c5a 100644
--- a/spec/examples/simpletypes.schema.md
+++ b/spec/examples/simpletypes.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/simpletypes
This is an example schema with examples for multiple types and their constraints.
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | No | Experimental | Forbidden | Permitted | [simpletypes.schema.json](simpletypes.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Experimental | No | Forbidden | Permitted | [simpletypes.schema.json](simpletypes.schema.json) |
# Simple Types Properties
diff --git a/spec/examples/stabilizing.schema.md b/spec/examples/stabilizing.schema.md
index 56c022f..cc1a082 100644
--- a/spec/examples/stabilizing.schema.md
+++ b/spec/examples/stabilizing.schema.md
@@ -11,9 +11,9 @@ https://example.com/schemas/stabilizing
This is a schema which is currently in the `stabilizing` status.
-| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Custom Properties | Additional Properties | Defined In |
-|----------------------------|------------|------------------------|-------------------|-----------------------|------------|
-| Can be instantiated | No | Stabilizing | Forbidden | Permitted | [stabilizing.schema.json](stabilizing.schema.json) |
+| [Abstract](../abstract.md) | Extensible | [Status](../status.md) | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------------------------|------------|------------------------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Stabilizing | No | Forbidden | Permitted | [stabilizing.schema.json](stabilizing.schema.json) |
# Stabilizing Properties
diff --git a/spec/lib/integrationTest.spec.js b/spec/lib/integrationTest.spec.js
index e9952f8..7101d6d 100644
--- a/spec/lib/integrationTest.spec.js
+++ b/spec/lib/integrationTest.spec.js
@@ -55,7 +55,7 @@ describe('Compare results', () => {
expect(code).toEqual(0);
const files = readdirSync('./spec/examples');
- expect(files.length).toEqual(17);
+ expect(files.length).toEqual(18);
done();
});
});
--
GitLab