test(definitions): move models to models dir

asyncapi#539
Pakisan · May 22, 2024 · 0b248c9 · 0b248c9
1 parent 32c4733
commit 0b248c9
Show file tree

Hide file tree

Showing 41 changed files with 39 additions and 37 deletions.
diff --git a/test/definitions/3.0.0/contact/contact.js → ...finitions/3.0.0/models/contact/contact.js b/test/definitions/3.0.0/contact/contact.js → ...finitions/3.0.0/models/contact/contact.js
@@ -13,10 +13,10 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/contact.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/contact.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../definitions/3.0.0/specificationExtension.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/specificationExtension.json'))
   .compile(infoJsonSchema);
 
 describe('Contact', () => {

diff --git a/test/definitions/3.0.0/contact/empty.json → ...finitions/3.0.0/models/contact/empty.json b/test/definitions/3.0.0/contact/empty.json → ...finitions/3.0.0/models/contact/empty.json
diff --git a/test/definitions/3.0.0/contact/extended.json → ...itions/3.0.0/models/contact/extended.json b/test/definitions/3.0.0/contact/extended.json → ...itions/3.0.0/models/contact/extended.json
diff --git a/...0.0/contact/only required properties.json → ...els/contact/only required properties.json b/...0.0/contact/only required properties.json → ...els/contact/only required properties.json
diff --git a/.../contact/without required properties.json → .../contact/without required properties.json b/.../contact/without required properties.json → .../contact/without required properties.json
diff --git a/...tions/3.0.0/contact/wrongly extended.json → ....0.0/models/contact/wrongly extended.json b/...tions/3.0.0/contact/wrongly extended.json → ....0.0/models/contact/wrongly extended.json
diff --git a/test/definitions/3.0.0/models/index.js b/test/definitions/3.0.0/models/index.js
@@ -0,0 +1,8 @@
+describe('Models', () => {
+  require('./info/info.js');
+  require('./info extensions/info-extension.js');
+  require('./contact/contact.js');
+  require('./license/license.js');
+  require('./reference/reference.js');
+  require('./reference object/reference-object.js');
+});
diff --git a/...initions/3.0.0/info extensions/empty.json → ...s/3.0.0/models/info extensions/empty.json b/...initions/3.0.0/info extensions/empty.json → ...s/3.0.0/models/info extensions/empty.json
diff --git a/...tions/3.0.0/info extensions/extended.json → ....0.0/models/info extensions/extended.json b/...tions/3.0.0/info extensions/extended.json → ....0.0/models/info extensions/extended.json
diff --git a/...s/3.0.0/info extensions/info-extension.js → .../models/info extensions/info-extension.js b/...s/3.0.0/info extensions/info-extension.js → .../models/info extensions/info-extension.js
@@ -13,11 +13,11 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/infoExtensions.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/infoExtensions.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../extensions/linkedin/0.1.0/schema.json'))
-  .addSchema(require('../../../../extensions/x/0.1.0/schema.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../extensions/linkedin/0.1.0/schema.json'))
+  .addSchema(require('../../../../../extensions/x/0.1.0/schema.json'))
   .compile(infoJsonSchema);
 
 describe('InfoExtensions', () => {

diff --git a/... extensions/only required properties.json → ... extensions/only required properties.json b/... extensions/only required properties.json → ... extensions/only required properties.json
diff --git a/...tensions/without required properties.json → ...tensions/without required properties.json b/...tensions/without required properties.json → ...tensions/without required properties.json
diff --git a/...0.0/info extensions/wrongly extended.json → ...els/info extensions/wrongly extended.json b/...0.0/info extensions/wrongly extended.json → ...els/info extensions/wrongly extended.json
diff --git a/test/definitions/3.0.0/info/empty.json → .../definitions/3.0.0/models/info/empty.json b/test/definitions/3.0.0/info/empty.json → .../definitions/3.0.0/models/info/empty.json
diff --git a/test/definitions/3.0.0/info/extended.json → ...finitions/3.0.0/models/info/extended.json b/test/definitions/3.0.0/info/extended.json → ...finitions/3.0.0/models/info/extended.json
diff --git a/test/definitions/3.0.0/info/info.js → test/definitions/3.0.0/models/info/info.js b/test/definitions/3.0.0/info/info.js → test/definitions/3.0.0/models/info/info.js
@@ -13,20 +13,20 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/info.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/info.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../definitions/3.0.0/infoExtensions.json'))
-  .addSchema(require('../../../../definitions/3.0.0/contact.json'))
-  .addSchema(require('../../../../definitions/3.0.0/license.json'))
-  .addSchema(require('../../../../examples/3.0.0/ReferenceObject.json'))
-  .addSchema(require('../../../../definitions/3.0.0/ReferenceObject.json'))
-  .addSchema(require('../../../../definitions/3.0.0/Reference.json'))
-  .addSchema(require('../../../../definitions/3.0.0/tag.json'))
-  .addSchema(require('../../../../definitions/3.0.0/externalDocs.json'))
-  .addSchema(require('../../../../definitions/3.0.0/specificationExtension.json'))
-  .addSchema(require('../../../../extensions/linkedin/0.1.0/schema.json'))
-  .addSchema(require('../../../../extensions/x/0.1.0/schema.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/infoExtensions.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/contact.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/license.json'))
+  .addSchema(require('../../../../../examples/3.0.0/ReferenceObject.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/ReferenceObject.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/Reference.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/tag.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/externalDocs.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/specificationExtension.json'))
+  .addSchema(require('../../../../../extensions/linkedin/0.1.0/schema.json'))
+  .addSchema(require('../../../../../extensions/x/0.1.0/schema.json'))
   .compile(infoJsonSchema);
 
 describe('Info', () => {

diff --git a/.../3.0.0/info/only required properties.json → ...models/info/only required properties.json b/.../3.0.0/info/only required properties.json → ...models/info/only required properties.json
diff --git a/...0.0/info/without required properties.json → ...els/info/without required properties.json b/...0.0/info/without required properties.json → ...els/info/without required properties.json
diff --git a/...initions/3.0.0/info/wrongly extended.json → ...s/3.0.0/models/info/wrongly extended.json b/...initions/3.0.0/info/wrongly extended.json → ...s/3.0.0/models/info/wrongly extended.json
diff --git a/test/definitions/3.0.0/license/empty.json → ...finitions/3.0.0/models/license/empty.json b/test/definitions/3.0.0/license/empty.json → ...finitions/3.0.0/models/license/empty.json
diff --git a/test/definitions/3.0.0/license/extended.json → ...itions/3.0.0/models/license/extended.json b/test/definitions/3.0.0/license/extended.json → ...itions/3.0.0/models/license/extended.json
diff --git a/test/definitions/3.0.0/license/license.js → ...finitions/3.0.0/models/license/license.js b/test/definitions/3.0.0/license/license.js → ...finitions/3.0.0/models/license/license.js
@@ -13,10 +13,10 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/license.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/license.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../definitions/3.0.0/specificationExtension.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/specificationExtension.json'))
   .compile(infoJsonSchema);
 
 describe('License', () => {

diff --git a/...0.0/license/only required properties.json → ...els/license/only required properties.json b/...0.0/license/only required properties.json → ...els/license/only required properties.json
diff --git a/.../license/without required properties.json → .../license/without required properties.json b/.../license/without required properties.json → .../license/without required properties.json
diff --git a/...tions/3.0.0/license/wrongly extended.json → ....0.0/models/license/wrongly extended.json b/...tions/3.0.0/license/wrongly extended.json → ....0.0/models/license/wrongly extended.json
diff --git a/...nitions/3.0.0/reference object/array.json → .../3.0.0/models/reference object/array.json b/...nitions/3.0.0/reference object/array.json → .../3.0.0/models/reference object/array.json
diff --git a/...tions/3.0.0/reference object/boolean.json → ....0.0/models/reference object/boolean.json b/...tions/3.0.0/reference object/boolean.json → ....0.0/models/reference object/boolean.json
diff --git a/...nitions/3.0.0/reference object/empty.json → .../3.0.0/models/reference object/empty.json b/...nitions/3.0.0/reference object/empty.json → .../3.0.0/models/reference object/empty.json
diff --git a/...initions/3.0.0/reference object/null.json → ...s/3.0.0/models/reference object/null.json b/...initions/3.0.0/reference object/null.json → ...s/3.0.0/models/reference object/null.json
diff --git a/...itions/3.0.0/reference object/number.json → ...3.0.0/models/reference object/number.json b/...itions/3.0.0/reference object/number.json → ...3.0.0/models/reference object/number.json
diff --git a/...itions/3.0.0/reference object/object.json → ...3.0.0/models/reference object/object.json b/...itions/3.0.0/reference object/object.json → ...3.0.0/models/reference object/object.json
diff --git a/....0.0/reference object/reference-object.js → ...dels/reference object/reference-object.js b/....0.0/reference object/reference-object.js → ...dels/reference object/reference-object.js
@@ -13,10 +13,10 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/Reference.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/Reference.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addMetaSchema(require('../../../../definitions/3.0.0/ReferenceObject.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/ReferenceObject.json'))
   .compile(infoJsonSchema);
 
 describe('ReferenceObject', () => {

diff --git a/...itions/3.0.0/reference object/string.json → ...3.0.0/models/reference object/string.json b/...itions/3.0.0/reference object/string.json → ...3.0.0/models/reference object/string.json
diff --git a/...finitions/3.0.0/reference object/uri.json → ...ns/3.0.0/models/reference object/uri.json b/...finitions/3.0.0/reference object/uri.json → ...ns/3.0.0/models/reference object/uri.json
diff --git a/test/definitions/3.0.0/reference/empty.json → ...nitions/3.0.0/models/reference/empty.json b/test/definitions/3.0.0/reference/empty.json → ...nitions/3.0.0/models/reference/empty.json
diff --git a/...definitions/3.0.0/reference/extended.json → ...ions/3.0.0/models/reference/extended.json b/...definitions/3.0.0/reference/extended.json → ...ions/3.0.0/models/reference/extended.json
diff --git a/...0/reference/only required properties.json → ...s/reference/only required properties.json b/...0/reference/only required properties.json → ...s/reference/only required properties.json
diff --git a/.../definitions/3.0.0/reference/reference.js → ...tions/3.0.0/models/reference/reference.js b/.../definitions/3.0.0/reference/reference.js → ...tions/3.0.0/models/reference/reference.js
@@ -13,10 +13,10 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/Reference.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/Reference.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../definitions/3.0.0/ReferenceObject.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/ReferenceObject.json'))
   .compile(infoJsonSchema);
 
 describe('Reference', () => {

diff --git a/...eference/without required properties.json → ...eference/without required properties.json b/...eference/without required properties.json → ...eference/without required properties.json
diff --git a/...ons/3.0.0/reference/wrongly extended.json → ....0/models/reference/wrongly extended.json b/...ons/3.0.0/reference/wrongly extended.json → ....0/models/reference/wrongly extended.json
diff --git a/test/index.js b/test/index.js
@@ -3,14 +3,8 @@ const fs = require('fs');
 const path = require('path');
 
 describe('AsyncAPI: 3.0.0', () => {
-  require('./definitions/3.0.0/info/info.js');
-  require('./definitions/3.0.0/info extensions/info-extension.js');
-  require('./definitions/3.0.0/contact/contact.js');
-  require('./definitions/3.0.0/license/license.js');
-  require('./definitions/3.0.0/reference/reference.js');
-  require('./definitions/3.0.0/reference object/reference-object.js');
-
-  require('./definitions/3.0.0/security/index.js');
+  require('./definitions/3.0.0/models');
+  require('./definitions/3.0.0/security');
 });
 
 describe('AsyncAPI', () => {