diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22c1e42..191645e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/data/db/install.sql b/data/db/install.sql index 75fa298..e92664a 100644 --- a/data/db/install.sql +++ b/data/db/install.sql @@ -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 diff --git a/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt b/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt index b76f1e6..f179371 100644 --- a/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt +++ b/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt @@ -13,7 +13,6 @@ class CustomerTests { @Autowired private lateinit var customerRepository: CustomerRepository - private val customerId: Long = 4 private var insertedId: Long? = null @Test diff --git a/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt b/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt index 478cf6c..7dac582 100644 --- a/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt @@ -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")