Skip to content

Krb 0 erik tester #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
erik-itland wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Krb 0 erik tester #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1b40d2d
Prøv å bygge med foreløpig versjon
Dec 12, 2022
fc1f684
Prøv å bygge med foreløpig versjon
Dec 12, 2022
4bae477
Får alt sammen ca riktig
Dec 14, 2022
b992a39
Oppdatere pom.xml
Dec 14, 2022
be030b2
KRB-0 remove deleteCodelist and in the process fix some test
Dec 15, 2022
63a0d36
Merge remote-tracking branch 'origin/main' into KRB-0_erik_tester
Dec 22, 2022
e4c72e8
Fix permissions for mvnw
Dec 22, 2022
f296ce0
KRB-0 Make Mock test independent of Quarkus runtime
Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified mvnw
100644 → 100755
View file
Open in desktop
Empty file.
4 changes: 1 addition & 3 deletions src/main/kotlin/org/kravbank/repository/BackendRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ open class BackendRepository<T : PanacheEntity> : PanacheRepository<T> {
val deletedDate = LocalDateTime.now()
entity.deletedDate = deletedDate
persistAndFlush(entity)
}

else -> {
} else -> {
super.delete(entity)
}
}
Expand Down
61 changes: 28 additions & 33 deletions src/test/kotlin/org/kravbank/resource/mock/CodeResourceMockTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package org.kravbank.resource.mock

import io.quarkus.test.junit.QuarkusTest
import io.quarkus.test.junit.mockito.InjectMock
import io.quarkus.test.security.TestSecurity
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
Expand All @@ -11,7 +8,10 @@ import org.kravbank.domain.Code
import org.kravbank.lang.BadRequestException
import org.kravbank.lang.NotFoundException
import org.kravbank.repository.CodeRepository
import org.kravbank.repository.CodelistRepository
import org.kravbank.repository.ProjectRepository
import org.kravbank.resource.CodeResource
import org.kravbank.service.CodeService
import org.kravbank.utils.Messages.RepoErrorMsg.CODE_BADREQUEST_DELETE
import org.kravbank.utils.Messages.RepoErrorMsg.CODE_NOTFOUND
import org.kravbank.utils.TestSetup
Expand All @@ -21,39 +21,39 @@ import org.kravbank.utils.TestSetup.Arrange.codes
import org.kravbank.utils.TestSetup.Arrange.newCode
import org.kravbank.utils.TestSetup.Arrange.updatedCodeForm
import org.mockito.ArgumentMatchers
import org.mockito.Mockito
import javax.inject.Inject
import org.mockito.Mockito.*
import javax.ws.rs.core.Response

