db fix, ExerciseTypeTest fix
This commit is contained in:
parent
e76c65babe
commit
5a4dda676b
@ -43,7 +43,8 @@ connect:
|
||||
script:
|
||||
- apt-get update && apt-get --assume-yes install mysql-client
|
||||
- mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql -e "use $MYSQL_DATABASE; show tables;"
|
||||
#- mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql < "data/db/install.sql" #first time
|
||||
- mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql -e "use $MYSQL_DATABASE; DROP table CUSTOMER; DROP table EXERCISES; DROP table EXERCISE_TYPE; DROP table exercise_ages;"
|
||||
- mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql < "data/db/install.sql" #first time
|
||||
|
||||
test:
|
||||
stage: test
|
||||
|
@ -38,9 +38,7 @@ INSERT INTO `customer` (`customer_id`, `name`, `firstname`, `email`, `sex`, `age
|
||||
(10, 'Átlag 15 éves lány', '', NULL, 'w', 15),
|
||||
(11, 'Átlag 16 éves lány', '', NULL, 'w', 16),
|
||||
(12, 'Átlag 17 éves lány', '', NULL, 'w', 17),
|
||||
(13, 'Átlag 18 éves lány', '', NULL, 'w', 18),
|
||||
(14, 'Bossanyi', 'Tibor', '', 'm', 48),
|
||||
(15, 'Bossanyi', 'Tibor', '', 'm', 48);
|
||||
(13, 'Átlag 18 éves lány', '', NULL, 'w', 18);
|
||||
/*!40000 ALTER TABLE `customer` ENABLE KEYS */;
|
||||
|
||||
-- Struktúra mentése tábla aitrainer. exercises
|
||||
|
@ -13,7 +13,6 @@ class CustomerTests {
|
||||
|
||||
@Autowired
|
||||
private lateinit var customerRepository: CustomerRepository
|
||||
private val customerId: Long = 4
|
||||
private var insertedId: Long? = null
|
||||
|
||||
@Test
|
||||
|
@ -11,8 +11,6 @@ import kotlin.test.assertEquals
|
||||
class ExerciseTypeTest {
|
||||
|
||||
@Autowired
|
||||
private val exerciseTypeId: Long = 4
|
||||
private var insertedId: Long? = null
|
||||
private lateinit var exerciseTypeRepository: ExerciseTypeRepository
|
||||
|
||||
@Test
|
||||
@ -26,7 +24,7 @@ class ExerciseTypeTest {
|
||||
val savedEx: ExerciseType = exerciseTypeRepository.save(newEx)
|
||||
assertEquals(savedEx.name, "Húzodszkodás")
|
||||
|
||||
this.insertedId = savedEx.exerciseTypeId
|
||||
val insertedId: Long = savedEx.exerciseTypeId
|
||||
|
||||
val extype: ExerciseType = exerciseTypeRepository.findById( savedEx.exerciseTypeId ).orElse(null)
|
||||
assertEquals( extype.name, "Húzodszkodás")
|
||||
|
Loading…
Reference in New Issue
Block a user