Skip to content

[Python] improve test and better wording for incorrect enum value #3309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
Jul 6, 2016
Merged

[Python] improve test and better wording for incorrect enum value #3309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/swagger-codegen/src/main/resources/python/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ class {{classname}}(object):
"""
{{#isEnum}}
allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
if {{name}} not in allowed_values:
if {{{name}}} not in allowed_values:
raise ValueError(
"Invalid value for `{{name}}`, must be one of {0}"
.format(allowed_values)
"Invalid value for `{{{name}}}` ({0}), must be one of {1}"
.format({{{name}}}, allowed_values)
)
{{/isEnum}}
{{^isEnum}}
Expand Down Expand Up @@ -152,4 +152,4 @@ class {{classname}}(object):
"""
return not self == other
{{/model}}
{{/models}}
{{/models}}
14 changes: 7 additions & 7 deletions samples/client/petstore/python/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://

- API version: 1.0.0
- Package version: 1.0.0
- Build date: 2016-07-05T10:32:24.684-04:00
- Build date: 2016-07-06T16:27:27.842+08:00
- Build package: class io.swagger.codegen.languages.PythonClientCodegen

## Requirements.
Expand Down Expand Up @@ -136,6 +136,12 @@ Class | Method | HTTP request | Description
## Documentation For Authorization


## api_key

- **Type**: API key
- **API key parameter name**: api_key
- **Location**: HTTP header

## petstore_auth

- **Type**: OAuth
Expand All @@ -145,12 +151,6 @@ Class | Method | HTTP request | Description
- **write:pets**: modify pets in your account
- **read:pets**: read your pets

## api_key

- **Type**: API key
- **API key parameter name**: api_key
- **Location**: HTTP header


## Author

Expand Down
14 changes: 7 additions & 7 deletions samples/client/petstore/python/petstore_api/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,13 @@ def auth_settings(self):
:return: The Auth Settings information dict.
"""
return {
'api_key':
{
'type': 'api_key',
'in': 'header',
'key': 'api_key',
'value': self.get_api_key_with_prefix('api_key')
},

'petstore_auth':
{
Expand All @@ -229,13 +236,6 @@ def auth_settings(self):
'key': 'Authorization',
'value': 'Bearer ' + self.access_token
},
'api_key':
{
'type': 'api_key',
'in': 'header',
'key': 'api_key',
'value': self.get_api_key_with_prefix('api_key')
},

}

Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/python/petstore_api/models/enum_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ def enum_string(self, enum_string):
allowed_values = ["UPPER", "lower"]
if enum_string not in allowed_values:
raise ValueError(
"Invalid value for `enum_string`, must be one of {0}"
.format(allowed_values)
"Invalid value for `enum_string` ({0}), must be one of {1}"
.format(enum_string, allowed_values)
)

self._enum_string = enum_string
Expand Down Expand Up @@ -109,8 +109,8 @@ def enum_integer(self, enum_integer):
allowed_values = ["1", "-1"]
if enum_integer not in allowed_values:
raise ValueError(
"Invalid value for `enum_integer`, must be one of {0}"
.format(allowed_values)
"Invalid value for `enum_integer` ({0}), must be one of {1}"
.format(enum_integer, allowed_values)
)

self._enum_integer = enum_integer
Expand Down Expand Up @@ -138,8 +138,8 @@ def enum_number(self, enum_number):
allowed_values = ["1.1", "-1.2"]
if enum_number not in allowed_values:
raise ValueError(
"Invalid value for `enum_number`, must be one of {0}"
.format(allowed_values)
"Invalid value for `enum_number` ({0}), must be one of {1}"
.format(enum_number, allowed_values)
)

self._enum_number = enum_number
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/python/petstore_api/models/map_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ def map_of_enum_string(self, map_of_enum_string):
allowed_values = []
if map_of_enum_string not in allowed_values:
raise ValueError(
"Invalid value for `map_of_enum_string`, must be one of {0}"
.format(allowed_values)
"Invalid value for `map_of_enum_string` ({0}), must be one of {1}"
.format(map_of_enum_string, allowed_values)
)

self._map_of_enum_string = map_of_enum_string
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/python/petstore_api/models/order.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ def status(self, status):
allowed_values = ["placed", "approved", "delivered"]
if status not in allowed_values:
raise ValueError(
"Invalid value for `status`, must be one of {0}"
.format(allowed_values)
"Invalid value for `status` ({0}), must be one of {1}"
.format(status, allowed_values)
)

self._status = status
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/python/petstore_api/models/pet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ def status(self, status):
allowed_values = ["available", "pending", "sold"]
if status not in allowed_values:
raise ValueError(
"Invalid value for `status`, must be one of {0}"
.format(allowed_values)
"Invalid value for `status` ({0}), must be one of {1}"
.format(status, allowed_values)
)

self._status = status
Expand Down
3 changes: 3 additions & 0 deletions samples/client/petstore/python/test_python2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ SETUP_OUT=*.egg-info
VENV=.venv
DEACTIVE=false

export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8

### set virtualenv
if [ -z "$VIRTUAL_ENV" ]; then
virtualenv $VENV --no-site-packages --always-copy
Expand Down
3 changes: 3 additions & 0 deletions samples/client/petstore/python/test_python2_and_3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ SETUP_OUT=*.egg-info
VENV=.venv
DEACTIVE=false

export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8

### set virtualenv
if [ -z "$VIRTUAL_ENV" ]; then
virtualenv $VENV --no-site-packages --always-copy
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/python/tests/test_pet_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ def test_find_pets_by_status(self):
list(map(lambda x: getattr(x, 'id'), self.pet_api.find_pets_by_status(status=[self.pet.status])))
)

@unittest.skip("skipping the test as the method sometimes invalid Petstore object with incorrect status")
def test_find_pets_by_tags(self):
self.pet_api.add_pet(body=self.pet)

Expand Down