Add URL parsing test suite from web-platform-tests/wpt
This commit is contained in:
@@ -1,63 +0,0 @@
|
|||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include "url.h"
|
|
||||||
|
|
||||||
#define UNPACK(s) (s).len, (s).ptr
|
|
||||||
|
|
||||||
static char *host_type_to_str(URL_HostType type)
|
|
||||||
{
|
|
||||||
switch (type) {
|
|
||||||
case URL_HOST_EMPTY:
|
|
||||||
return "";
|
|
||||||
case URL_HOST_IPV4:
|
|
||||||
return "IPv4";
|
|
||||||
case URL_HOST_IPV6:
|
|
||||||
return "IPv6";
|
|
||||||
case URL_HOST_NAME:
|
|
||||||
return "name";
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
return "???";
|
|
||||||
}
|
|
||||||
|
|
||||||
static void dump_parsed_url(URL *parsed)
|
|
||||||
{
|
|
||||||
printf(
|
|
||||||
"URL {\n"
|
|
||||||
" scheme = [%.*s]\n"
|
|
||||||
" username = [%.*s]\n"
|
|
||||||
" password = [%.*s]\n"
|
|
||||||
" host = [%.*s] (%s)\n"
|
|
||||||
" port = [%d]%s\n"
|
|
||||||
" path = [%.*s]\n"
|
|
||||||
" query = [%.*s]\n"
|
|
||||||
" fragment = [%.*s]\n"
|
|
||||||
"}\n",
|
|
||||||
UNPACK(parsed->scheme),
|
|
||||||
UNPACK(parsed->username),
|
|
||||||
UNPACK(parsed->password),
|
|
||||||
UNPACK(parsed->host_text),
|
|
||||||
host_type_to_str(parsed->host_type),
|
|
||||||
parsed->port,
|
|
||||||
parsed->no_port ? " (empty)" : "",
|
|
||||||
UNPACK(parsed->path),
|
|
||||||
UNPACK(parsed->query),
|
|
||||||
UNPACK(parsed->fragment));
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
if (argc < 2) {
|
|
||||||
printf("Missing URL\n");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
char *url = argv[1];
|
|
||||||
|
|
||||||
URL parsed;
|
|
||||||
int ret = url_parse(url, strlen(url), NULL, &parsed);
|
|
||||||
|
|
||||||
printf("ret=%d\n", ret);
|
|
||||||
if (ret == 0)
|
|
||||||
dump_parsed_url(&parsed);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@@ -7,7 +7,7 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
all:
|
all:
|
||||||
gcc -o test$(EXT) test.c url.c -Wall -Wextra
|
gcc -o test$(EXT) test.c ../url.c cJSON.c -Wall -Wextra -ggdb
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm test test.exe
|
rm test test.exe
|
||||||
+3191
File diff suppressed because it is too large
Load Diff
+306
@@ -0,0 +1,306 @@
|
|||||||
|
/*
|
||||||
|
Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef cJSON__h
|
||||||
|
#define cJSON__h
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
{
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
|
||||||
|
#define __WINDOWS__
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __WINDOWS__
|
||||||
|
|
||||||
|
/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention. For windows you have 3 define options:
|
||||||
|
|
||||||
|
CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
|
||||||
|
CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
|
||||||
|
CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
|
||||||
|
|
||||||
|
For *nix builds that support visibility attribute, you can define similar behavior by
|
||||||
|
|
||||||
|
setting default visibility to hidden by adding
|
||||||
|
-fvisibility=hidden (for gcc)
|
||||||
|
or
|
||||||
|
-xldscope=hidden (for sun cc)
|
||||||
|
to CFLAGS
|
||||||
|
|
||||||
|
then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define CJSON_CDECL __cdecl
|
||||||
|
#define CJSON_STDCALL __stdcall
|
||||||
|
|
||||||
|
/* export symbols by default, this is necessary for copy pasting the C and header file */
|
||||||
|
#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
|
||||||
|
#define CJSON_EXPORT_SYMBOLS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(CJSON_HIDE_SYMBOLS)
|
||||||
|
#define CJSON_PUBLIC(type) type CJSON_STDCALL
|
||||||
|
#elif defined(CJSON_EXPORT_SYMBOLS)
|
||||||
|
#define CJSON_PUBLIC(type) __declspec(dllexport) type CJSON_STDCALL
|
||||||
|
#elif defined(CJSON_IMPORT_SYMBOLS)
|
||||||
|
#define CJSON_PUBLIC(type) __declspec(dllimport) type CJSON_STDCALL
|
||||||
|
#endif
|
||||||
|
#else /* !__WINDOWS__ */
|
||||||
|
#define CJSON_CDECL
|
||||||
|
#define CJSON_STDCALL
|
||||||
|
|
||||||
|
#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
|
||||||
|
#define CJSON_PUBLIC(type) __attribute__((visibility("default"))) type
|
||||||
|
#else
|
||||||
|
#define CJSON_PUBLIC(type) type
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* project version */
|
||||||
|
#define CJSON_VERSION_MAJOR 1
|
||||||
|
#define CJSON_VERSION_MINOR 7
|
||||||
|
#define CJSON_VERSION_PATCH 19
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
/* cJSON Types: */
|
||||||
|
#define cJSON_Invalid (0)
|
||||||
|
#define cJSON_False (1 << 0)
|
||||||
|
#define cJSON_True (1 << 1)
|
||||||
|
#define cJSON_NULL (1 << 2)
|
||||||
|
#define cJSON_Number (1 << 3)
|
||||||
|
#define cJSON_String (1 << 4)
|
||||||
|
#define cJSON_Array (1 << 5)
|
||||||
|
#define cJSON_Object (1 << 6)
|
||||||
|
#define cJSON_Raw (1 << 7) /* raw json */
|
||||||
|
|
||||||
|
#define cJSON_IsReference 256
|
||||||
|
#define cJSON_StringIsConst 512
|
||||||
|
|
||||||
|
/* The cJSON structure: */
|
||||||
|
typedef struct cJSON
|
||||||
|
{
|
||||||
|
/* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
|
||||||
|
struct cJSON *next;
|
||||||
|
struct cJSON *prev;
|
||||||
|
/* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
|
||||||
|
struct cJSON *child;
|
||||||
|
|
||||||
|
/* The type of the item, as above. */
|
||||||
|
int type;
|
||||||
|
|
||||||
|
/* The item's string, if type==cJSON_String and type == cJSON_Raw */
|
||||||
|
char *valuestring;
|
||||||
|
/* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
|
||||||
|
int valueint;
|
||||||
|
/* The item's number, if type==cJSON_Number */
|
||||||
|
double valuedouble;
|
||||||
|
|
||||||
|
/* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
|
||||||
|
char *string;
|
||||||
|
} cJSON;
|
||||||
|
|
||||||
|
typedef struct cJSON_Hooks
|
||||||
|
{
|
||||||
|
/* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
|
||||||
|
void *(CJSON_CDECL *malloc_fn)(size_t sz);
|
||||||
|
void (CJSON_CDECL *free_fn)(void *ptr);
|
||||||
|
} cJSON_Hooks;
|
||||||
|
|
||||||
|
typedef int cJSON_bool;
|
||||||
|
|
||||||
|
/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
|
||||||
|
* This is to prevent stack overflows. */
|
||||||
|
#ifndef CJSON_NESTING_LIMIT
|
||||||
|
#define CJSON_NESTING_LIMIT 1000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Limits the length of circular references can be before cJSON rejects to parse them.
|
||||||
|
* This is to prevent stack overflows. */
|
||||||
|
#ifndef CJSON_CIRCULAR_LIMIT
|
||||||
|
#define CJSON_CIRCULAR_LIMIT 10000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* returns the version of cJSON as a string */
|
||||||
|
CJSON_PUBLIC(const char*) cJSON_Version(void);
|
||||||
|
|
||||||
|
/* Supply malloc, realloc and free functions to cJSON */
|
||||||
|
CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
|
||||||
|
|
||||||
|
/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
|
||||||
|
/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length);
|
||||||
|
/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
|
||||||
|
/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated);
|
||||||
|
|
||||||
|
/* Render a cJSON entity to text for transfer/storage. */
|
||||||
|
CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
|
||||||
|
/* Render a cJSON entity to text for transfer/storage without any formatting. */
|
||||||
|
CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
|
||||||
|
/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
|
||||||
|
CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
|
||||||
|
/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
|
||||||
|
/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
|
||||||
|
/* Delete a cJSON entity and all subentities. */
|
||||||
|
CJSON_PUBLIC(void) cJSON_Delete(cJSON *item);
|
||||||
|
|
||||||
|
/* Returns the number of items in an array (or object). */
|
||||||
|
CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
|
||||||
|
/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
|
||||||
|
/* Get item "string" from object. Case insensitive. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
|
||||||
|
/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
|
||||||
|
CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
|
||||||
|
|
||||||
|
/* Check item type and return its value */
|
||||||
|
CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item);
|
||||||
|
|
||||||
|
/* These functions check the type of an item */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
|
||||||
|
|
||||||
|
/* These calls create a cJSON item of the appropriate type. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
|
||||||
|
/* raw json */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
|
||||||
|
|
||||||
|
/* Create a string where valuestring references a string so
|
||||||
|
* it will not be freed by cJSON_Delete */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
|
||||||
|
/* Create an object/array that only references it's elements so
|
||||||
|
* they will not be freed by cJSON_Delete */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
|
||||||
|
|
||||||
|
/* These utilities create an Array of count items.
|
||||||
|
* The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count);
|
||||||
|
|
||||||
|
/* Append item to the specified array/object. */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
|
||||||
|
/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
|
||||||
|
* WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
|
||||||
|
* writing to `item->string` */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
|
||||||
|
/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
|
||||||
|
|
||||||
|
/* Remove/Detach items from Arrays/Objects. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
|
||||||
|
CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
|
||||||
|
CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
|
||||||
|
CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
|
||||||
|
|
||||||
|
/* Update array items. */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
|
||||||
|
|
||||||
|
/* Duplicate a cJSON item */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
|
||||||
|
/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
|
||||||
|
* need to be released. With recurse!=0, it will duplicate any children connected to the item.
|
||||||
|
* The item->next and ->prev pointers are always zero on return from Duplicate. */
|
||||||
|
/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
|
||||||
|
* case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
|
||||||
|
|
||||||
|
/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings.
|
||||||
|
* The input pointer json cannot point to a read-only address area, such as a string constant,
|
||||||
|
* but should point to a readable and writable address area. */
|
||||||
|
CJSON_PUBLIC(void) cJSON_Minify(char *json);
|
||||||
|
|
||||||
|
/* Helper functions for creating and adding items to an object at the same time.
|
||||||
|
* They return the added item or NULL on failure. */
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
|
||||||
|
|
||||||
|
/* When assigning an integer value, it needs to be propagated to valuedouble too. */
|
||||||
|
#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
|
||||||
|
/* helper for the cJSON_SetNumberValue macro */
|
||||||
|
CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
|
||||||
|
#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
|
||||||
|
/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
|
||||||
|
CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
|
||||||
|
|
||||||
|
/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/
|
||||||
|
#define cJSON_SetBoolValue(object, boolValue) ( \
|
||||||
|
(object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \
|
||||||
|
(object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \
|
||||||
|
cJSON_Invalid\
|
||||||
|
)
|
||||||
|
|
||||||
|
/* Macro for iterating over an array or object */
|
||||||
|
#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
|
||||||
|
|
||||||
|
/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
|
||||||
|
CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
|
||||||
|
CJSON_PUBLIC(void) cJSON_free(void *object);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
+513
@@ -0,0 +1,513 @@
|
|||||||
|
#include <stdio.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "cJSON.h"
|
||||||
|
#include "../url.h"
|
||||||
|
|
||||||
|
#define BLACK "\033[1;30m"
|
||||||
|
#define RED "\033[1;31m"
|
||||||
|
#define GREEN "\033[1;32m"
|
||||||
|
#define YELLOW "\033[1;33m"
|
||||||
|
#define BLUE "\033[1;34m"
|
||||||
|
#define MAGENTA "\033[1;35m"
|
||||||
|
#define CYAN "\033[1;36m"
|
||||||
|
#define WHITE "\033[1;37m"
|
||||||
|
#define RESET "\033[1;0m"
|
||||||
|
|
||||||
|
static char test_output_buffer[1<<13];
|
||||||
|
static int test_output_buffer_used = 0;
|
||||||
|
|
||||||
|
void test_printf(char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list args;
|
||||||
|
va_start(args, fmt);
|
||||||
|
int len = vsnprintf(
|
||||||
|
test_output_buffer + test_output_buffer_used,
|
||||||
|
sizeof(test_output_buffer) - test_output_buffer_used,
|
||||||
|
fmt, args);
|
||||||
|
va_end(args);
|
||||||
|
test_output_buffer_used += len;
|
||||||
|
}
|
||||||
|
|
||||||
|
void test_print_str(URL_String str)
|
||||||
|
{
|
||||||
|
bool last_char_was_unprintable = false;
|
||||||
|
for (int i = 0; i < str.len; i++) {
|
||||||
|
|
||||||
|
uint8_t c = (uint8_t) str.ptr[i];
|
||||||
|
if (c > 32 && c <= 127) {
|
||||||
|
if (last_char_was_unprintable)
|
||||||
|
test_printf(" ");
|
||||||
|
test_printf("%c", c);
|
||||||
|
last_char_was_unprintable = false;
|
||||||
|
} else {
|
||||||
|
test_printf(" ");
|
||||||
|
if (c == '\t') {
|
||||||
|
test_printf(YELLOW"\\t"RESET);
|
||||||
|
} else if (c == '\n') {
|
||||||
|
test_printf(YELLOW"\\n"RESET);
|
||||||
|
} else if (c == '\r') {
|
||||||
|
test_printf(YELLOW"\\r"RESET);
|
||||||
|
} else if (c == ' ') {
|
||||||
|
test_printf(YELLOW"SP"RESET);
|
||||||
|
} else {
|
||||||
|
static const char table[] = "0123456789abcdef";
|
||||||
|
test_printf(YELLOW"%c%c"RESET, table[c >> 4], table[c & 0xF]);
|
||||||
|
}
|
||||||
|
last_char_was_unprintable = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int get_string_field(cJSON *json, char *key, URL_String *out)
|
||||||
|
{
|
||||||
|
cJSON *child = cJSON_GetObjectItemCaseSensitive(json, key);
|
||||||
|
if (child == NULL || !cJSON_IsString(child))
|
||||||
|
return -1;
|
||||||
|
*out = (URL_String) {
|
||||||
|
child->valuestring,
|
||||||
|
strlen(child->valuestring)
|
||||||
|
};
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_nested_json_dump(cJSON *json)
|
||||||
|
{
|
||||||
|
if (cJSON_IsString(json)) {
|
||||||
|
test_printf("\"%s\"", json->valuestring);
|
||||||
|
} else if (cJSON_IsFalse(json)) {
|
||||||
|
test_printf("false");
|
||||||
|
} else if (cJSON_IsTrue(json)) {
|
||||||
|
test_printf("true");
|
||||||
|
} else if (cJSON_IsNull(json)) {
|
||||||
|
test_printf("null");
|
||||||
|
} else if (cJSON_IsNumber(json)) {
|
||||||
|
test_printf("%f", json->valuedouble);
|
||||||
|
} else if (cJSON_IsArray(json)) {
|
||||||
|
test_printf("[ ... ]");
|
||||||
|
} else if (cJSON_IsObject(json)) {
|
||||||
|
test_printf("{ ... }");
|
||||||
|
} else {
|
||||||
|
test_printf("???");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_json_dump(cJSON *json)
|
||||||
|
{
|
||||||
|
if (!cJSON_IsObject(json)) {
|
||||||
|
test_printf(YELLOW" ");
|
||||||
|
test_nested_json_dump(json);
|
||||||
|
test_printf("\n"RESET);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
test_printf(YELLOW" {\n");
|
||||||
|
|
||||||
|
cJSON *child = json->child;
|
||||||
|
while (child) {
|
||||||
|
test_printf(" \"%s\": ", child->string);
|
||||||
|
test_nested_json_dump(child);
|
||||||
|
child = child->next;
|
||||||
|
if (child)
|
||||||
|
test_printf(",");
|
||||||
|
test_printf("\n");
|
||||||
|
}
|
||||||
|
test_printf(" }\n"RESET);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int json_to_url(cJSON *json, URL *url)
|
||||||
|
{
|
||||||
|
// TODO: Only a subset of fields is set here
|
||||||
|
|
||||||
|
if (get_string_field(json, "protocol", &url->scheme) < 0) {
|
||||||
|
test_printf(" JSON object field \"protocol\" is missing or is not a string:\n\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (get_string_field(json, "username", &url->username) < 0) {
|
||||||
|
test_printf(" JSON object field \"username\" is missing or is not a string:\n\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (get_string_field(json, "password", &url->password) < 0) {
|
||||||
|
test_printf(" JSON object field \"password\" is missing or is not a string:\n\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (get_string_field(json, "hostname", &url->host_text) < 0) {
|
||||||
|
test_printf(" JSON object field \"hostname\" is missing or is not a string:\n\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
URL_String port;
|
||||||
|
if (get_string_field(json, "port", &port) < 0) {
|
||||||
|
test_printf(" JSON object field \"port\" is missing or is not a string:\n\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (get_string_field(json, "pathname", &url->path) < 0) {
|
||||||
|
test_printf(" JSON object field \"pathname\" is missing or is not a string:\n\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (get_string_field(json, "search", &url->query) < 0) {
|
||||||
|
test_printf(" JSON object field \"search\" is missing or is not a string:\n\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (get_string_field(json, "hash", &url->fragment) < 0) {
|
||||||
|
test_printf(" JSON object field \"hash\" is missing or is not a string:\n\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (url->scheme.len > 0) {
|
||||||
|
if (url->scheme.ptr[url->scheme.len-1] != ':') {
|
||||||
|
test_printf(" JSON object's scheme field doesn't end with ':' as expected\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
url->scheme.len--;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (url->query.len > 0) {
|
||||||
|
if (url->query.ptr[0] != '?') {
|
||||||
|
test_printf(" JSON object's query field doesn't start with '?' as expected\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
url->query.ptr++;
|
||||||
|
url->query.len--;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (url->fragment.len > 0) {
|
||||||
|
if (url->fragment.ptr[0] != '#') {
|
||||||
|
test_printf(" JSON object's fragment field doesn't start with '#' as expected\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
url->fragment.ptr++;
|
||||||
|
url->fragment.len--;
|
||||||
|
}
|
||||||
|
|
||||||
|
char tmp[8];
|
||||||
|
if (port.len >= (int) sizeof(tmp)) {
|
||||||
|
test_printf(" JSON object's port field is longer than expected\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
memcpy(tmp, port.ptr, port.len);
|
||||||
|
tmp[port.len] = 0;
|
||||||
|
|
||||||
|
url->port = atoi(tmp);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool streq(URL_String a, URL_String b)
|
||||||
|
{
|
||||||
|
if (a.len != b.len)
|
||||||
|
return false;
|
||||||
|
return !memcmp(a.ptr, b.ptr, a.len);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int compare_urls(URL url_1, URL url_2, char *label_1, char *label_2)
|
||||||
|
{
|
||||||
|
#define UNPACK(s) (s).len, (s).ptr
|
||||||
|
|
||||||
|
bool ok = true;
|
||||||
|
|
||||||
|
if (!streq(url_1.scheme, url_2.scheme)) {
|
||||||
|
if (ok) test_printf("\n");
|
||||||
|
test_printf(" scheme mismatch\n");
|
||||||
|
test_printf(" %s [%.*s]\n", label_1, UNPACK(url_1.scheme));
|
||||||
|
test_printf(" %s [%.*s]\n", label_2, UNPACK(url_2.scheme));
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!streq(url_1.username, url_2.username)) {
|
||||||
|
if (ok) test_printf("\n");
|
||||||
|
test_printf(" username mismatch\n");
|
||||||
|
test_printf(" %s [%.*s]\n", label_1, UNPACK(url_1.username));
|
||||||
|
test_printf(" %s [%.*s]\n", label_2, UNPACK(url_2.username));
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!streq(url_1.password, url_2.password)) {
|
||||||
|
if (ok) test_printf("\n");
|
||||||
|
test_printf(" password mismatch\n");
|
||||||
|
test_printf(" %s [%.*s]\n", label_1, UNPACK(url_1.password));
|
||||||
|
test_printf(" %s [%.*s]\n", label_2, UNPACK(url_2.password));
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!streq(url_1.host_text, url_2.host_text)) {
|
||||||
|
if (ok) test_printf("\n");
|
||||||
|
test_printf(" host mismatch\n");
|
||||||
|
test_printf(" %s [%.*s]\n", label_1, UNPACK(url_1.host_text));
|
||||||
|
test_printf(" %s [%.*s]\n", label_2, UNPACK(url_2.host_text));
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (url_1.port != url_2.port) {
|
||||||
|
if (ok) test_printf("\n");
|
||||||
|
test_printf(" port mismatch\n");
|
||||||
|
test_printf(" %s [%d]\n", label_1, url_1.port);
|
||||||
|
test_printf(" %s [%d]\n", label_2, url_2.port);
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!streq(url_1.path, url_2.path)) {
|
||||||
|
if (ok) test_printf("\n");
|
||||||
|
test_printf(" path mismatch\n");
|
||||||
|
test_printf(" %s [%.*s]\n", label_1, UNPACK(url_1.path));
|
||||||
|
test_printf(" %s [%.*s]\n", label_2, UNPACK(url_2.path));
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!streq(url_1.query, url_2.query)) {
|
||||||
|
if (ok) test_printf("\n");
|
||||||
|
test_printf(" query mismatch\n");
|
||||||
|
test_printf(" %s [%.*s]\n", label_1, UNPACK(url_1.query));
|
||||||
|
test_printf(" %s [%.*s]\n", label_2, UNPACK(url_2.query));
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!streq(url_1.fragment, url_2.fragment)) {
|
||||||
|
if (ok) test_printf("\n");
|
||||||
|
test_printf(" fragment mismatch\n");
|
||||||
|
test_printf(" %s [%.*s]\n", label_1, UNPACK(url_1.fragment));
|
||||||
|
test_printf(" %s [%.*s]\n", label_2, UNPACK(url_2.fragment));
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (int) (ok ? 1 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int run_test(cJSON *json)
|
||||||
|
{
|
||||||
|
cJSON *json_input = cJSON_GetObjectItemCaseSensitive(json, "input");
|
||||||
|
if (json_input == NULL || !cJSON_IsString(json_input)) {
|
||||||
|
test_printf(" JSON obect is missing the \"input\" field or it's not a string:\n");
|
||||||
|
test_printf("\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
URL_String src = { json_input->valuestring, strlen(json_input->valuestring) };
|
||||||
|
|
||||||
|
cJSON *json_base = cJSON_GetObjectItemCaseSensitive(json, "base");
|
||||||
|
if (json_base == NULL) {
|
||||||
|
test_printf(" JSON obect is missing the \"base\" field:\n");
|
||||||
|
test_printf("\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int ret;
|
||||||
|
char buf[1<<10];
|
||||||
|
URL parsed;
|
||||||
|
if (cJSON_IsNull(json_base)) {
|
||||||
|
ret = url_parse(src.ptr, src.len, NULL, false, &parsed);
|
||||||
|
} else {
|
||||||
|
if (!cJSON_IsString(json_base)) {
|
||||||
|
test_printf(" JSON object field \"base\" is not a string or null:\n");
|
||||||
|
test_printf("\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
URL_String base = { json_base->valuestring, strlen(json_base->valuestring) };
|
||||||
|
|
||||||
|
URL parsed_base;
|
||||||
|
ret = url_parse(base.ptr, base.len, NULL, false, &parsed_base);
|
||||||
|
if (ret < 0) {
|
||||||
|
test_printf("\n");
|
||||||
|
test_printf(" JSON object has an invalid \"base\" field:\n");
|
||||||
|
test_printf(" base: ");
|
||||||
|
test_print_str(base);
|
||||||
|
test_printf("\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
assert(ret == 0);
|
||||||
|
|
||||||
|
ret = url_resolve_reference(src.ptr, src.len, NULL, &parsed_base, false, buf, (int) sizeof(buf));
|
||||||
|
if (ret >= (int) sizeof(buf)) {
|
||||||
|
test_printf("\n");
|
||||||
|
test_printf(" Resolve relative reference is too long for the static buffer\n");
|
||||||
|
test_printf(" base: ");
|
||||||
|
test_print_str(base);
|
||||||
|
test_printf("\n");
|
||||||
|
test_printf(" input: ");
|
||||||
|
test_print_str(src);
|
||||||
|
test_printf("\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ret > -1)
|
||||||
|
ret = url_parse(buf, ret, NULL, false, &parsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Failing test cases have a "failure: true" field
|
||||||
|
cJSON *failure = cJSON_GetObjectItemCaseSensitive(json, "failure");
|
||||||
|
if (failure != NULL) {
|
||||||
|
// If a failure field is present, we expect it to be true
|
||||||
|
if (!cJSON_IsTrue(failure)) {
|
||||||
|
test_printf("\n");
|
||||||
|
test_printf(" JSON object has the \"failure\" field but it's not \"true\"\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (failure == NULL) {
|
||||||
|
|
||||||
|
if (ret < 0) {
|
||||||
|
test_printf("\n");
|
||||||
|
test_printf(" Parsing was expected to succede but failed\n");
|
||||||
|
test_printf(" input: ");
|
||||||
|
test_print_str(src);
|
||||||
|
test_printf("\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
URL expected;
|
||||||
|
if (json_to_url(json, &expected) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (!compare_urls(parsed, expected, "parsed", "expected")) {
|
||||||
|
test_printf(" input: ");
|
||||||
|
test_print_str(src);
|
||||||
|
test_printf("\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
test_printf(" ");
|
||||||
|
test_print_str(src);
|
||||||
|
test_printf("\n");
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if (ret == 0) {
|
||||||
|
test_printf("\n");
|
||||||
|
test_printf(" Parsing was expected to fail but succeded\n");
|
||||||
|
test_printf("\n");
|
||||||
|
test_json_dump(json);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if (ret != -1) {
|
||||||
|
test_printf("\n");
|
||||||
|
test_printf(" Was expected a return value of -1 on error but %d was returned\n", ret);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
test_printf("\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *load_file(char *path)
|
||||||
|
{
|
||||||
|
FILE *fp = fopen(path, "rb");
|
||||||
|
if (fp == NULL)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
fseek(fp, 0, SEEK_END);
|
||||||
|
long len = ftell(fp);
|
||||||
|
fseek(fp, 0, SEEK_SET);
|
||||||
|
|
||||||
|
char *buf = malloc(len+1);
|
||||||
|
if (buf == NULL) {
|
||||||
|
fclose(fp);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
fread(buf, 1, len+1, fp);
|
||||||
|
if (ferror(fp) || !feof(fp)) {
|
||||||
|
free(buf);
|
||||||
|
fclose(fp);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
fclose(fp);
|
||||||
|
buf[len] = '\0';
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
char *path = "data/urltestdata.json";
|
||||||
|
char *buf = load_file(path);
|
||||||
|
if (buf == NULL) {
|
||||||
|
fprintf(stderr, "Error: Couldn't open %s\n", path);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
cJSON *root = cJSON_Parse(buf);
|
||||||
|
if (root == NULL) {
|
||||||
|
fprintf(stderr, "Error: %s doesn't contain valid JSON", path);
|
||||||
|
free(buf);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!cJSON_IsArray(root)) {
|
||||||
|
fprintf(stderr, "Error: %s doesn't contain a JSON array as expected", path);
|
||||||
|
free(buf);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int num_failed = 0;
|
||||||
|
int num_passed = 0;
|
||||||
|
int num_aborted = 0;
|
||||||
|
int num_tests = 0;
|
||||||
|
int last_test_result = 0;
|
||||||
|
for (cJSON *child = root->child; child;
|
||||||
|
child = child->next) {
|
||||||
|
|
||||||
|
if (!cJSON_IsObject(child))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
test_output_buffer_used = 0;
|
||||||
|
|
||||||
|
int ret = run_test(child);
|
||||||
|
switch (ret) {
|
||||||
|
case 0:
|
||||||
|
printf("\n");
|
||||||
|
printf(RED"Test %d: FAILED"RESET, num_tests);
|
||||||
|
num_failed++;
|
||||||
|
// Test failed
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
if (last_test_result != 1)
|
||||||
|
printf("\n");
|
||||||
|
printf(GREEN"Test %d: PASSED"RESET, num_tests);
|
||||||
|
num_passed++;
|
||||||
|
// Test passed
|
||||||
|
break;
|
||||||
|
case -1:
|
||||||
|
printf("\n");
|
||||||
|
printf(MAGENTA"Test %d: ABORTED"RESET, num_tests);
|
||||||
|
num_aborted++;
|
||||||
|
// Test aborted
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Unreachable
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
last_test_result = ret;
|
||||||
|
num_tests++;
|
||||||
|
fwrite(test_output_buffer, 1, test_output_buffer_used, stdout);
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Results:\n");
|
||||||
|
printf(" passed : %d\n", num_passed);
|
||||||
|
printf(" failed : %d\n", num_failed);
|
||||||
|
printf(" aborted: %d\n", num_aborted);
|
||||||
|
|
||||||
|
free(buf);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
# The 3-Clause BSD License
|
||||||
|
|
||||||
|
Copyright © web-platform-tests contributors
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
||||||
|
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||||
|
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -443,7 +443,7 @@ int url_parse(char *src, int len, int *pcur, URL *out)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!is_ipv4) {
|
if (!is_ipv4) {
|
||||||
if (cur < len && (is_reg_name(src[cur]) || is_percent_encoded(src, len, cur))) {
|
if (cur < len && (is_reg_name(src[cur]) || is_percent_encoded(src, len, cur) == 1)) {
|
||||||
|
|
||||||
int ret = is_percent_encoded(src, len, cur);
|
int ret = is_percent_encoded(src, len, cur);
|
||||||
ASSERT(ret >= 0);
|
ASSERT(ret >= 0);
|
||||||
|
|||||||
Reference in New Issue
Block a user