UserServiceImplTest: use a random value for user id instead of a constant.

Addressed to #300

No functional changes.

Author: php-coder

src/test/groovy/ru/mystamps/web/service/UserServiceImplTest.groovy

@@ -29,12 +29,11 @@ import ru.mystamps.web.dao.dto.UserDetails
 import ru.mystamps.web.dao.dto.UsersActivationDto
 import ru.mystamps.web.controller.dto.ActivateAccountForm
 import ru.mystamps.web.tests.DateUtils
+import ru.mystamps.web.tests.Random
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
 class UserServiceImplTest extends Specification {
 
-	private static final Integer ANY_USER_ID = TestObjects.TEST_USER_ID
-	
 	private final UserDao userDao = Mock()
 	private final UsersActivationService usersActivationService = Mock()
 	private final CollectionService collectionService = Mock()
@@ -81,7 +80,7 @@ class UserServiceImplTest extends Specification {
 		when:
 			service.registerUser(activationForm)
 		then:
-			1 * userDao.add(_ as AddUserDbDto) >> ANY_USER_ID
+			1 * userDao.add(_ as AddUserDbDto) >> Random.userId()
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
@@ -96,7 +95,7 @@ class UserServiceImplTest extends Specification {
 				return true
 			})
 		and:
-			userDao.add(_ as AddUserDbDto) >> ANY_USER_ID
+			userDao.add(_ as AddUserDbDto) >> Random.userId()
 	}
 
 	def "registerUser() should throw exception when activation key is null"() {
@@ -129,7 +128,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.add({ AddUserDbDto user ->
 				assert user?.name == expectedUserName
 				return true
-			}) >> ANY_USER_ID
+			}) >> Random.userId()
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
@@ -143,7 +142,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.add({ AddUserDbDto user ->
 				assert user?.name == expectedUserLogin
 				return true
-			}) >> ANY_USER_ID
+			}) >> Random.userId()
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
@@ -158,7 +157,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.add({ AddUserDbDto user ->
 				assert user?.name == expectedUserLogin
 				return true
-			}) >> ANY_USER_ID
+			}) >> Random.userId()
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
@@ -169,7 +168,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.add({ AddUserDbDto user ->
 				assert user?.role == UserDetails.Role.USER
 				return true
-			}) >> ANY_USER_ID
+			}) >> Random.userId()
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
@@ -184,7 +183,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.add({ AddUserDbDto user ->
 				assert user?.email == activation.email
 				return true
-			}) >> ANY_USER_ID
+			}) >> Random.userId()
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
@@ -199,7 +198,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.add({ AddUserDbDto user ->
 				assert user?.registeredAt == activation.createdAt
 				return true
-			}) >> ANY_USER_ID
+			}) >> Random.userId()
 	}
 
 	def "registerUser() should throw exception when password is null"() {
@@ -221,7 +220,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.add({ AddUserDbDto user ->
 				assert user?.hash == expectedHash
 				return true
-			}) >> ANY_USER_ID
+			}) >> Random.userId()
 		and:
 			1 * encoder.encode({ String password ->
 				assert password == TestObjects.TEST_PASSWORD
@@ -257,7 +256,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.add({ AddUserDbDto user ->
 				assert user?.login == expectedUserLogin
 				return true
-			}) >> ANY_USER_ID
+			}) >> Random.userId()
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
@@ -268,7 +267,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.add({ AddUserDbDto user ->
 				assert DateUtils.roughlyEqual(user?.activatedAt, new Date())
 				return true
-			}) >> ANY_USER_ID
+			}) >> Random.userId()
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])

src/test/java/ru/mystamps/web/tests/Random.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2009-2017 Slava Semushin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.tests;
+
+import io.qala.datagen.RandomShortApi;
+
+public final class Random {
+	
+	private Random() {
+	}
+	
+	public static Integer userId() {
+		return RandomShortApi.positiveInteger();
+	}
+	
+}