loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Add server URL without variables to the test spec (#7517)

Browse Source 
* add server url without variables to the test spec

* fix php tests

* fix tests

* fix assertion
This commit is contained in:
William Cheng
2020-09-28 22:06:42 +08:00
committed by GitHub
parent 785cbbbb63
commit d7dfcc20c0
16 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
View File

@@ -1135,6 +1135,8 @@ servers:
- 'v1'
- 'v2'
default: 'v2'
- url: https://127.0.0.1/no_variable
description: The local server without variables
components:
requestBodies:
UserArray:

2
modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
View File

@@ -1120,6 +1120,8 @@ servers:
- 'v1'
- 'v2'
default: 'v2'
- url: https://127.0.0.1/no_variable
description: The local server without variables
components:
requestBodies:
UserArray:

2
modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
View File

@@ -1142,6 +1142,8 @@ servers:
- 'v1'
- 'v2'
default: 'v2'
- url: https://127.0.0.1/no_varaible
description: The local server without variables
components:
requestBodies:
UserArray:

6
samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
View File

@@ -167,6 +167,12 @@ namespace Org.OpenAPITools.Client
}
}
}
},
{
new Dictionary<string, object> {
{"url", "https://127.0.0.1/no_variable"},
{"description", "The local server without variables"},
}
}
};

6
samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
View File

@@ -172,6 +172,12 @@ namespace Org.OpenAPITools.Client
}
}
}
},
{
new Dictionary<string, object> {
{"url", "https://127.0.0.1/no_variable"},
{"description", "The local server without variables"},
}
}
};

4
samples/client/petstore/javascript-es6/src/ApiClient.js
View File

@@ -615,6 +615,10 @@ class ApiClient {
]
}
}
},
{
'url': "https://127.0.0.1/no_varaible",
'description': "The local server without variables",
}
];
}

4
samples/client/petstore/javascript-promise-es6/src/ApiClient.js
View File

@@ -616,6 +616,10 @@ class ApiClient {
]
}
}
},
{
'url': "https://127.0.0.1/no_varaible",
'description': "The local server without variables",
}
];
}

4
samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
View File

@@ -474,6 +474,10 @@ class Configuration
]
]
]
],
[
"url" => "https://127.0.0.1/no_varaible",
"description" => "The local server without variables",
]
];
}

8
samples/client/petstore/php/OpenAPIClient-php/tests/ConfigurationTest.php
View File

@@ -15,7 +15,7 @@ class ConfigurationTest extends TestCase
$config = new Configuration();
$servers = $config->getHostSettings();
$this->assertCount(2, $servers);
$this->assertCount(3, $servers);
$this->assertSame("http://{server}.swagger.io:{port}/v2", $servers[0]["url"]);
$this->assertSame("petstore", $servers[0]["variables"]["server"]["default_value"]);
$this->assertSame("80", $servers[0]["variables"]["port"]["default_value"]);
@@ -47,13 +47,13 @@ class ConfigurationTest extends TestCase
public function testInvalidIndex()
{
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid index 2 when selecting the host. Must be less than 2');
$this->expectExceptionMessage('Invalid index 3 when selecting the host. Must be less than 3');
$config = new Configuration();
$url = $config->getHostFromSettings(2);
$url = $config->getHostFromSettings(3);
}
/**
* Test host settings with invalid vaues
* Test host settings with invalid values
*/
public function testHostUrlWithInvalidValues()
{

4
samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb
View File

@@ -286,6 +286,10 @@ module Petstore
]
}
}
},
{
url: "https://127.0.0.1/no_varaible",
description: "The local server without variables",
}
]
end

4
samples/client/petstore/ruby/lib/petstore/configuration.rb
View File

@@ -291,6 +291,10 @@ module Petstore
]
}
}
},
{
url: "https://127.0.0.1/no_varaible",
description: "The local server without variables",
}
]
end

2
samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
View File

@@ -31,6 +31,8 @@ servers:
enum:
- v1
- v2
- description: The local server without variables
url: https://127.0.0.1/no_variable
tags:
- description: Everything about your Pets
name: pet

4
samples/openapi3/client/petstore/go/go-petstore/configuration.go
View File

@@ -141,6 +141,10 @@ func NewConfiguration() *Configuration {
},
},
},
{
URL: "https://127.0.0.1/no_variable",
Description: "The local server without variables",
},
},
OperationServers: map[string]ServerConfigurations{
"PetApiService.AddPet": {

2
samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml
View File

@@ -31,6 +31,8 @@ servers:
enum:
- v1
- v2
- description: The local server without variables
url: https://127.0.0.1/no_variable
tags:
- description: Everything about your Pets
name: pet

5
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -116,6 +116,11 @@ public class ApiClient extends JavaTimeFormatter {
)
));
}}
),
new ServerConfiguration(
"https://127.0.0.1/no_variable",
"The local server without variables",
new HashMap<String, ServerVariable>()
)
));
protected Integer serverIndex = 0;

4
samples/openapi3/client/petstore/python/petstore_api/configuration.py
View File

@@ -556,6 +556,10 @@ conf = petstore_api.Configuration(
]
}
}
},
{
'url': "https://127.0.0.1/no_varaible",
'description': "The local server without variables",
}
]