Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Tck schema changes #570

Closed
wants to merge 79 commits into from
Closed

Tck schema changes #570

wants to merge 79 commits into from

Conversation

KonstantinSviridov
Copy link
Contributor

Implementing #562

Conflicts:
	src/raml1/test/data/TCK/RAML10/Annotations/test020/apiInvalid-tck.json
	src/raml1/test/data/TCK/RAML10/Examples/test013/api-tck.json
	src/raml1/test/data/TCK/RAML10/Overlays/test001/api.raml
	src/raml1/test/data/TCK/RAML10/Overlays/test022/api.raml
	src/raml1/test/data/TCK/RAML10/Overlays/test029/api-tck.json
	src/raml1/test/data/TCK/RAML10/Overlays/test029/overlay.raml
	src/raml1/test/data/TCK/RAML10/Specifications/world-music-api/api-tck.json
	src/raml1/test/data/TCK/RAML10/spec-examples/APIs/annotations-tck.json
	src/raml1/test/data/TCK/RAML10/spec-examples/APIs/file-type-tck.json
	src/raml1/test/data/TCK/RAML10/spec-examples/APIs/resourcetypes-traits-parameterfunctions-tck.json
	src/util/TCKDumper.ts
types, annotationTypes, securitySchemes, traits, resourceTypes, methods
Conflicts:
	src/raml1/ast.core/expander.ts
	src/raml1/highLevelImpl.ts
	src/raml1/wrapped-ast/wrapperHelper.ts
	src/util/TCKDumper.ts
	workspace.json
KonstantinSviridov and others added 15 commits January 10, 2017 00:51
Conflicts:
	src/raml1/test/data/LibraryExpansion/Specifications/world-music-api/api-tck.json
	src/raml1/test/data/TCK/raml-1.0/Annotations/scalars/test019/api-tck.json
	src/raml1/test/data/TCK/raml-1.0/Annotations/scalars/test020/api-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/ObjectTypes/typeKind2/oType01-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/date-types-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/file-type-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/integer-type-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/multiple-inheritance-2-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/multiple-inheritance-3-invalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/number-type-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/union-type-multiple-inheritance-tck.json
	src/raml1/wrapped-ast/defaultCalculator.ts
Conflicts:
	src/raml1/ast.core/expander.ts
	src/raml1/test/data/LibraryExpansion/ReferencesPatching/NilableTypes/test001/api-tck.json
	src/raml1/test/data/functions/dumps/parseStructuredExample0.dump
workflow
KonstantinSviridov and others added 11 commits February 6, 2017 18:25
Conflicts:
	src/raml1/test/data/LibraryExpansion/ReferencesPatching/Types/test001/api-tck.json
	src/raml1/test/data/LibraryExpansion/Specifications/world-music-api/api-tck.json
	src/raml1/test/data/TCK/raml-1.0/Fragments/test010/api-tck.json
	src/raml1/test/data/TCK/raml-1.0/Others/world-music-api/api-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/External
Types/test001/api-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/External
Types/test002/api-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/External
Types/test004/api-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test001/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test001/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test002/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test002/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test003/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test003/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test004/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test004/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test005/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test005/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test006/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test006/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test007/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test007/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test008/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test008/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test009/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test009/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test010/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/typeKind/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/jsonscheme/test5/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/jsonscheme/test5/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/jsonscheme/test6/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/jsonscheme/test6/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/jsonscheme/test7/apiInvalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/jsonscheme/test7/apiValid-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/bodies-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/external-type-extend-invalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/external-types-invalid-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/external-types-tck.json
	src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/responses-tck.json
	src/raml1/test/data/vfsTests/jsonRefsTest001/api-tck.json
	src/raml1/test/data/vfsTests/test003/api-tck.json
level reference patching implementation
@KonstantinSviridov
Copy link
Contributor Author

The code has been merged manually in cb99a46

@KonstantinSviridov KonstantinSviridov deleted the tck-schema-changes branch February 27, 2017 16:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants