Tests for recent C fixes (#20200)

* [C] Add test schemas for the recent changes

The recent commit 47665aa ("Fix a few issues with the C generator
(part 1 version 2) (#14434)") didn't include any test schemas. Add them
now, as requested:

  #14434 (comment)

* Update samples

* Fix sample update with missing files

* More fixes for sample updates

Author: eafer

modules/openapi-generator/src/test/resources/2_0/c/petstore.yaml

@@ -75,6 +75,24 @@ paths:
         - petstore_auth:
             - 'write:pets'
             - 'read:pets'
+  /pet/specialty:
+    get:
+      tags:
+        - pet
+      summary: Specialty of the shop
+      description: Returns the kind of pet the store specializes in
+      operationId: specialtyPet
+      produces:
+        - application/xml
+        - application/json
+      parameters: []
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Preference'
+      security:
+        - api_key: []
   /pet/findByStatus:
     get:
       tags:
@@ -626,6 +644,17 @@ definitions:
         type: string
     xml:
       name: Category
+  Preference:
+    title: Pet preference
+    description: A user's preference in pets
+    type: string
+    enum:
+      - cats
+      - dogs
+      - birds
+      - fish
+      - snakes
+      - other
   User:
     title: a User
     description: A User who is purchasing from the pet store
@@ -650,6 +679,12 @@ definitions:
         type: integer
         format: int32
         description: User Status
+      extra:
+        type: object
+        nullable: true
+        additionalProperties: true
+      preference:
+        $ref: '#/definitions/Preference'
     xml:
       name: User
   Tag:

samples/client/petstore/c-useJsonUnformatted/.openapi-generator/FILES

@@ -16,6 +16,7 @@ docs/category.md
 docs/model_with_set_propertes.md
 docs/order.md
 docs/pet.md
+docs/preference.md
 docs/tag.md
 docs/user.md
 external/cJSON.c
@@ -41,6 +42,8 @@ model/order.c
 model/order.h
 model/pet.c
 model/pet.h
+model/preference.c
+model/preference.h
 model/tag.c
 model/tag.h
 model/user.c

samples/client/petstore/c-useJsonUnformatted/CMakeLists.txt

@@ -60,6 +60,7 @@ set(SRCS
     model/model_with_set_propertes.c
     model/order.c
     model/pet.c
+    model/preference.c
     model/tag.c
     model/user.c
     api/PetAPI.c
@@ -82,6 +83,7 @@ set(HDRS
     model/model_with_set_propertes.h
     model/order.h
     model/pet.h
+    model/preference.h
     model/tag.h
     model/user.h
     api/PetAPI.h

samples/client/petstore/c-useJsonUnformatted/README.md

@@ -70,6 +70,7 @@ Category | Method | HTTP request | Description
 *PetAPI* | [**PetAPI_findPetsByStatus**](docs/PetAPI.md#PetAPI_findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
 *PetAPI* | [**PetAPI_findPetsByTags**](docs/PetAPI.md#PetAPI_findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
 *PetAPI* | [**PetAPI_getPetById**](docs/PetAPI.md#PetAPI_getPetById) | **GET** /pet/{petId} | Find pet by ID
+*PetAPI* | [**PetAPI_specialtyPet**](docs/PetAPI.md#PetAPI_specialtyPet) | **GET** /pet/specialty | Specialty of the shop
 *PetAPI* | [**PetAPI_updatePet**](docs/PetAPI.md#PetAPI_updatePet) | **PUT** /pet | Update an existing pet
 *PetAPI* | [**PetAPI_updatePetWithForm**](docs/PetAPI.md#PetAPI_updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetAPI* | [**PetAPI_uploadFile**](docs/PetAPI.md#PetAPI_uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
@@ -96,6 +97,7 @@ Category | Method | HTTP request | Description
  - [model_with_set_propertes_t](docs/model_with_set_propertes.md)
  - [order_t](docs/order.md)
  - [pet_t](docs/pet.md)
+ - [preference_t](docs/preference.md)
  - [tag_t](docs/tag.md)
  - [user_t](docs/user.md)
 

samples/client/petstore/c-useJsonUnformatted/api/PetAPI.c

@@ -460,6 +460,70 @@ PetAPI_getPetById(apiClient_t *apiClient, long petId)
 
 }
 
+// Specialty of the shop
+//
+// Returns the kind of pet the store specializes in
+//
+openapi_petstore_preference__e
+PetAPI_specialtyPet(apiClient_t *apiClient)
+{
+    list_t    *localVarQueryParameters = NULL;
+    list_t    *localVarHeaderParameters = NULL;
+    list_t    *localVarFormParameters = NULL;
+    list_t *localVarHeaderType = list_createList();
+    list_t *localVarContentType = NULL;
+    char      *localVarBodyParameters = NULL;
+
+    // create the path
+    long sizeOfPath = strlen("/pet/specialty")+1;
+    char *localVarPath = malloc(sizeOfPath);
+    snprintf(localVarPath, sizeOfPath, "/pet/specialty");
+
+
+
+    list_addElement(localVarHeaderType,"application/xml"); //produces
+    list_addElement(localVarHeaderType,"application/json"); //produces
+    apiClient_invoke(apiClient,
+                    localVarPath,
+                    localVarQueryParameters,
+                    localVarHeaderParameters,
+                    localVarFormParameters,
+                    localVarHeaderType,
+                    localVarContentType,
+                    localVarBodyParameters,
+                    "GET");
+
+    // uncomment below to debug the error response
+    //if (apiClient->response_code == 200) {
+    //    printf("%s\n","successful operation");
+    //}
+    //nonprimitive not container
+    cJSON *PetAPIlocalVarJSON = cJSON_Parse(apiClient->dataReceived);
+    openapi_petstore_preference__e elementToReturn = preference_parseFromJSON(PetAPIlocalVarJSON);
+    cJSON_Delete(PetAPIlocalVarJSON);
+    if(elementToReturn == 0) {
+        // return 0;
+    }
+
+    //return type
+    if (apiClient->dataReceived) {
+        free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
+        apiClient->dataReceivedLen = 0;
+    }
+    
+    
+    
+    list_freeList(localVarHeaderType);
+    
+    free(localVarPath);
+    return elementToReturn;
+end:
+    free(localVarPath);
+    return 0;
+
+}
+
 // Update an existing pet
 //
 void

samples/client/petstore/c-useJsonUnformatted/api/PetAPI.h

@@ -7,6 +7,7 @@
 #include "../include/binary.h"
 #include "../model/api_response.h"
 #include "../model/pet.h"
+#include "../model/preference.h"
 
 // Enum STATUS for PetAPI_findPetsByStatus
 typedef enum  { openapi_petstore_findPetsByStatus_STATUS_NULL = 0, openapi_petstore_findPetsByStatus_STATUS_available, openapi_petstore_findPetsByStatus_STATUS_pending, openapi_petstore_findPetsByStatus_STATUS_sold } openapi_petstore_findPetsByStatus_status_e;
@@ -48,6 +49,14 @@ pet_t*
 PetAPI_getPetById(apiClient_t *apiClient, long petId);
 
 
+// Specialty of the shop
+//
+// Returns the kind of pet the store specializes in
+//
+openapi_petstore_preference__e
+PetAPI_specialtyPet(apiClient_t *apiClient);
+
+
 // Update an existing pet
 //
 void

samples/client/petstore/c-useJsonUnformatted/docs/PetAPI.md

@@ -9,6 +9,7 @@ Method | HTTP request | Description
 [**PetAPI_findPetsByStatus**](PetAPI.md#PetAPI_findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
 [**PetAPI_findPetsByTags**](PetAPI.md#PetAPI_findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
 [**PetAPI_getPetById**](PetAPI.md#PetAPI_getPetById) | **GET** /pet/{petId} | Find pet by ID
+[**PetAPI_specialtyPet**](PetAPI.md#PetAPI_specialtyPet) | **GET** /pet/specialty | Specialty of the shop
 [**PetAPI_updatePet**](PetAPI.md#PetAPI_updatePet) | **PUT** /pet | Update an existing pet
 [**PetAPI_updatePetWithForm**](PetAPI.md#PetAPI_updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**PetAPI_uploadFile**](PetAPI.md#PetAPI_uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
@@ -153,6 +154,36 @@ Name | Type | Description  | Notes
 [pet_t](pet.md) *
 
 
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **PetAPI_specialtyPet**
+```c
+// Specialty of the shop
+//
+// Returns the kind of pet the store specializes in
+//
+preference_t* PetAPI_specialtyPet(apiClient_t *apiClient);
+```
+
+### Parameters
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+**apiClient** | **apiClient_t \*** | context containing the client configuration |
+
+### Return type
+
+[preference_t](preference.md) *
+
+
 ### Authorization
 
 [api_key](../README.md#api_key)

samples/client/petstore/c-useJsonUnformatted/docs/preference.md

@@ -0,0 +1,9 @@
+# preference_t
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/c-useJsonUnformatted/docs/user.md

@@ -11,6 +11,8 @@ Name | Type | Description | Notes
 **password** | **char \*** |  | [optional] 
 **phone** | **char \*** |  | [optional] 
 **user_status** | **int** | User Status | [optional] 
+**extra** | **list_t*** |  | [optional] 
+**preference** | **preference_t \*** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/c-useJsonUnformatted/model/preference.c

@@ -0,0 +1,47 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "preference.h"
+
+
+char* preference_preference_ToString(openapi_petstore_preference__e preference) {
+    char *preferenceArray[] =  { "NULL", "cats", "dogs", "birds", "fish", "snakes", "other" };
+    return preferenceArray[preference];
+}
+
+openapi_petstore_preference__e preference_preference_FromString(char* preference) {
+    int stringToReturn = 0;
+    char *preferenceArray[] =  { "NULL", "cats", "dogs", "birds", "fish", "snakes", "other" };
+    size_t sizeofArray = sizeof(preferenceArray) / sizeof(preferenceArray[0]);
+    while(stringToReturn < sizeofArray) {
+        if(strcmp(preference, preferenceArray[stringToReturn]) == 0) {
+            return stringToReturn;
+        }
+        stringToReturn++;
+    }
+    return 0;
+}
+
+cJSON *preference_convertToJSON(openapi_petstore_preference__e preference) {
+    cJSON *item = cJSON_CreateObject();
+    if(cJSON_AddStringToObject(item, "preference", preference_preference_ToString(preference)) == NULL) {
+        goto fail;
+    }
+    return item;
+fail:
+    cJSON_Delete(item);
+    return NULL;
+}
+
+openapi_petstore_preference__e preference_parseFromJSON(cJSON *preferenceJSON) {
+    openapi_petstore_preference__e *preference = NULL;
+    openapi_petstore_preference__e preferenceVariable;
+    cJSON *preferenceVar = cJSON_GetObjectItemCaseSensitive(preferenceJSON, "preference");
+    if(!cJSON_IsString(preferenceVar) || (preferenceVar->valuestring == NULL)){
+        goto end;
+    }
+    preferenceVariable = preference_preference_FromString(preferenceVar->valuestring);
+    return preferenceVariable;
+end:
+    return 0;
+}

samples/client/petstore/c-useJsonUnformatted/model/preference.h

@@ -0,0 +1,32 @@
+/*
+ * preference.h
+ *
+ * A user's preference in pets
+ */
+
+#ifndef _preference_H_
+#define _preference_H_
+
+#include <string.h>
+#include "../external/cJSON.h"
+#include "../include/list.h"
+#include "../include/keyValuePair.h"
+#include "../include/binary.h"
+
+typedef struct preference_t preference_t;
+
+
+// Enum  for preference
+
+typedef enum { openapi_petstore_preference__NULL = 0, openapi_petstore_preference__cats, openapi_petstore_preference__dogs, openapi_petstore_preference__birds, openapi_petstore_preference__fish, openapi_petstore_preference__snakes, openapi_petstore_preference__other } openapi_petstore_preference__e;
+
+char* preference_preference_ToString(openapi_petstore_preference__e preference);
+
+openapi_petstore_preference__e preference_preference_FromString(char* preference);
+
+cJSON *preference_convertToJSON(openapi_petstore_preference__e preference);
+
+openapi_petstore_preference__e preference_parseFromJSON(cJSON *preferenceJSON);
+
+#endif /* _preference_H_ */
+