Skip to content

Commit 3a42b83

Browse files
YesferalYesferal
committed
Fix unit tests
1 parent 818518c commit 3a42b83

File tree

5 files changed

+37
-56
lines changed

5 files changed

+37
-56
lines changed

‎src/jvmTest/kotlin/com/yesferal/hornsapp/core/domain/entity/render/ViewRenderTest.kt‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ViewRenderTest : MockitoTest {
2121
val data = null
2222

2323
// When
24-
viewRender = ViewRender(key.name, data, null, null)
24+
viewRender = ViewRender(key.name, data, null, null, null)
2525

2626
// Then
2727
Assert.assertEquals(key, viewRender.type)
@@ -38,17 +38,10 @@ class ViewRenderTest : MockitoTest {
3838
null,
3939
null,
4040
null,
41-
null,
42-
null,
43-
null,
44-
visibility = null,
45-
backgroundColor = null,
46-
elevation = null,
47-
ctas = null,
4841
)
4942

5043
// When
51-
viewRender = ViewRender(key.name, data, null, null)
44+
viewRender = ViewRender(key.name, data, null, null, null)
5245

5346
// Then
5447
Assert.assertEquals(key, viewRender.type)
@@ -65,44 +58,30 @@ class ViewRenderTest : MockitoTest {
6558
null,
6659
null,
6760
null,
68-
null,
69-
null,
70-
null,
71-
visibility = true,
72-
backgroundColor = null,
73-
elevation = null,
74-
ctas = null,
7561
)
7662

7763
// When
78-
viewRender = ViewRender(key.name, data, null, null)
64+
viewRender = ViewRender(key.name, data, null, null, null)
7965

8066
// Then
8167
Assert.assertEquals(key, viewRender.type)
8268
}
8369

