Skip to content

Commit edf27b2

Browse files
updated tests
1 parent 4eb6b57 commit edf27b2

File tree

2 files changed

+99
-99
lines changed

2 files changed

+99
-99
lines changed

Diff for: rer/bandi/tests/test_bando_view.py

+74-74
Original file line numberDiff line numberDiff line change
@@ -12,170 +12,170 @@ class BandoViewTest(unittest.TestCase):
1212
layer = RER_BANDI_INTEGRATION_TESTING
1313

1414
def setUp(self):
15-
self.portal = self.layer['portal']
16-
self.request = self.layer['request']
17-
setRoles(self.portal, TEST_USER_ID, ['Manager'])
15+
self.portal = self.layer["portal"]
16+
self.request = self.layer["request"]
17+
setRoles(self.portal, TEST_USER_ID, ["Manager"])
1818
self.bando = api.content.create(
19-
container=self.portal, type='Bando', title='Bando foo'
19+
container=self.portal, type="Bando", title="Bando foo"
2020
)
2121

2222
def test_bando_views_registered(self):
2323
view = api.content.get_view(
24-
name='bando_view', context=self.bando, request=self.request
24+
name="bando_view", context=self.bando, request=self.request
2525
)
26-
self.assertTrue(view.__name__ == 'bando_view')
26+
self.assertTrue(view.__name__ == "bando_view")
2727

2828
view_right = api.content.get_view(
29-
name='bando_right_view', context=self.bando, request=self.request
29+
name="bando_right_view", context=self.bando, request=self.request
3030
)
31-
self.assertTrue(view_right.__name__ == 'bando_right_view')
31+
self.assertTrue(view_right.__name__ == "bando_right_view")
3232

3333
def test_destinatari_in_view(self):
3434
view = api.content.get_view(
35-
name='bando_view', context=self.bando, request=self.request
35+
name="bando_view", context=self.bando, request=self.request
3636
)
37-
self.assertNotIn('Who can apply', view())
37+
self.assertNotIn("Who can apply", view())
3838

3939
bando_new = api.content.create(
4040
container=self.portal,
41-
type='Bando',
42-
title='Bando new',
43-
destinatari=['foo', 'bar'],
41+
type="Bando",
42+
title="Bando new",
43+
destinatari=["foo", "bar"],
4444
)
4545
view_new = api.content.get_view(
46-
name='bando_view', context=bando_new, request=self.request
46+
name="bando_view", context=bando_new, request=self.request
4747
)
48-
self.assertIn('Who can apply', view_new())
49-
self.assertIn('<li>foo</li>', view_new())
50-
self.assertIn('<li>bar</li>', view_new())
48+
self.assertIn("Who can apply", view_new())
49+
self.assertIn("<li>foo</li>", view_new())
50+
self.assertIn("<li>bar</li>", view_new())
5151

5252
def test_destinatari_in_right_view(self):
5353
view = api.content.get_view(
54-
name='bando_right_view', context=self.bando, request=self.request
54+
name="bando_right_view", context=self.bando, request=self.request
5555
)
56-
self.assertNotIn('Who can apply', view())
56+
self.assertNotIn("Who can apply", view())
5757

5858
bando_new = api.content.create(
5959
container=self.portal,
60-
type='Bando',
61-
title='Bando new',
62-
destinatari=['foo', 'bar'],
60+
type="Bando",
61+
title="Bando new",
62+
destinatari=["foo", "bar"],
6363
)
6464
view_new = api.content.get_view(
65-
name='bando_right_view', context=bando_new, request=self.request
65+
name="bando_right_view", context=bando_new, request=self.request
6666
)
67-
self.assertIn('Who can apply', view_new())
68-
self.assertIn('<li>foo</li>', view_new())
69-
self.assertIn('<li>bar</li>', view_new())
67+
self.assertIn("Who can apply", view_new())
68+
self.assertIn("<li>foo</li>", view_new())
69+
self.assertIn("<li>bar</li>", view_new())
7070

7171
def test_tipologia_bando_in_view(self):
7272
view = api.content.get_view(
73-
name='bando_view', context=self.bando, request=self.request
73+
name="bando_view", context=self.bando, request=self.request
7474
)
7575

7676
# Because it's a required field
77-
self.assertIn('Announcement type', view())
77+
self.assertIn("Announcement type", view())
7878

