bossanyit/workouttest_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

db fix, ExerciseTypeTest fix

Browse Source
This commit is contained in:
Bossanyi Tibor 2020-05-12 14:47:46 +02:00
parent e76c65babe
commit 5a4dda676b
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -43,7 +43,8 @@ connect:
script: script:
- apt-get update && apt-get --assume-yes install mysql-client - 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 -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: test:
stage: test stage: test

4
data/db/install.sql
View File

@ -38,9 +38,7 @@ INSERT INTO `customer` (`customer_id`, `name`, `firstname`, `email`, `sex`, `age
(10, 'Átlag 15 éves lány', '', NULL, 'w', 15), (10, 'Átlag 15 éves lány', '', NULL, 'w', 15),
(11, 'Átlag 16 éves lány', '', NULL, 'w', 16), (11, 'Átlag 16 éves lány', '', NULL, 'w', 16),
(12, 'Átlag 17 éves lány', '', NULL, 'w', 17), (12, 'Átlag 17 éves lány', '', NULL, 'w', 17),
(13, 'Átlag 18 éves lány', '', NULL, 'w', 18), (13, 'Átlag 18 éves lány', '', NULL, 'w', 18);
(14, 'Bossanyi', 'Tibor', '', 'm', 48),
(15, 'Bossanyi', 'Tibor', '', 'm', 48);
/*!40000 ALTER TABLE `customer` ENABLE KEYS */; /*!40000 ALTER TABLE `customer` ENABLE KEYS */;
-- Struktúra mentése tábla aitrainer. exercises -- Struktúra mentése tábla aitrainer. exercises

1
src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt
View File

@ -13,7 +13,6 @@ class CustomerTests {
@Autowired @Autowired
private lateinit var customerRepository: CustomerRepository private lateinit var customerRepository: CustomerRepository
private val customerId: Long = 4
private var insertedId: Long? = null private var insertedId: Long? = null
@Test @Test

4
src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt
View File

@ -11,8 +11,6 @@ import kotlin.test.assertEquals
class ExerciseTypeTest { class ExerciseTypeTest {
@Autowired @Autowired
private val exerciseTypeId: Long = 4
private var insertedId: Long? = null
private lateinit var exerciseTypeRepository: ExerciseTypeRepository private lateinit var exerciseTypeRepository: ExerciseTypeRepository
@Test @Test
@ -26,7 +24,7 @@ class ExerciseTypeTest {
val savedEx: ExerciseType = exerciseTypeRepository.save(newEx) val savedEx: ExerciseType = exerciseTypeRepository.save(newEx)
assertEquals(savedEx.name, "Húzodszkodás") assertEquals(savedEx.name, "Húzodszkodás")
this.insertedId = savedEx.exerciseTypeId val insertedId: Long = savedEx.exerciseTypeId
val extype: ExerciseType = exerciseTypeRepository.findById( savedEx.exerciseTypeId ).orElse(null) val extype: ExerciseType = exerciseTypeRepository.findById( savedEx.exerciseTypeId ).orElse(null)
assertEquals( extype.name, "Húzodszkodás") assertEquals( extype.name, "Húzodszkodás")