Fix manual tests on client/petstore/c

Author: hirishh

modules/openapi-generator/src/main/resources/C-libcurl/README.md.mustache

@@ -22,9 +22,9 @@ You'll need the `curl 7.58.0` package in order to build the API. To have code fo
 ## Install the `curl 7.58.0` package with the following command on Linux.
 ```bash
 sudo apt remove curl
-wget http://curl.haxx.se/download/curl-7.58.0.tar.gz
-tar -xvf curl-7.58.0.tar.gz
-cd curl-7.58.0/
+wget http://curl.haxx.se/download/curl-7.61.1.tar.gz
+tar -xvf curl-7.61.1.tar.gz
+cd curl-7.61.1/
 ./configure
 make
 sudo make install

samples/client/petstore/c/build-and-test.bash

@@ -2,6 +2,10 @@
 
 set -e
 
+# project
+mkdir -p build
+cd build
+
 #install latest curl
 wget https://curl.haxx.se/download/curl-7.61.1.zip
 unzip curl-7.61.1.zip
@@ -11,10 +15,9 @@ make
 sudo make install
 cd ..
 
-# project
-cmake .
-
-make 
+# build project
+cmake ..
+make
 
 if [ -f unit-manual-PetAPI ]; then ./unit-manual-PetAPI; fi
 if [ -f unit-manual-UserAPI ]; then ./unit-manual-UserAPI; fi

samples/client/petstore/c/unit-tests/manual-PetAPI.c

@@ -55,14 +55,13 @@ int main() {
 	list_addElement(tags, exampleTag2);
 
 
-	status_e status = available;
 	pet_t *pet =
 		pet_create(EXAMPLE_PET_ID,
 		           category,
 		           petName,
 		           photoUrls,
 		           tags,
-		           status);
+		           openapi_petstore_pet_STATUS_available);
 
 	PetAPI_addPet(apiClient, pet);
 	cJSON *JSONR_local = pet_convertToJSON(pet);
@@ -95,9 +94,9 @@ int main() {
 	assert(mypet->id == EXAMPLE_PET_ID);
 	assert(strcmp(mypet->category->name, EXAMPLE_CATEGORY_NAME) == 0);
 	assert(mypet->category->id == EXAMPLE_CATEGORY_ID);
-	assert(strcmp(list_getElementAt(mypet->photoUrls,
+	assert(strcmp(list_getElementAt(mypet->photo_urls,
 	                                0)->data, EXAMPLE_URL_1) == 0);
-	assert(strcmp(list_getElementAt(mypet->photoUrls,
+	assert(strcmp(list_getElementAt(mypet->photo_urls,
 	                                1)->data, EXAMPLE_URL_2) == 0);
 	assert(((tag_t *) list_getElementAt(mypet->tags,
 	                                    0)->data)->id == EXAMPLE_TAG_1_ID);

samples/client/petstore/c/unit-tests/manual-StoreAPI.c

@@ -9,7 +9,6 @@
     #define PET_ID 12345
     #define QUANTITY 50
     #define SHIP_DATE "2018-09-24T10:19:09.592Z"
-    #define STATUS placed
     #define COMPLETE true
 
 /*
@@ -27,7 +26,7 @@ int main() {
 	                                 PET_ID,
 	                                 QUANTITY,
 	                                 shipdate,
-	                                 STATUS,
+	                                 openapi_petstore_order_STATUS_placed,
 	                                 COMPLETE);
 
 	order_t *returnorder = StoreAPI_placeOrder(apiClient, neworder);

samples/client/petstore/c/unit-tests/manual-UserAPI.c

@@ -33,13 +33,15 @@ int main() {
 	strcpy(phone, PHONE);
 
 	user_t *newuser = user_create(USER_ID,
-	                              username,
-	                              firstname,
-	                              lastname,
-	                              email,
-	                              password,
-	                              phone,
-	                              USER_STATUS);
+                                  username,
+                                  firstname,
+                                  lastname,
+                                  email,
+                                  password,
+                                  phone,
+	                              USER_STATUS,
+                                  NULL,
+                                  openapi_petstore_preference__cats);
 
 	UserAPI_createUser(apiClient, newuser);
 	user_free(newuser);
@@ -82,7 +84,9 @@ int main() {
 		                               email,
 		                               password,
 		                               phone,
-		                               USER_STATUS);
+		                               USER_STATUS,
+		                               NULL,
+		                               openapi_petstore_preference__cats);
 
 		UserAPI_updateUser(apiClient2, username1, newuser1);
 		user_free(newuser1);

samples/client/petstore/c/unit-tests/manual-order.c

@@ -12,11 +12,12 @@
 #define COMPLETE 1
 
 int main() {
-	status_e STATUS = placed;
+	char *shipDate = malloc(strlen(SHIP_DATE) + 1);
+	strcpy(shipDate, SHIP_DATE);
 
-	order_t *neworder = order_create(ORDER_ID, PET_ID, QUANTITY, SHIP_DATE,
-	                                 STATUS,
-	                                 COMPLETE);
+	order_t *neworder = order_create(ORDER_ID, PET_ID, QUANTITY, shipDate,
+		openapi_petstore_order_STATUS_placed,
+		COMPLETE);
 
 	cJSON *JSONNODE = order_convertToJSON(neworder);
 

samples/client/petstore/c/unit-tests/manual-user.c

@@ -14,9 +14,30 @@
 #define USER_STATUS 4
 
 int main() {
-	user_t *newuser = user_create(USER_ID, USER_NAME, FIRST_NAME, LAST_NAME,
-	                              EMAIL,
-	                              PASSWORD, PHONE, USER_STATUS);
+
+	char *username = malloc(strlen(USER_NAME) + 1);
+	strcpy(username, USER_NAME);
+	char *firstname = malloc(strlen(FIRST_NAME) + 1);
+	strcpy(firstname, FIRST_NAME);
+	char *lastname = malloc(strlen(LAST_NAME) + 1);
+	strcpy(lastname, LAST_NAME);
+	char *email = malloc(strlen(EMAIL) + 1);
+	strcpy(email, EMAIL);
+	char *password = malloc(strlen(PASSWORD) + 1);
+	strcpy(password, PASSWORD);
+	char *phone = malloc(strlen(PHONE) + 1);
+	strcpy(phone, PHONE);
+	
+	user_t *newuser = user_create(USER_ID,
+	                              username,
+	                              firstname,
+	                              lastname,
+	                              email,
+	                              password,
+	                              phone,
+	                              USER_STATUS,
+	                              NULL,
+	                              openapi_petstore_preference__cats);
 
 	cJSON *JSONNODE = user_convertToJSON(newuser);