Merge pull request #21 from zweidenker/development

Development
zweidenker · Aug 5, 2020 · 8b88bdc · 8b88bdc
2 parents 58c8816 + 7c5d2a5
commit 8b88bdc
Show file tree

Hide file tree

Showing 82 changed files with 187 additions and 71 deletions.
diff --git a/source/BaselineOfOpenAPI.package/BaselineOfOpenAPI.class/instance/mocketry..st b/source/BaselineOfOpenAPI.package/BaselineOfOpenAPI.class/instance/mocketry..st
@@ -1,4 +1,4 @@
 baselines
 mocketry: spec
 	spec baseline: 'Mocketry' with: [ 
-		spec repository: 'github://dionisiydk/Mocketry:v4.0.x'. ]
+		spec repository: 'github://dionisiydk/Mocketry:v4.0.x'. ]
diff --git a/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/operationObjectJSON.st b/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/operationObjectJSON.st
@@ -15,6 +15,14 @@ operationObjectJSON
       "schema": {
         "type": "string"
       }
+    },
+	{
+      "name": "secondId",
+      "in": "query",
+      "description": "an ID to have more than one",
+      "schema": {
+        "type": "string"
+      }
     }
   ],
   "requestBody": {

diff --git a/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/petStoreApiJsonString.st b/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/petStoreApiJsonString.st
@@ -113,7 +113,15 @@ petStoreApiJsonString
             "schema": {
               "type": "string"
             }
-          }
+          },
+			{
+      			"name": "secondId",
+      			"in": "query",
+      			"description": "just an ID to have more than one",
+      			"schema": {
+        		"type": "string"
+      		}
+    }
         ],
         "responses": {
           "200": {

diff --git a/...PI-Core-Tests.package/OAParsingTests.class/instance/testOpenAPISpecHasSortedParameters.st b/...PI-Core-Tests.package/OAParsingTests.class/instance/testOpenAPISpecHasSortedParameters.st
@@ -0,0 +1,10 @@
+tests
+testOpenAPISpecHasSortedParameters
+	| api string json parameters |
+	api := OpenAPI fromString: self petStoreApiJsonString.
+	string := api specString.
+	json := NeoJSONObject fromString: string.
+	parameters := (json paths at: #'/pets/{petId}') get parameters.
+	self assert: parameters size equals: 2.
+	self assert: parameters first name equals: #petId.
+	self assert: parameters second name equals: #secondId
diff --git a/source/OpenAPI-Core.package/OAHeaderParametersLocation.class/instance/extractParameter..st b/source/OpenAPI-Core.package/OAHeaderParametersLocation.class/instance/extractParameter..st
@@ -0,0 +1,3 @@
+reading
+extractParameter: aCall
+	^ parameter read: (aCall request headers at: parameter name ifAbsent: [ ^ nil ])
diff --git a/source/OpenAPI-Core.package/OAMediaTypeObject.class/instance/read.object..st b/source/OpenAPI-Core.package/OAMediaTypeObject.class/instance/read.object..st
@@ -1,3 +1,5 @@
 as yet unclassified
 read: value object: object
-	^ schema read: value object: object
+	^ [schema read: value object: object] on: JSONSchemaError do: [ :ex |
+			OAInvalidFormat signal: ex description
+		 ]
diff --git a/source/OpenAPI-Core.package/OAOperation.class/class/neoJsonMapping..st b/source/OpenAPI-Core.package/OAOperation.class/class/neoJsonMapping..st
@@ -4,7 +4,7 @@ neoJsonMapping: mapper
 		for: self
 		do: [ :mapping | 
 			mapping mapInstVars: #(tags summary description externalDocs operationId responses callbacks deprecated security servers).
-			(mapping mapInstVar: #parameters) valueSchema: #ParameterList.
+			(mapping mapAccessor: #parametersSortedByName mutator: #parameters: to: #parameters) valueSchema: #ParameterList.
 			(mapping mapInstVar: #requestBody) valueSchema: OARequestBody.
 			(mapping mapAccessor: #responses) valueSchema: #ResponsesDictionary. ].
 	mapper

diff --git a/source/OpenAPI-Core.package/OAOperation.class/instance/deprecated1..st b/source/OpenAPI-Core.package/OAOperation.class/instance/deprecated1..st
diff --git a/source/OpenAPI-Core.package/OAOperation.class/instance/initializeValuesOn.fromRequest..st b/source/OpenAPI-Core.package/OAOperation.class/instance/initializeValuesOn.fromRequest..st
@@ -1,7 +1,11 @@
 reading
-initializeValuesOn: object fromRequest: request
+initializeValuesOn: aCall fromRequest: request
 	parameters ifNotNil: [
 		parameters do: [ :each | 
-			each writeParameterValueOn: object request: request]].
+			each 
+				writeParameterValueOn: aCall parameterValueDelegate 
+				request: request]].
 	requestBody ifNotNil: [ 
-		(requestBody readFrom: request object: object) ]
+		(requestBody 
+			readFrom: request 
+			object: aCall bodyValueDelegate ) ]
diff --git a/source/OpenAPI-Core.package/OAOperation.class/instance/parametersSortedByName.st b/source/OpenAPI-Core.package/OAOperation.class/instance/parametersSortedByName.st
@@ -0,0 +1,4 @@
+accessing
+parametersSortedByName
+	parameters ifNil: [ ^ nil ].
+	^ parameters sorted: [ :a :b | a name < b name ]
diff --git a/source/OpenAPI-Core.package/OAParameter.class/instance/extractParameter..st b/source/OpenAPI-Core.package/OAParameter.class/instance/extractParameter..st
@@ -1,7 +1,9 @@
 accessing
 extractParameter: aCall
 	| value |
-	value := location extractParameter: aCall.
+	value := [location extractParameter: aCall]  on: JSONSchemaError do: [ :ex |
+			OAInvalidFormat signal: ex description
+		 ].
 	value isNil
 		ifTrue: [ required
 				ifTrue: [ OAMissingRequiredParameter signal: 'parameter ' , name , ' is required but not present' ]

diff --git a/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn..st b/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn..st
diff --git a/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn.request..st b/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn.request..st
@@ -7,5 +7,11 @@ writeParameterValueOn: anObject request: request
 	value := self extractParameter: request. 
 	value ifNil: [ ^ self ].
 	self shouldUseAccessors 
-		ifTrue: [ anObject perform: name asSymbol asMutator with: value ]
-		ifFalse: [ anObject instVarNamed: name put: value ]
+		ifTrue: [ 
+			anObject 
+				perform: name asValidSelector asMutator 
+				with: value ]
+		ifFalse: [ 
+			anObject 
+				instVarNamed: name asValidSelector 
+				put: value ]
diff --git a/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/extractParameter..st b/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/extractParameter..st
@@ -1,4 +1,4 @@
-as yet unclassified
+reading
 extractParameter: aCall
 	| index value |
 	($/ split: aCall class path allButFirst) withIndexDo: [ :each :idx |

diff --git a/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/write.value.to..st b/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/write.value.to..st
@@ -1,3 +1,3 @@
-as yet unclassified
+writing
 write: key value: value to: builder 
 	builder addPathParameter: key value: value
diff --git a/...Tests.package/OARESTTests.class/README.md → ...ge/OAMissingHeaderPetCall.class/README.md b/...Tests.package/OARESTTests.class/README.md → ...ge/OAMissingHeaderPetCall.class/README.md
diff --git a/...e/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterOptionalPetId.st b/...e/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterOptionalPetId.st
@@ -0,0 +1,9 @@
+accessing
+parameterOptionalPetId
+	<openApiParameter: #( common )>
+	^ OAParameter new
+		name: 'Optional-Pet-Id';
+		in: #header;
+		beInteger;
+		required: false;
+		description: 'The internal id of the pet in the pet store'
diff --git a/...e/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterRequiredPetId.st b/...e/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterRequiredPetId.st
@@ -0,0 +1,9 @@
+accessing
+parameterRequiredPetId
+	<openApiParameter: #( common )>
+	^ OAParameter new
+		name: 'Required-Pet-Id';
+		in: #header;
+		beInteger;
+		required: true;
+		description: 'The internal id of the pet in the pet store'
diff --git a/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/path.st b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/path.st
@@ -0,0 +1,3 @@
+accessing
+path 
+	^ '/pets/header-missing'
diff --git a/.../OpenAPIPetCall.class/class/responseOk.st → ...ngHeaderPetCall.class/class/responseOk.st b/.../OpenAPIPetCall.class/class/responseOk.st → ...ngHeaderPetCall.class/class/responseOk.st
diff --git a/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/instance/get.st b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/instance/get.st
@@ -0,0 +1,3 @@
+public
+get
+	response := self response: Dictionary new status: 200 contentType: 'application/json'
diff --git a/...package/OARESTTests.class/properties.json → ...issingHeaderPetCall.class/properties.json b/...package/OARESTTests.class/properties.json → ...issingHeaderPetCall.class/properties.json
@@ -1,15 +1,13 @@
 {
 	"commentStamp" : "",
-	"super" : "TestCase",
+	"super" : "OpenAPITestCall",
 	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [
-		"serverDelegate",
-		"server",
-		"client"
+		"requiredPetId"
 	],
-	"name" : "OARESTTests",
+	"name" : "OAMissingHeaderPetCall",
 	"type" : "normal"
 }
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/setUp.st b/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/setUp.st
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/tearDown.st b/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/tearDown.st
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetCall.st b/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetCall.st
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetPostCall.st b/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetPostCall.st
diff --git a/...ST.package/OpenAPIPetCall.class/README.md → ...ackage/OpenAPIBasePetCall.class/README.md b/...ST.package/OpenAPIPetCall.class/README.md → ...ackage/OpenAPIBasePetCall.class/README.md
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIBasePetCall.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPIBasePetCall.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "OpenAPICall",
+	"category" : "OpenAPI-REST-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "OpenAPIBasePetCall",
+	"type" : "normal"
+}
diff --git a/.../OpenAPIPetCollectionCall.class/README.md → ...ackage/OpenAPIHeaderTests.class/README.md b/.../OpenAPIPetCollectionCall.class/README.md → ...ackage/OpenAPIHeaderTests.class/README.md
diff --git a/...EST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingOptionalHeaderParameter.st b/...EST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingOptionalHeaderParameter.st
@@ -0,0 +1,13 @@
+tests
+testMissingOptionalHeaderParameter
+
+	| response |
+	Pet instances add: (Pet new id: 1; name: 'testpet'; age: 1).
+	response := self delegate handleRequest: (ZnClient new
+		url: '/pets/header-missing';
+		headerAt: 'Required-Pet-Id' add: '123';
+		method: #GET;
+		prepareRequest) request.
+	self assert: response isSuccess 
+
+
diff --git a/...EST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingRequiredHeaderParameter.st b/...EST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingRequiredHeaderParameter.st
@@ -0,0 +1,14 @@
+tests
+testMissingRequiredHeaderParameter
+
+	| response |
+	Pet instances add: (Pet new id: 1; name: 'testpet'; age: 1).
+	response := self delegate handleRequest: (ZnClient new
+		url: '/pets/header-missing';
+		method: #GET;
+		prepareRequest) request.
+	self deny: response isSuccess.
+	self assert: response status equals: 400.
+	self assert: (response contents includesSubstring: 'Required-Pet-Id')
+
+
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "OpenAPIRestTests",
+	"category" : "OpenAPI-REST-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "OpenAPIHeaderTests",
+	"type" : "normal"
+}
diff --git a/...T.package/OpenAPIRestTest.class/README.md → ...ts.package/OpenAPIPetCall.class/README.md b/...T.package/OpenAPIRestTest.class/README.md → ...ts.package/OpenAPIPetCall.class/README.md
diff --git a/...OpenAPIPetCall.class/class/description.st → ...OpenAPIPetCall.class/class/description.st b/...OpenAPIPetCall.class/class/description.st → ...OpenAPIPetCall.class/class/description.st
diff --git a/...nAPIPetCall.class/class/getDescription.st → ...nAPIPetCall.class/class/getDescription.st b/...nAPIPetCall.class/class/getDescription.st → ...nAPIPetCall.class/class/getDescription.st
diff --git a/.../OpenAPIPetCall.class/class/getSummary.st → .../OpenAPIPetCall.class/class/getSummary.st b/.../OpenAPIPetCall.class/class/getSummary.st → .../OpenAPIPetCall.class/class/getSummary.st
diff --git a/...nAPIPetCall.class/class/parameterPetId.st → ...nAPIPetCall.class/class/parameterPetId.st b/...nAPIPetCall.class/class/parameterPetId.st → ...nAPIPetCall.class/class/parameterPetId.st
diff --git a/...ackage/OpenAPIPetCall.class/class/path.st → ...ackage/OpenAPIPetCall.class/class/path.st b/...ackage/OpenAPIPetCall.class/class/path.st → ...ackage/OpenAPIPetCall.class/class/path.st
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/responseOk.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/responseOk.st
@@ -0,0 +1,7 @@
+as yet unclassified
+responseOk
+	<openApiResponse: #(get) status: #(200) contentType: #('application/json')>
+	^ OAMediaTypeObject new
+		schema: { 
+			#name -> (JSONSchema string).
+			#age -> (JSONSchema integer) } asJSONSchema
diff --git a/...age/OpenAPIPetCall.class/class/summary.st → ...age/OpenAPIPetCall.class/class/summary.st b/...age/OpenAPIPetCall.class/class/summary.st → ...age/OpenAPIPetCall.class/class/summary.st
diff --git a/...kage/OpenAPIPetCall.class/instance/get.st → ...kage/OpenAPIPetCall.class/instance/get.st b/...kage/OpenAPIPetCall.class/instance/get.st → ...kage/OpenAPIPetCall.class/instance/get.st
diff --git a/...kage/OpenAPIPetCall.class/properties.json → ...kage/OpenAPIPetCall.class/properties.json b/...kage/OpenAPIPetCall.class/properties.json → ...kage/OpenAPIPetCall.class/properties.json
@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "",
-	"super" : "OpenAPICall",
-	"category" : "OpenAPI-REST",
+	"super" : "OpenAPIBasePetCall",
+	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],

diff --git a/...T.package/OpenAPISpecCall.class/README.md → .../OpenAPIPetCollectionCall.class/README.md b/...T.package/OpenAPISpecCall.class/README.md → .../OpenAPIPetCollectionCall.class/README.md
diff --git a/...nAPIPetCollectionCall.class/class/path.st → ...nAPIPetCollectionCall.class/class/path.st b/...nAPIPetCollectionCall.class/class/path.st → ...nAPIPetCollectionCall.class/class/path.st
diff --git a/...CollectionCall.class/class/requestBody.st → ...CollectionCall.class/class/requestBody.st b/...CollectionCall.class/class/requestBody.st → ...CollectionCall.class/class/requestBody.st
diff --git a/...ectionCall.class/class/requestBodyJson.st → ...ectionCall.class/class/requestBodyJson.st b/...ectionCall.class/class/requestBodyJson.st → ...ectionCall.class/class/requestBodyJson.st
diff --git a/...IPetCollectionCall.class/instance/post.st → ...IPetCollectionCall.class/instance/post.st b/...IPetCollectionCall.class/instance/post.st → ...IPetCollectionCall.class/instance/post.st
diff --git a/...ctionCall.class/instance/valueDelegate.st → ...ctionCall.class/instance/valueDelegate.st b/...ctionCall.class/instance/valueDelegate.st → ...ctionCall.class/instance/valueDelegate.st
diff --git a/...PIPetCollectionCall.class/properties.json → ...PIPetCollectionCall.class/properties.json b/...PIPetCollectionCall.class/properties.json → ...PIPetCollectionCall.class/properties.json
@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "",
-	"super" : "OpenAPICall",
-	"category" : "OpenAPI-REST",
+	"super" : "OpenAPIBasePetCall",
+	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],

diff --git a/.../OpenAPI-REST.package/Pet.class/README.md → ...ckage/OpenAPIRestPetTests.class/README.md b/.../OpenAPI-REST.package/Pet.class/README.md → ...ckage/OpenAPIRestPetTests.class/README.md
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/instance/rootCallClass.st b/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/instance/rootCallClass.st
@@ -0,0 +1,3 @@
+tests
+rootCallClass
+	^ OpenAPIBasePetCall
diff --git a/...RestTest.class/instance/testGetPetCall.st → ...PetTests.class/instance/testGetPetCall.st b/...RestTest.class/instance/testGetPetCall.st → ...PetTests.class/instance/testGetPetCall.st
diff --git a/...estTest.class/instance/testPostPetCall.st → ...etTests.class/instance/testPostPetCall.st b/...estTest.class/instance/testPostPetCall.st → ...etTests.class/instance/testPostPetCall.st
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "OpenAPIRestTests",
+	"category" : "OpenAPI-REST-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "OpenAPIRestPetTests",
+	"type" : "normal"
+}
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/README.md
diff --git a/...enAPIRestTest.class/instance/debugMode.st → ...nAPIRestTests.class/instance/debugMode.st b/...enAPIRestTest.class/instance/debugMode.st → ...nAPIRestTests.class/instance/debugMode.st
diff --git a/...penAPIRestTest.class/instance/delegate.st → ...enAPIRestTests.class/instance/delegate.st b/...penAPIRestTest.class/instance/delegate.st → ...enAPIRestTests.class/instance/delegate.st
@@ -3,4 +3,4 @@ delegate
 
 	^ (ZnRestServerDelegate new
 			uriSpace: (OpenAPIUriSpace new
-				rootClass: OpenAPICall ))
+				rootClass: self rootCallClass ))
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/rootCallClass.st b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/rootCallClass.st
@@ -0,0 +1,3 @@
+tests
+rootCallClass
+	^ OpenAPITestCall
diff --git a/...OpenAPIRestTest.class/instance/runCase.st → ...penAPIRestTests.class/instance/runCase.st b/...OpenAPIRestTest.class/instance/runCase.st → ...penAPIRestTests.class/instance/runCase.st
diff --git a/...age/OpenAPIRestTest.class/properties.json → ...ge/OpenAPIRestTests.class/properties.json b/...age/OpenAPIRestTest.class/properties.json → ...ge/OpenAPIRestTests.class/properties.json
@@ -1,11 +1,11 @@
 {
 	"commentStamp" : "",
 	"super" : "TestCase",
-	"category" : "OpenAPI-REST",
+	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [ ],
-	"name" : "OpenAPIRestTest",
+	"name" : "OpenAPIRestTests",
 	"type" : "normal"
 }
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/README.md
diff --git a/...ckage/OpenAPISpecCall.class/class/path.st → ...ckage/OpenAPISpecCall.class/class/path.st b/...ckage/OpenAPISpecCall.class/class/path.st → ...ckage/OpenAPISpecCall.class/class/path.st
diff --git a/...age/OpenAPISpecCall.class/instance/get.st → ...age/OpenAPISpecCall.class/instance/get.st b/...age/OpenAPISpecCall.class/instance/get.st → ...age/OpenAPISpecCall.class/instance/get.st
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "OpenAPIBasePetCall",
+	"category" : "OpenAPI-REST-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "OpenAPISpecCall",
+	"type" : "normal"
+}
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPITestCall.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPITestCall.class/README.md
diff --git a/...age/OpenAPISpecCall.class/properties.json → ...age/OpenAPITestCall.class/properties.json b/...age/OpenAPISpecCall.class/properties.json → ...age/OpenAPITestCall.class/properties.json
@@ -1,11 +1,11 @@
 {
 	"commentStamp" : "",
 	"super" : "OpenAPICall",
-	"category" : "OpenAPI-REST",
+	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [ ],
-	"name" : "OpenAPISpecCall",
+	"name" : "OpenAPITestCall",
 	"type" : "normal"
 }
