Skip to content

Commit 9efb96a

Browse files
ishaileshmishraishaileshmishra
committed
🪴 clean tests
1 parent 15e81cf commit 9efb96a

File tree

5 files changed

+122
-112
lines changed

5 files changed

+122
-112
lines changed

‎tests/test_assets.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,53 @@
11
import unittest
22

3+
from urllib3 import Retry
34
import config
45
import contentstack
56
from contentstack.basequery import QueryOperation
67

8+
global ASSET_UID
79
IMAGE = 'images_(1).jpg'
10+
API_KEY = config.APIKEY
11+
DELIVERY_TOKEN = config.DELIVERYTOKEN
12+
ENVIRONMENT = config.ENVIRONMENT
13+
HOST = config.HOST
814

915

1016
class TestAsset(unittest.TestCase):
11-
global asset_uid
1217

1318
def setUp(self):
14-
self.asset_uid = None
1519
self.stack = contentstack.Stack(
16-
config.api_key, config.delivery_token, config.environment, host=config.host)
20+
API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=HOST)
1721
self.asset_query = self.stack.asset_query()
1822

1923
def test_011_setting_timeout(self):
2024
excepted = 13 # setting a custom timeout
21-
self.stack = contentstack.Stack(config.api_key, config.delivery_token, config.environment, host=config.host,
22-
timeout=excepted)
25+
self.stack = contentstack.Stack(
26+
API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=config.host, timeout=excepted)
2327
self.assertEqual(excepted, self.stack.timeout)
2428

2529
def test_12_setting_timeout_failure(self):
2630
try:
2731
excepted = 0.01 # setting a custom timeout
28-
self.stack = contentstack.Stack(config.api_key, config.delivery_token, config.environment, host=config.host,
29-
timeout=excepted)
32+
self.stack = contentstack.Stack(
33+
API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=config.host,timeout=excepted)
3034
self.stack.asset_query().find()
3135
except TimeoutError:
3236
self.assertEqual('Timeout expired.', TimeoutError.__doc__)
3337