7979
bando_new = api.content.create(
8080
container=self.portal,
81-
type='Bando',
82-
title='Bando new',
83-
tipologia_bando='Type a',
81+
type="Bando",
82+
title="Bando new",
83+
tipologia_bando="Type a",
8484
)
8585
view_new = api.content.get_view(
86-
name='bando_view', context=bando_new, request=self.request
86+
name="bando_view", context=bando_new, request=self.request
8787
)
88-
self.assertIn('Announcement type', view_new())
89-
self.assertIn('Type a', view_new())
88+
self.assertIn("Announcement type", view_new())
89+
self.assertIn("Type a", view_new())
9090

9191
def test_tipologia_bando_in_right_view(self):
9292
view = api.content.get_view(
93-
name='bando_right_view', context=self.bando, request=self.request
93+
name="bando_right_view", context=self.bando, request=self.request
9494
)
9595

9696
# Because it's a required field
97-
self.assertIn('Announcement type', view())
97+
self.assertIn("Announcement type", view())
9898

9999
bando_new = api.content.create(
100100
container=self.portal,
101-
type='Bando',
102-
title='Bando new',
103-
tipologia_bando='Type a',
101+
type="Bando",
102+
title="Bando new",
103+
tipologia_bando="Type a",
104104
)
105105
view_new = api.content.get_view(
106-
name='bando_right_view', context=bando_new, request=self.request
106+
name="bando_right_view", context=bando_new, request=self.request
107107
)
108-
self.assertIn('Announcement type', view_new())
109-
self.assertIn('Type a', view_new())
108+
self.assertIn("Announcement type", view_new())
109+
self.assertIn("Type a", view_new())
110110

111111
def test_finanziatori_in_view(self):
112112
view = api.content.get_view(
113-
name='bando_view', context=self.bando, request=self.request
113+
name="bando_view", context=self.bando, request=self.request
114114
)
115-
self.assertNotIn('Financed by EU programmes', view())
115+
self.assertNotIn("Financed by EU programmes", view())
116116

117117
bando_new = api.content.create(
118118
container=self.portal,
119-
type='Bando',
120-
title='Bando new',
121-
finanziatori=['Found1', 'Found2'],
119+
type="Bando",
120+
title="Bando new",
121+
finanziato=True,
122122
)
123123
view_new = api.content.get_view(
124-
name='bando_view', context=bando_new, request=self.request
124+
name="bando_view", context=bando_new, request=self.request
125125
)
126-
self.assertIn('Financed by EU programmes', view_new())
127-
self.assertIn('<span>Found1 | Found2</span>', view_new())
126+
self.assertIn("Financed by EU programmes", view_new())
127+
self.assertIn("<span>Found1 | Found2</span>", view_new())
128128

129129
def test_finanziatori_in_right_view(self):
130130
view = api.content.get_view(
131-
name='bando_right_view', context=self.bando, request=self.request
131+
name="bando_right_view", context=self.bando, request=self.request
132132
)
133-
self.assertNotIn('Financed by EU programmes', view())
133+
self.assertNotIn("Financed by EU programmes", view())
134134

135135
bando_new = api.content.create(
136136
container=self.portal,
137-
type='Bando',
138-
title='Bando new',
139-
finanziatori=['Found1', 'Found2'],
137+
type="Bando",
138+
title="Bando new",
139+
finanziato=True,
140140
)
141141
view_new = api.content.get_view(
142-
name='bando_right_view', context=bando_new, request=self.request
142+
name="bando_right_view", context=bando_new, request=self.request
143143
)
144-
self.assertIn('Financed by EU programmes', view_new())
145-
self.assertIn('<span>Found1 | Found2</span>', view_new())
144+
self.assertIn("Financed by EU programmes", view_new())
145+
self.assertIn("<span>Found1 | Found2</span>", view_new())
146146

147147
def test_materie_in_view(self):
148148
view = api.content.get_view(
149-
name='bando_view', context=self.bando, request=self.request
149+
name="bando_view", context=self.bando, request=self.request
150150
)
151-
self.assertNotIn('Topic', view())
151+
self.assertNotIn("Topic", view())
152152

153153
bando_new = api.content.create(
154154
container=self.portal,
155-
type='Bando',
156-
title='Bando new',
157-
materie=['Topic1', 'Topic2'],
155+
type="Bando",
156+
title="Bando new",
157+
materie=["Topic1", "Topic2"],
158158
)
159159
view_new = api.content.get_view(
160-
name='bando_view', context=bando_new, request=self.request
160+
name="bando_view", context=bando_new, request=self.request
161161
)
162-
self.assertIn('Topic', view_new())
163-
self.assertIn('<span>Topic1 | Topic2</span>', view_new())
162+
self.assertIn("Topic", view_new())
163+
self.assertIn("<span>Topic1 | Topic2</span>", view_new())
164164