@QuarkusTest
@TestSecurity(authorizationEnabled = false)
internal class CodeResourceMockTest {
private val codeRepository = mock(CodeRepository::class.java)
private val codelistRepository = mock(CodelistRepository::class.java)
private val projectRepository = mock(ProjectRepository::class.java)

@InjectMock
lateinit var codeRepository: CodeRepository
private val codeService = CodeService(codeRepository, codelistRepository, projectRepository)
private val codeResource: CodeResource = CodeResource(codeService)

@Inject
lateinit var codeResource: CodeResource
val arrangeSetup = TestSetup.Arrange

final val arrangeSetup = TestSetup.Arrange

private final val codelistId: Long = arrangeSetup.codelist_codeId
private final val codelistRef: String = arrangeSetup.codelist_codeRef
private final val codeRef: String = arrangeSetup.code_codelistRef
private final val projectRef: String = arrangeSetup.project_codeRef
private val codelistId: Long = arrangeSetup.codelist_codeId
private val codelistRef: String = arrangeSetup.codelist_codeRef
private val codeRef: String = arrangeSetup.code_codelistRef
private val projectRef: String = arrangeSetup.project_codeRef

@BeforeEach
fun setUp() {

arrangeSetup.start()
`when`(projectRepository.findByRef(anyString())).thenReturn(arrangeSetup.project)
`when`(codelistRepository.findByRef(anyLong(), anyString())).thenReturn(arrangeSetup.codelist)
`when`(codeRepository.findByRef((anyLong()), anyString())).thenReturn(arrangeSetup.code)
`when`(codeRepository.listAllCodes(anyLong())).thenReturn(arrangeSetup.codes)

}


@Test
fun getCode_OK() {
Mockito
.`when`(
`when`(
codeRepository.findByRef(
codelistId,
codeRef
Expand All @@ -70,14 +70,15 @@ internal class CodeResourceMockTest {

val entity: Code = CodeForm().toEntity(response)


assertEquals(code.title, entity.title)
assertEquals(code.description, entity.description)

}

@Test
fun listCodes_OK() {
Mockito
.`when`(codeRepository.listAllCodes(codelistId))
`when`(codeRepository.listAllCodes(codelistId))
.thenReturn(codes)
val response = codeResource.listCodes(
projectRef,
Expand All @@ -94,12 +95,10 @@ internal class CodeResourceMockTest {

@Test
fun createCode_OK() {
Mockito
.doNothing()
doNothing()
.`when`(codeRepository)
.persist(ArgumentMatchers.any(Code::class.java))
Mockito
.`when`(codeRepository.isPersistent(ArgumentMatchers.any(Code::class.java)))
`when`(codeRepository.isPersistent(any(Code::class.java)))
.thenReturn(true)

val response: Response = codeResource.createCode(
Expand All @@ -114,8 +113,7 @@ internal class CodeResourceMockTest {

@Test
fun deleteCode_OK() {
Mockito
.`when`(codeRepository.deleteCode(codelistId, codeRef))
`when`(codeRepository.deleteCode(anyLong(), anyString()))
.thenReturn(newCode)

val response: Response = codeResource.deleteCode(projectRef, codelistRef, codeRef)
Expand All @@ -126,8 +124,7 @@ internal class CodeResourceMockTest {

@Test
fun deleteCode_KO() {
Mockito
.`when`(codeRepository.deleteCode(codelistId, codeRef))
`when`(codeRepository.deleteCode(anyLong(), anyString()))
.thenThrow(BadRequestException(CODE_BADREQUEST_DELETE))
try {
codeResource.deleteCode(projectRef, codelistRef, codeRef).entity as BadRequestException
Expand All @@ -138,8 +135,7 @@ internal class CodeResourceMockTest {

@Test
fun updateCode_OK() {
Mockito
.`when`(
`when`(
codeRepository.findByRef(
codelistId,
codeRef
Expand All @@ -163,8 +159,7 @@ internal class CodeResourceMockTest {

@Test
fun getCode_KO() {
Mockito
.`when`(codeRepository.findByRef(codelistId, codeRef))
`when`(codeRepository.findByRef(codelistId, codeRef))
.thenThrow(NotFoundException(CODE_NOTFOUND))
try {

Expand Down
5 changes: 0 additions & 5 deletions src/test/kotlin/org/kravbank/resource/mock/CodelistResourceMockTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.kravbank.resource.mock

import io.quarkus.test.junit.QuarkusTest
import io.quarkus.test.security.TestSecurity
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
Expand All @@ -21,9 +19,6 @@ import org.mockito.ArgumentMatchers
import org.mockito.Mockito.*
import javax.ws.rs.core.Response


@QuarkusTest
@TestSecurity(authorizationEnabled = false)
internal class CodelistResourceMockTest {


Expand Down
19 changes: 7 additions & 12 deletions src/test/kotlin/org/kravbank/service/CodelistServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ import org.kravbank.utils.TestSetup.Arrange.codelistForm
import org.kravbank.utils.TestSetup.Arrange.codelists
import org.kravbank.utils.TestSetup.Arrange.updatedCodelistForm
import org.mockito.ArgumentMatchers
import org.mockito.ArgumentMatchers.anyLong
import org.mockito.ArgumentMatchers.anyString
import org.mockito.Mockito
import org.mockito.Mockito.verify
import javax.inject.Inject

@QuarkusTest
Expand Down Expand Up @@ -95,31 +98,23 @@ internal class CodelistServiceTest {
Assertions.assertEquals(form.description, mockedCodelist.description)
}

/*
//TODO fiks nullpointer error
Slettet deleteCodelist fra codelist repo ,
brukte i steden panaches deleteById fra serviceklassen
codeliste service kaster error foundCodlist er null, noe som er merkelig siden begge metodene returnerer boolean (samme mockito given-setup)

@Test
fun delete() {

Mockito
.`when`(
codelistRepository.deleteById(
codelist_projectId
)
codelistRepository.deleteById(anyLong())
)
.thenReturn(true)

Mockito.`when`(codelistRepository.findByRef(anyLong(), anyString())).thenReturn(codelist)

val result = codelistService.delete(projectRef, codelistRef)

Assertions.assertNotNull(result)
Assertions.assertEquals(true, result)
verify(codelistRepository).deleteById(1L)
}

*/

@Test
fun update() {
Mockito
Expand Down