3438
def test_013_setting_retry_strategy_unit(self):
35-
from urllib3 import Retry
3639
self.stack = contentstack \
37-
.Stack(config.api_key, config.delivery_token,
38-
config.environment, host=config.host,
40+
.Stack(API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=HOST,
3941
retry_strategy=Retry(total=3, backoff_factor=1, status_forcelist=[408]))
4042
self.assertEqual(1, self.stack.retry_strategy.backoff_factor)
4143
self.assertEqual(3, self.stack.retry_strategy.total)
4244
self.assertEqual([408], self.stack.retry_strategy.status_forcelist)
4345

4446
def test_014_setting_retry_strategy_api(self):
45-
from urllib3 import Retry
46-
self.stack = contentstack.Stack(config.api_key, config.delivery_token,
47-
config.environment, host=config.host,
48-
retry_strategy=Retry(total=5, backoff_factor=0, status_forcelist=[408, 429]))
47+
self.stack = contentstack.Stack(
48+
API_KEY, DELIVERY_TOKEN, ENVIRONMENT,
49+
host=HOST,
50+
retry_strategy=Retry(total=5, backoff_factor=0, status_forcelist=[408, 429]))
4951
self.assertEqual(0, self.stack.retry_strategy.backoff_factor)
5052
self.assertEqual(5, self.stack.retry_strategy.total)
5153
self.assertEqual(
@@ -57,45 +59,43 @@ def test_01_assets_query_initial_run(self):
5759
assets = result['assets']
5860
for item in assets:
5961
if item['title'] == 'if_icon-72-lightning_316154_(1).png':
60-
self.asset_uid = item['uid']
61-
global asset_uid
62-
asset_uid = item['uid']
62+
global ASSET_UID
63+
ASSET_UID = item['uid']
6364
self.assertEqual(8, len(assets))
6465

6566
def test_02_asset_method(self):
66-
self.asset = self.stack.asset(uid=asset_uid)
67+
self.asset = self.stack.asset(uid=ASSET_UID)
6768
result = self.asset.relative_urls().include_dimension().fetch()
6869
if result is not None:
6970
result = result['asset']['dimension']
7071
self.assertEqual({'height': 50, 'width': 50}, result)
7172

72-
def test_03_asset_uid(self):
73-
74-
self.asset = self.stack.asset(uid=asset_uid)
73+
def test_03_ASSET_UID(self):
74+
self.asset = self.stack.asset(uid=ASSET_UID)
7575
result = self.asset.fetch()
7676
if result is not None:
77-
self.assertEqual(asset_uid, result['asset']['uid'])
77+
self.assertEqual(ASSET_UID, result['asset']['uid'])
7878

7979
def test_04_asset_filetype(self):
80-
self.asset = self.stack.asset(uid=asset_uid)
80+
self.asset = self.stack.asset(uid=ASSET_UID)
8181
result = self.asset.fetch()
8282
if result is not None:
8383
self.assertEqual('image/png', result['asset']['content_type'])
8484

8585
def test_05_remove_environment(self):
86-
self.asset = self.stack.asset(uid=asset_uid)
86+
self.asset = self.stack.asset(uid=ASSET_UID)
8787
self.asset.remove_environment()
8888
self.assertEqual(
8989
False, 'environment' in self.asset.http_instance.headers)
9090

9191
def test_06_add_environment(self):
92-
self.asset = self.stack.asset(uid=asset_uid)
92+
self.asset = self.stack.asset(uid=ASSET_UID)
9393
self.asset.environment("dev")
9494
self.assertEqual(
9595
'dev', self.asset.http_instance.headers['environment'])
9696

9797
def test_07_add_param(self):
98-
self.asset = self.stack.asset(uid=asset_uid)
98+
self.asset = self.stack.asset(uid=ASSET_UID)
9999
self.asset.params("paramKey", 'paramValue')
100100
print(self.asset.base_url)
101101

@@ -107,13 +107,13 @@ def test_071_check_none_coverage(self):
107107

108108
def test_072_check_none_coverage_test(self):
109109
try:
110-
self.asset = self.stack.asset(uid=asset_uid)
110+
self.asset = self.stack.asset(uid=ASSET_UID)
111111
self.asset.params(2, 'value')
112112
except Exception as inst:
113113
self.assertEqual('Kindly provide valid params', inst.args[0])
114114

115115
def test_08_support_include_fallback(self):
116-
self.asset = self.stack.asset(uid=asset_uid)
116+
self.asset = self.stack.asset(uid=ASSET_UID)
117117
asset_params = self.asset.include_fallback().asset_params
118118
self.assertEqual({'environment': 'development',
119119
'include_fallback': 'true'}, asset_params)

‎tests/test_entry.py‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,141 +3,141 @@
33
import config
44
import contentstack
55

6-
_uid = 'blt53ca1231625bdde4'
7-
api_key = config.api_key
8-
delivery_token = config.delivery_token
9-
environment = config.environment
10-
env_host = config.host
6+
_UID = 'blt53ca1231625bdde4'
7+
API_KEY = config.APIKEY
8+
DELIVERY_TOKEN = config.DELIVERYTOKEN
9+
ENVIRONMENT = config.ENVIRONMENT
10+
HOST = config.HOST
1111

1212

1313
class TestEntry(unittest.TestCase):
1414

1515
def setUp(self):
16-
self.stack = contentstack.Stack(api_key, delivery_token, environment, host=env_host)
16+
self.stack = contentstack.Stack(API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=HOST)
1717

1818
def test_run_initial_query(self):
1919
query = self.stack.content_type('faq').query()
2020
result = query.find()
21-
global _uid
21+
global _UID
2222
if result is not None:
23-
_uid = result['entries'][0]['uid']
24-
print(f'the uid is: {_uid}')
23+
_UID = result['entries'][0]['uid']
24+
print(f'the uid is: {_UID}')
2525

26-
def test_entry_by_uid(self):
27-
global _uid
28-
entry = self.stack.content_type('faq').entry(_uid)
26+
def test_entry_by_UID(self):
27+
global _UID
28+
entry = self.stack.content_type('faq').entry(_UID)
2929
result = entry.fetch()
3030
if result is not None:
31-
_uid = result['entry']['uid']
32-
self.assertEqual(_uid, result['entry']['uid'])
31+
_UID = result['entry']['uid']
32+
self.assertEqual(_UID, result['entry']['uid'])
3333

3434
def test_03_entry_environment(self):
35-
global _uid
35+
global _UID
3636
entry = self.stack.content_type('faq').entry(
37-
_uid).environment('test')
37+
_UID).environment('test')
3838
self.assertEqual("test", entry.http_instance.headers['environment'])
3939

4040
def test_04_entry_locale(self):
41-
global _uid
42-
entry = self.stack.content_type('faq').entry(_uid).locale('en-ei')
41+
global _UID
42+
entry = self.stack.content_type('faq').entry(_UID).locale('en-ei')
4343
entry.fetch()
4444
self.assertEqual('en-ei', entry.entry_param['locale'])
4545

4646
def test_05_entry_version(self):
47-
global _uid
48-
entry = self.stack.content_type('faq').entry(_uid).version(3)
47+
global _UID
48+
entry = self.stack.content_type('faq').entry(_UID).version(3)
4949
entry.fetch()
5050
self.assertEqual(3, entry.entry_param['version'])
5151

5252
def test_06_entry_params(self):
53-
global _uid
53+
global _UID
5454
entry = self.stack.content_type('faq').entry(
55-
_uid).param('param_key', 'param_value')
55+
_UID).param('param_key', 'param_value')
5656
entry.fetch()
5757
self.assertEqual('param_value', entry.entry_param['param_key'])
5858