165165
def test_materie_in_right_view(self):
166166
view = api.content.get_view(
167-
name='bando_right_view', context=self.bando, request=self.request
167+
name="bando_right_view", context=self.bando, request=self.request
168168
)
169-
self.assertNotIn('Topic', view())
169+
self.assertNotIn("Topic", view())
170170

171171
bando_new = api.content.create(
172172
container=self.portal,
173-
type='Bando',
174-
title='Bando new',
175-
materie=['Topic1', 'Topic2'],
173+
type="Bando",
174+
title="Bando new",
175+
materie=["Topic1", "Topic2"],
176176
)
177177
view_new = api.content.get_view(
178-
name='bando_right_view', context=bando_new, request=self.request
178+
name="bando_right_view", context=bando_new, request=self.request
179179
)
180-
self.assertIn('Topic', view_new())
181-
self.assertIn('<span>Topic1 | Topic2</span>', view_new())
180+
self.assertIn("Topic", view_new())
181+
self.assertIn("<span>Topic1 | Topic2</span>", view_new())

Diff for: rer/bandi/tests/test_collection_criteria.py

+25-25
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,40 @@ class TestCollectionCriteria(unittest.TestCase):
1414
layer = RER_BANDI_FUNCTIONAL_TESTING
1515

1616
def setUp(self):
17-
self.portal = self.layer['portal']
18-
self.request = self.layer['request']
19-
setRoles(self.portal, TEST_USER_ID, ['Manager'])
17+
self.portal = self.layer["portal"]
18+
self.request = self.layer["request"]
19+
setRoles(self.portal, TEST_USER_ID, ["Manager"])
2020
login(self.portal, TEST_USER_NAME)
2121
self.collection = api.content.create(
22-
container=self.portal, type='Collection', title='Collection'
22+
container=self.portal, type="Collection", title="Collection"
2323
)
2424
self.bando1 = api.content.create(
2525
container=self.portal,
26-
type='Bando',
27-
title='Bando with destinatari',
28-
destinatari=[u'd1', u'd2', u'dà'],
26+
type="Bando",
27+
title="Bando with destinatari",
28+
destinatari=["d1", "d2", "dà"],
2929
)
3030

3131
self.bando2 = api.content.create(
3232
container=self.portal,
33-
type='Bando',
34-
title='Bando with finanziatori',
35-
finanziatori=['f1'],
33+
type="Bando",
34+
title="Bando with finanziatori",
35+
finanziato=True,
3636
)
3737

3838
self.bando3 = api.content.create(
3939
container=self.portal,
40-
type='Bando',
41-
title='Bando with materie',
42-
materie=['m1', 'm2'],
40+
type="Bando",
41+
title="Bando with materie",
42+
materie=["m1", "m2"],
4343
)
4444

4545
def test_query_destinatari(self):
4646
query = [
4747
{
48-
'i': 'destinatari',
49-
'o': 'plone.app.querystring.operation.string.is',
50-
'v': ['d1'],
48+
"i": "destinatari",
49+
"o": "plone.app.querystring.operation.string.is",
50+
"v": ["d1"],
5151
}
5252
]
5353
self.collection.setQuery(query)
@@ -58,9 +58,9 @@ def test_query_destinatari(self):
5858
def test_query_destinatari_with_accent(self):
5959
query = [
6060
{
61-
'i': 'destinatari',
62-
'o': 'plone.app.querystring.operation.string.is',
63-
'v': ['dà'],
61+
"i": "destinatari",
62+
"o": "plone.app.querystring.operation.string.is",
63+
"v": ["dà"],
6464
}
6565
]
6666
self.collection.setQuery(query)
@@ -71,9 +71,9 @@ def test_query_destinatari_with_accent(self):
7171
def test_query_finanziatori(self):
7272
query = [
7373
{
74-
'i': 'finanziatori',
75-
'o': 'plone.app.querystring.operation.string.is',
76-
'v': ['f1'],
74+
"i": "finanziato",
75+
"o": "plone.app.querystring.operation.boolean.isTrue",
76+
"v": "",
7777
}
7878
]
7979
self.collection.setQuery(query)
@@ -84,9 +84,9 @@ def test_query_finanziatori(self):
8484
def test_query_materie(self):
8585
query = [
8686
{
87-
'i': 'materie',
88-
'o': 'plone.app.querystring.operation.string.is',
89-
'v': ['m1'],
87+
"i": "materie",
88+
"o": "plone.app.querystring.operation.string.is",
89+
"v": ["m1"],
9090
}
9191
]
9292
self.collection.setQuery(query)

0 commit comments

Comments
 (0)