diff --git a/source/OpenAPI-REST-Tests.package/Pet.class/README.md b/source/OpenAPI-REST-Tests.package/Pet.class/README.md
diff --git a/...ackage/Pet.class/class/instanceWithId..st → ...ackage/Pet.class/class/instanceWithId..st b/...ackage/Pet.class/class/instanceWithId..st → ...ackage/Pet.class/class/instanceWithId..st
diff --git a/...REST.package/Pet.class/class/instances.st → ...ests.package/Pet.class/class/instances.st b/...REST.package/Pet.class/class/instances.st → ...ests.package/Pet.class/class/instances.st
diff --git a/...ackage/Pet.class/class/neoJsonMapping..st → ...ackage/Pet.class/class/neoJsonMapping..st b/...ackage/Pet.class/class/neoJsonMapping..st → ...ackage/Pet.class/class/neoJsonMapping..st
diff --git a/...package/Pet.class/class/resetInstances.st → ...package/Pet.class/class/resetInstances.st b/...package/Pet.class/class/resetInstances.st → ...package/Pet.class/class/resetInstances.st
diff --git a/...I-REST.package/Pet.class/instance/age..st → ...-Tests.package/Pet.class/instance/age..st b/...I-REST.package/Pet.class/instance/age..st → ...-Tests.package/Pet.class/instance/age..st
diff --git a/...PI-REST.package/Pet.class/instance/age.st → ...T-Tests.package/Pet.class/instance/age.st b/...PI-REST.package/Pet.class/instance/age.st → ...T-Tests.package/Pet.class/instance/age.st
diff --git a/...PI-REST.package/Pet.class/instance/id..st → ...T-Tests.package/Pet.class/instance/id..st b/...PI-REST.package/Pet.class/instance/id..st → ...T-Tests.package/Pet.class/instance/id..st
diff --git a/...API-REST.package/Pet.class/instance/id.st → ...ST-Tests.package/Pet.class/instance/id.st b/...API-REST.package/Pet.class/instance/id.st → ...ST-Tests.package/Pet.class/instance/id.st
diff --git a/...-REST.package/Pet.class/instance/name..st → ...Tests.package/Pet.class/instance/name..st b/...-REST.package/Pet.class/instance/name..st → ...Tests.package/Pet.class/instance/name..st
diff --git a/...I-REST.package/Pet.class/instance/name.st → ...-Tests.package/Pet.class/instance/name.st b/...I-REST.package/Pet.class/instance/name.st → ...-Tests.package/Pet.class/instance/name.st
diff --git a/...-REST.package/Pet.class/instance/store.st → ...Tests.package/Pet.class/instance/store.st b/...-REST.package/Pet.class/instance/store.st → ...Tests.package/Pet.class/instance/store.st