5959
def test_07_entry_base_only(self):
60-
global _uid
60+
global _UID
6161
entry = self.stack.content_type(
62-
'faq').entry(_uid).only('field_uid')
62+
'faq').entry(_UID).only('field_UID')
6363
entry.fetch()
6464
self.assertEqual({'environment': 'development',
65-
'only[BASE][]': 'field_uid'}, entry.entry_param)
65+
'only[BASE][]': 'field_UID'}, entry.entry_param)
6666

6767
def test_08_entry_base_excepts(self):
68-
global _uid
68+
global _UID
6969
entry = self.stack.content_type('faq').entry(
70-
_uid).excepts('field_uid')
70+
_UID).excepts('field_UID')
7171
entry.fetch()
7272
self.assertEqual({'environment': 'development',
73-
'except[BASE][]': 'field_uid'}, entry.entry_param)
73+
'except[BASE][]': 'field_UID'}, entry.entry_param)
7474

7575
def test_10_entry_base_include_reference_only(self):
76-
global _uid
77-
entry = self.stack.content_type('faq').entry(_uid).only('field1')
76+
global _UID
77+
entry = self.stack.content_type('faq').entry(_UID).only('field1')
7878
entry.fetch()
7979
self.assertEqual({'environment': 'development', 'only[BASE][]': 'field1'},
8080
entry.entry_param)
8181

8282
def test_11_entry_base_include_reference_excepts(self):
83-
global _uid
83+
global _UID
8484
entry = self.stack.content_type(
85-
'faq').entry(_uid).excepts('field1')
85+
'faq').entry(_UID).excepts('field1')
8686
entry.fetch()
8787
self.assertEqual({'environment': 'development', 'except[BASE][]': 'field1'},
8888
entry.entry_param)
8989

9090
def test_12_entry_include_reference_github_issue(self):
9191
stack_for_products = contentstack.Stack(
92-
"api_key", "delivery_token", "environment")
92+
"API_KEY", "DELIVERY_TOKEN", "ENVIRONMENT")
9393
_entry = stack_for_products.content_type('product').entry("ENTRY_UI").include_reference(
9494
["categories",
9595
"brand"])
9696
response = _entry.fetch()
97-
# print(response)
97+
print(response)
9898
# categories = response['entry']['categories']
9999
# self.assertEqual(2, len(categories))
100100

101101
def test_13_entry_support_include_fallback_unit_test(self):
102-
global _uid
102+
global _UID
103103
entry = self.stack.content_type('faq').entry(
104-
_uid).include_fallback()
104+
_UID).include_fallback()
105105
self.assertEqual(
106106
True, entry.entry_param.__contains__('include_fallback'))
107107

108108
def test_14_entry_queryable_only(self):
109109
try:
110-
entry = self.stack.content_type('faq').entry(_uid).only(4)
110+
entry = self.stack.content_type('faq').entry(_UID).only(4)
111111
result = entry.fetch()
112112
self.assertEqual(None, result['uid'])
113113
except KeyError as e:
114114
if hasattr(e, 'message'):
115-
self.assertEqual("Invalid field_uid provided", e.args[0])
115+
self.assertEqual("Invalid field_UID provided", e.args[0])
116116

117-
def test_15_entry_queryable_excepts(self):
117+
def test_entry_queryable_excepts(self):
118118
try:
119-
entry = self.stack.content_type('faq').entry(_uid).excepts(4)
119+
entry = self.stack.content_type('faq').entry(_UID).excepts(4)
120120
result = entry.fetch()
121121
self.assertEqual(None, result['uid'])
122122
except KeyError as e:
123123
if hasattr(e, 'message'):
124-
self.assertEqual("Invalid field_uid provided", e.args[0])
124+
self.assertEqual("Invalid field_UID provided", e.args[0])
125125

126126
def test_16_entry_queryable_include_content_type(self):
127127
entry = self.stack.content_type('faq').entry(
128-
_uid).include_content_type()
128+
_UID).include_content_type()
129129
self.assertEqual({'include_content_type': 'true', 'include_global_field_schema': 'true'},
130130
entry.entry_queryable_param)
131131

132-
def test_18_entry_queryable_include_reference_content_type_uid(self):
132+
def test_reference_content_type_uid(self):
133133
entry = self.stack.content_type('faq').entry(
134-
_uid).include_reference_content_type_uid()
134+
_UID).include_reference_content_type_uid()
135135
self.assertEqual({'include_reference_content_type_uid': 'true'},
136136
entry.entry_queryable_param)
137137

138138
def test_19_entry_queryable_add_param(self):
139139
entry = self.stack.content_type('faq').entry(
140-
_uid).add_param('cms', 'contentstack')
140+
_UID).add_param('cms', 'contentstack')
141141
self.assertEqual({'cms': 'contentstack'}, entry.entry_queryable_param)
142142

143143
def test_20_entry_include_fallback(self):

0 commit comments

Comments
 (0)