Skip to content

Commit 2f2ef23

Browse files
php-coderphp-coder
committed
SeriesServiceImplTest: use a random value for user id instead of a member.
Addressed to #300 No functional changes.
1 parent a576a93 commit 2f2ef23

File tree

1 file changed

+25
-27
lines changed

1 file changed

+25
-27
lines changed

‎src/test/groovy/ru/mystamps/web/service/SeriesServiceImplTest.groovy

+25-27
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import ru.mystamps.web.dao.dto.SeriesInfoDto
3737
import ru.mystamps.web.dao.dto.SitemapInfoDto
3838
import ru.mystamps.web.service.dto.SeriesDto
3939
import ru.mystamps.web.tests.DateUtils
40+
import ru.mystamps.web.tests.Random
4041

4142
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
4243
class SeriesServiceImplTest extends Specification {
@@ -53,7 +54,6 @@ class SeriesServiceImplTest extends Specification {
5354
private SeriesService service
5455
private AddSeriesForm form
5556
private AddImageForm imageForm
56-
private Integer userId
5757

5858
def setup() {
5959
form = new AddSeriesForm()
@@ -63,8 +63,6 @@ class SeriesServiceImplTest extends Specification {
6363

6464
imageForm = new AddImageForm()
6565

66-
userId = TestObjects.TEST_USER_ID
67-
6866
imageService.save(_) >> TestObjects.createImageInfoDto()
6967

7068
service = new SeriesServiceImpl(
@@ -84,7 +82,7 @@ class SeriesServiceImplTest extends Specification {
8482

8583
def "add() should throw exception if dto is null"() {
8684
when:
87-
service.add(null, userId, false)
85+
service.add(null, Random.userId(), false)
8886
then:
8987
thrown IllegalArgumentException
9088
}
@@ -93,7 +91,7 @@ class SeriesServiceImplTest extends Specification {
9391
given:
9492
form.setQuantity(null)
9593
when:
96-
service.add(form, userId, false)
94+
service.add(form, Random.userId(), false)
9795
then:
9896
thrown IllegalArgumentException
9997
}
@@ -102,7 +100,7 @@ class SeriesServiceImplTest extends Specification {
102100
given:
103101
form.setPerforated(null)
104102
when:
105-
service.add(form, userId, false)
103+
service.add(form, Random.userId(), false)
106104
then:
107105
thrown IllegalArgumentException
108106
}
@@ -111,7 +109,7 @@ class SeriesServiceImplTest extends Specification {
111109
given:
112110
form.setCategory(null)
113111
when:
114-
service.add(form, userId, false)
112+
service.add(form, Random.userId(), false)
115113
then:
116114
thrown IllegalArgumentException
117115
}
@@ -120,7 +118,7 @@ class SeriesServiceImplTest extends Specification {
120118
given:
121119
form.setCategory(new LinkEntityDto(null, 'test', 'Test'))
122120
when:
123-
service.add(form, userId, false)
121+
service.add(form, Random.userId(), false)
124122
then:
125123
thrown IllegalArgumentException
126124
}
@@ -141,7 +139,7 @@ class SeriesServiceImplTest extends Specification {
141139
and:
142140
form.setCountry(country)
143141
when:
144-
service.add(form, userId, false)
142+
service.add(form, Random.userId(), false)
145143
then:
146144
1 * seriesDao.add({ AddSeriesDbDto series ->
147145
assert series?.countryId == expectedCountryId
@@ -160,7 +158,7 @@ class SeriesServiceImplTest extends Specification {
160158
form.setMonth(month)
161159
form.setYear(year)
162160
when:
163-
service.add(form, userId, false)
161+
service.add(form, Random.userId(), false)
164162
then:
165163
1 * seriesDao.add({ AddSeriesDbDto series ->
166164
assert series?.releaseDay == expectedDay
@@ -189,7 +187,7 @@ class SeriesServiceImplTest extends Specification {
189187
and:
190188
form.setCategory(category)
191189
when:
192-
service.add(form, userId, false)
190+
service.add(form, Random.userId(), false)
193191
then:
194192
1 * seriesDao.add({ AddSeriesDbDto series ->
195193
assert series?.categoryId == expectedCategoryId
@@ -203,7 +201,7 @@ class SeriesServiceImplTest extends Specification {
203201
Integer expectedQuantity = 3
204202
form.setQuantity(expectedQuantity)
205203
when:
206-
service.add(form, userId, false)
204+
service.add(form, Random.userId(), false)
207205
then:
208206
1 * seriesDao.add({ AddSeriesDbDto series ->
209207
assert series?.quantity == expectedQuantity
@@ -217,7 +215,7 @@ class SeriesServiceImplTest extends Specification {
217215
Boolean expectedResult = true
218216
form.setPerforated(expectedResult)
219217
when:
220-
service.add(form, userId, false)
218+
service.add(form, Random.userId(), false)
221219
then:
222220
1 * seriesDao.add({ AddSeriesDbDto series ->
223221
assert series?.perforated == expectedResult
@@ -236,7 +234,7 @@ class SeriesServiceImplTest extends Specification {
236234
given:
237235
form.setMichelPrice(price)
238236
when:
239-
service.add(form, userId, false)
237+
service.add(form, Random.userId(), false)
240238
then:
241239
1 * seriesDao.add({ AddSeriesDbDto series ->
242240
assert series?.michelPrice == expectedPrice
@@ -260,7 +258,7 @@ class SeriesServiceImplTest extends Specification {
260258
given:
261259
form.setScottPrice(price)
262260
when:
263-
service.add(form, userId, false)
261+
service.add(form, Random.userId(), false)
264262
then:
265263
1 * seriesDao.add({ AddSeriesDbDto series ->
266264
assert series?.scottPrice == expectedPrice
@@ -284,7 +282,7 @@ class SeriesServiceImplTest extends Specification {
284282
given:
285283
form.setYvertPrice(price)
286284
when:
287-
service.add(form, userId, false)
285+
service.add(form, Random.userId(), false)
288286
then:
289287
1 * seriesDao.add({ AddSeriesDbDto series ->
290288
assert series?.yvertPrice == expectedPrice
@@ -308,7 +306,7 @@ class SeriesServiceImplTest extends Specification {
308306
given:
309307
form.setGibbonsPrice(price)
310308
when:
311-
service.add(form, userId, false)
309+
service.add(form, Random.userId(), false)
312310
then:
313311
1 * seriesDao.add({ AddSeriesDbDto series ->
314312
assert series?.gibbonsPrice == expectedPrice
@@ -325,7 +323,7 @@ class SeriesServiceImplTest extends Specification {
325323
given:
326324
form.setComment(' ')
327325
when:
328-
service.add(form, userId, true)
326+
service.add(form, Random.userId(), true)
329327
then:
330328
thrown IllegalArgumentException
331329
}
@@ -341,7 +339,7 @@ class SeriesServiceImplTest extends Specification {
341339
given:
342340
form.setComment(comment)
343341
when:
344-
service.add(form, userId, canAddComment)
342+
service.add(form, Random.userId(), canAddComment)
345343
then:
346344
1 * seriesDao.add({ AddSeriesDbDto series ->
347345
assert series?.comment == expectedComment
@@ -375,7 +373,7 @@ class SeriesServiceImplTest extends Specification {
375373
given:
376374
Integer expected = 456
377375
when:
378-
Integer actual = service.add(form, userId, false)
376+
Integer actual = service.add(form, Random.userId(), false)
379377
then:
380378
1 * seriesDao.add(_ as AddSeriesDbDto) >> expected
381379
and:
@@ -393,7 +391,7 @@ class SeriesServiceImplTest extends Specification {
393391
and:
394392
seriesDao.add(_ as AddSeriesDbDto) >> expectedSeriesId
395393
when:
396-
service.add(form, userId, false)
394+
service.add(form, Random.userId(), false)
397395
then:
398396
1 * michelCatalogService.add({ Set<String> numbers ->
399397
assert numbers == expectedNumbers
@@ -420,7 +418,7 @@ class SeriesServiceImplTest extends Specification {
420418
and:
421419
seriesDao.add(_ as AddSeriesDbDto) >> expectedSeriesId
422420
when:
423-
service.add(form, userId, false)
421+
service.add(form, Random.userId(), false)
424422
then:
425423
1 * scottCatalogService.add({ Set<String> numbers ->
426424
assert numbers == expectedNumbers
@@ -447,7 +445,7 @@ class SeriesServiceImplTest extends Specification {
447445
and:
448446
seriesDao.add(_ as AddSeriesDbDto) >> expectedSeriesId
449447
when:
450-
service.add(form, userId, false)
448+
service.add(form, Random.userId(), false)
451449
then:
452450
1 * yvertCatalogService.add({ Set<String> numbers ->
453451
assert numbers == expectedNumbers
@@ -474,7 +472,7 @@ class SeriesServiceImplTest extends Specification {
474472
and:
475473
seriesDao.add(_ as AddSeriesDbDto) >> expectedSeriesId
476474
when:
477-
service.add(form, userId, false)
475+
service.add(form, Random.userId(), false)
478476
then:
479477
1 * gibbonsCatalogService.add({ Set<String> numbers ->
480478
assert numbers == expectedNumbers
@@ -495,7 +493,7 @@ class SeriesServiceImplTest extends Specification {
495493
given:
496494
form.setImage(multipartFile)
497495
when:
498-
service.add(form, userId, false)
496+
service.add(form, Random.userId(), false)
499497
then:
500498
1 * imageService.save({ MultipartFile passedFile ->
501499
assert passedFile == multipartFile
@@ -512,7 +510,7 @@ class SeriesServiceImplTest extends Specification {
512510
and:
513511
Integer expectedImageId = 456
514512
when:
515-
service.add(form, userId, false)
513+
service.add(form, Random.userId(), false)
516514
then:
517515
// FIXME: why we can't use _ as MultipartFile here?
518516
imageService.save(_) >> new ImageInfoDto(expectedImageId, 'JPEG')
@@ -535,7 +533,7 @@ class SeriesServiceImplTest extends Specification {
535533
and:
536534
imageService.addToSeries(_ as Integer, _ as Integer) >> { throw new IllegalStateException() }
537535
when:
538-
service.add(form, userId, false)
536+
service.add(form, Random.userId(), false)
539537
then:
540538
imageService.save(_) >> expectedImageInfo
541539
and:

0 commit comments

Comments
 (0)