8470
@Test
85-
fun givenViewRender_WhenThereIsFalseVisibility_ThenShouldRenderTrue() {
71+
fun givenViewRender_WhenThereIsFalseVisibility_ThenShouldNotRenderTrue() {
8672
// Given
8773
val key = ViewRender.Type.CARD_VIEW
88-
val data = DataRender(
89-
null,
90-
null,
91-
null,
92-
null,
74+
val style = StyleRender(
9375
null,
9476
null,
9577
null,
9678
null,
9779
null,
9880
visibility = false,
99-
backgroundColor = null,
100-
elevation = null,
101-
ctas = null,
10281
)
10382

10483
// When
105-
viewRender = ViewRender(key.name, data, null, null)
84+
viewRender = ViewRender(key.name, null, style, null, null)
10685

10786
// Then
10887
Assert.assertEquals(ViewRender.Type.VISIBILITY_GONE_CARD_VIEW, viewRender.type)

src/jvmTest/kotlin/com/yesferal/hornsapp/core/domain/navigator/ParametersTest.kt renamed to src/jvmTest/kotlin/com/yesferal/hornsapp/core/domain/navigator/NavigatorRenderTest.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
package com.yesferal.hornsapp.core.domain.navigator
33

44
import com.yesferal.hornsapp.core.domain.entity.Venue
5+
import com.yesferal.hornsapp.core.domain.entity.render.NavigatorRender
56
import org.junit.Assert
67
import org.junit.Test
78

8-
class ParametersTest {
9+
class NavigatorRenderTest {
910

1011
@Test
1112
fun given_aParameters_whenItHasString_ThenGetIt() {
1213
// Given
13-
val parameters = Parameters()
14+
val parameters = NavigatorRender()
1415

1516
// When
1617
parameters.put("id", "1")
@@ -23,7 +24,7 @@ class ParametersTest {
2324
@Test
2425
fun given_aParameters_whenItHasBoolean_ThenGetIt() {
2526
// Given
26-
val parameters = Parameters()
27+
val parameters = NavigatorRender()
2728

2829
// When
2930
parameters.put("id", true)
@@ -36,7 +37,7 @@ class ParametersTest {
3637
@Test
3738
fun given_aParameters_whenItHasLong_ThenGetIt() {
3839
// Given
39-
val parameters = Parameters()
40+
val parameters = NavigatorRender()
4041

4142
// When
4243
parameters.put("id", 1L)
@@ -49,7 +50,7 @@ class ParametersTest {
4950
@Test
5051
fun given_aParameters_whenItHasString_ThenGetItAsString() {
5152
// Given
52-
val parameters = Parameters()
53+
val parameters = NavigatorRender()
5354

5455
// When
5556
parameters.put("id", "1")
@@ -62,7 +63,7 @@ class ParametersTest {
6263
@Test
6364
fun given_aParameters_whenItHasObject_ThenGetObject() {
6465
// Given
65-
val parameters = Parameters()
66+
val parameters = NavigatorRender()
6667

6768
// When
6869
parameters.put("Venue", Venue("id", "name", "description", "mapSearchName", "latitude", "longitude", ""))

‎src/jvmTest/kotlin/com/yesferal/hornsapp/core/domain/navigator/NavigatorTest.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* Copyright © 2021 HornsApp. All rights reserved. */
22
package com.yesferal.hornsapp.core.domain.navigator
33

4+
import com.yesferal.hornsapp.core.domain.entity.render.NavigatorRender
45
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRender
56
import org.junit.Assert
67
import org.junit.Test
@@ -12,7 +13,7 @@ import org.junit.Test
1213
*/
1314
class NavigatorTest {
1415

15-
private val parameters = Parameters().apply {
16+
private val parameters = NavigatorRender().apply {
1617
put("id", "1234")
1718
}
1819

@@ -28,8 +29,8 @@ class NavigatorTest {
2829

2930
// Then
3031
Assert.assertEquals(ScreenRender.Type.HOME_SCREEN, result.to)
31-
Assert.assertEquals(parameters, result.parameters)
32-
Assert.assertEquals(parameters.getString("id"), result.parameters?.getString("id"))
32+
Assert.assertEquals(parameters, result.navigatorRender)
33+
Assert.assertEquals(parameters.getString("id"), result.navigatorRender?.getString("id"))
3334
}
3435

3536
@Test

‎src/jvmTest/kotlin/com/yesferal/hornsapp/core/domain/usecase/FilterConcertsByCategoryUseCaseTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ class FilterConcertsByCategoryUseCaseTest: MockitoTest {
1919
lateinit var filterConcertsByCategoryUseCase: FilterConcertsByCategoryUseCase
2020

2121
private fun getConcerts() = listOf(
22-
Concert.Builder("1").addTimeInMillis(100).addTags(listOf(METAL, "ROCK")).build(),
23-
Concert.Builder("2").addTimeInMillis(90).addTags(listOf("ROCK")).build(),
22+
Concert.Builder("1").addTimeInMillis(100).addCategories(listOf(METAL, "ROCK")).build(),
23+
Concert.Builder("2").addTimeInMillis(90).addCategories(listOf("ROCK")).build(),
2424
Concert.Builder("3").addTimeInMillis(80).build(),
25-
Concert.Builder("4").addTimeInMillis(70).addTags(listOf("JAZZ", METAL)).build(),
26-
Concert.Builder("5").addTimeInMillis(60).addTags(listOf(METAL)).build()
25+
Concert.Builder("4").addTimeInMillis(70).addCategories(listOf("JAZZ", METAL)).build(),
26+
Concert.Builder("5").addTimeInMillis(60).addCategories(listOf(METAL)).build()
2727
)
2828

2929
@Test
@@ -66,13 +66,13 @@ class FilterConcertsByCategoryUseCaseTest: MockitoTest {
6666
// Then
6767
val expected = 3
6868
Assert.assertEquals(expected, result.size)
69-
Assert.assertNotEquals(null, result[0].tags)
70-
Assert.assertEquals(true, result[0].tags!!.contains(METAL))
69+
Assert.assertNotEquals(null, result[0].categories)
70+
Assert.assertEquals(true, result[0].categories!!.contains(METAL))
7171

72-
Assert.assertNotEquals(null, result[1].tags)
73-
Assert.assertEquals(true, result[1].tags!!.contains(METAL))
72+
Assert.assertNotEquals(null, result[1].categories)
73+
Assert.assertEquals(true, result[1].categories!!.contains(METAL))
7474

75-
Assert.assertNotEquals(null, result[2].tags)
76-
Assert.assertEquals(true, result[2].tags!!.contains(METAL))
75+
Assert.assertNotEquals(null, result[2].categories)
76+
Assert.assertEquals(true, result[2].categories!!.contains(METAL))
7777
}
7878
}

‎src/jvmTest/kotlin/com/yesferal/hornsapp/core/domain/usecase/GetUpcomingConcertsUseCaseTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ class GetUpcomingConcertsUseCaseTest: MockitoTest {
4040
}
4141

4242
private fun getConcerts() = listOf(
43-
Concert.Builder("1").addTimeInMillis(100).addTags(listOf(METAL, "ROCK")).build(),
44-
Concert.Builder("2").addTimeInMillis(90).addTags(listOf("ROCK")).build(),
43+
Concert.Builder("1").addTimeInMillis(100).addCategories(listOf(METAL, "ROCK")).build(),
44+
Concert.Builder("2").addTimeInMillis(90).addCategories(listOf("ROCK")).build(),
4545
Concert.Builder("3").addTimeInMillis(80).build(),
46-
Concert.Builder("4").addTimeInMillis(70).addTags(listOf("JAZZ", METAL)).build(),
47-
Concert.Builder("5").addTimeInMillis(60).addTags(listOf(METAL)).build()
46+
Concert.Builder("4").addTimeInMillis(70).addCategories(listOf("JAZZ", METAL)).build(),
47+
Concert.Builder("5").addTimeInMillis(60).addCategories(listOf(METAL)).build()
4848
)
4949

5050
@Test
@@ -79,14 +79,14 @@ class GetUpcomingConcertsUseCaseTest: MockitoTest {
7979
Assert.assertEquals(true, result is HaResult.Success)
8080
Assert.assertEquals(expected, (result as HaResult.Success).value.size)
8181

82-
Assert.assertNotEquals(null, result.value[0].tags)
83-
Assert.assertEquals(true, result.value[0].tags!!.contains(METAL))
82+
Assert.assertNotEquals(null, result.value[0].categories)
83+
Assert.assertEquals(true, result.value[0].categories!!.contains(METAL))
8484

85-
Assert.assertNotEquals(null, result.value[1].tags)
86-
Assert.assertEquals(true, result.value[1].tags!!.contains(METAL))
85+
Assert.assertNotEquals(null, result.value[1].categories)
86+
Assert.assertEquals(true, result.value[1].categories!!.contains(METAL))
8787

88-
Assert.assertNotEquals(null, result.value[2].tags)
89-
Assert.assertEquals(true, result.value[2].tags!!.contains(METAL))
88+
Assert.assertNotEquals(null, result.value[2].categories)
89+
Assert.assertEquals(true, result.value[2].categories!!.contains(METAL))
9090
}
9191
}
9292

0 commit comments

Comments
 (0)