Skip to content

#35 move method from controller #44

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

Open
ameliadiedrich wants to merge 3 commits into
base: master
Choose a base branch
from
Open

#35 move method from controller #44

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04261c3
#34 Moved methods from Controller
Jun 2, 2019
ebd76d8
Fixed Build issues
Jun 2, 2019
b2d196f
Fixed Assertion errors
Jun 3, 2019
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
Prev Previous commit
Fixed Assertion errors
  • Loading branch information
unknown authored and unknown committed Jun 3, 2019
commit b2d196f5dc09fd41690a09760c88f0eebf67730b
5 changes: 0 additions & 5 deletions src/test/kotlin/org/oso/core/controller/HelpProviderControllerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@ class HelpProviderControllerTest {
val dto = HelpProviderPushDto(
name = "HelpProvider"
)
val helpProvider = HelpProvider(
id = "12345",
name = dto.name,
keycloakName = "keycloak12345"
)

Mockito.`when`(helpProviderService.createHelpProvider(any())).thenThrow(IllegalArgumentException())
//Mockito.doReturn(helpProvider).`when`(helpProviderService).createHelpProvider(ArgumentMatchers.any())
Expand Down
14 changes: 12 additions & 2 deletions src/test/kotlin/org/oso/core/controller/InvitationControllerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ class InvitationControllerTest {
MockMvcRequestBuilders
.get("/${Paths.Invitation.INVITATION}/${Paths.Invitation.ACCEPTED}?token=test123"))
.andExpect(MockMvcResultMatchers.status().isOk)
.andExpect(MockMvcResultMatchers.content().string(Matchers.containsString("successful")))
.andExpect(MockMvcResultMatchers.content().string(
Matchers.anyOf(
Matchers.containsString("successfull"),
Matchers.containsString("erfolgreich angenommen"))
)
)

Assert.assertThat(hr.helpProviders, Matchers.iterableWithSize<HelpProvider>(1))
Assert.assertThat(hr.helpProviders, Matchers.hasItem(hp))
Expand All @@ -90,7 +95,12 @@ class InvitationControllerTest {
MockMvcRequestBuilders
.get("/${Paths.Invitation.INVITATION}/${Paths.Invitation.ACCEPTED}?token=test123"))
.andExpect(MockMvcResultMatchers.status().isOk)
.andExpect(MockMvcResultMatchers.content().string(Matchers.containsString("expired")))
.andExpect(MockMvcResultMatchers.content().string(
Matchers.anyOf(
Matchers.containsString("expired"),
Matchers.containsString("nicht mehr gültig"))
)
)

Assert.assertThat(hr.helpProviders, Matchers.iterableWithSize<HelpProvider>(0))
Assert.assertThat(hp.helpRequesters, Matchers.iterableWithSize<HelpRequester>(0))
Expand Down
1 change: 1 addition & 0 deletions src/test/kotlin/org/oso/core/services/impl/DefaultEmergencyServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.oso.core.services.impl

import org.junit.Before
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
import org.mockito.ArgumentMatchers
Expand Down