Skip to content

Commit d201a5e

Browse files
grzesiek2010grzesiek2010
committed
Fixed tests
1 parent bd1a35d commit d201a5e

File tree

2 files changed

+28
-40
lines changed

2 files changed

+28
-40
lines changed

‎collect_app/src/test/java/org/odk/collect/android/widgets/ArbitraryFileWidgetTest.kt

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import org.odk.collect.android.utilities.MediaUtils
1818
import org.odk.collect.android.widgets.base.FileWidgetTest
1919
import org.odk.collect.android.widgets.support.FakeQuestionMediaManager
2020
import org.odk.collect.android.widgets.support.FakeWaitingForDataRegistry
21+
import org.odk.collect.android.widgets.support.QuestionWidgetHelpers
2122
import org.odk.collect.android.widgets.utilities.QuestionFontSizeUtils
2223
import org.odk.collect.android.widgets.utilities.QuestionFontSizeUtils.getFontSize
2324
import org.odk.collect.androidshared.system.IntentLauncher
@@ -27,6 +28,7 @@ class ArbitraryFileWidgetTest : FileWidgetTest<ArbitraryFileWidget?>() {
2728
private val mediaUtils = mock<MediaUtils>().also {
2829
whenever(it.isAudioFile(any())).thenReturn(true)
2930
}
31+
private val widgetAnswer = ArbitraryFileWidgetAnswer(QuestionWidgetHelpers.widgetTestActivity())
3032

3133
@Before
3234
fun setup() {
@@ -47,7 +49,7 @@ class ArbitraryFileWidgetTest : FileWidgetTest<ArbitraryFileWidget?>() {
4749

4850
override fun createWidget(): ArbitraryFileWidget {
4951
return ArbitraryFileWidget(
50-
activity, QuestionDetails(formEntryPrompt, readOnlyOverride),
52+
activity, QuestionDetails(formEntryPrompt, readOnlyOverride), widgetAnswer,
5153
FakeQuestionMediaManager(), FakeWaitingForDataRegistry()
5254
)
5355
}
@@ -64,28 +66,20 @@ class ArbitraryFileWidgetTest : FileWidgetTest<ArbitraryFileWidget?>() {
6466
)
6567
)
6668
)
67-
assertThat(
68-
widget!!.binding.arbitraryFileAnswerText.textSize.toInt(), equalTo(
69-
getFontSize(
70-
settingsProvider.getUnprotectedSettings(),
71-
QuestionFontSizeUtils.FontSize.HEADLINE_6
72-
)
73-
)
74-
)
7569
}
7670

7771
@Test
7872
fun `Hide the answer text when there is no answer`() {
79-
assertThat(widget!!.binding.arbitraryFileAnswerText.visibility, equalTo(View.GONE))
73+
assertThat(widget!!.binding.answerViewContainer.visibility, equalTo(View.GONE))
8074
}
8175

8276
@Test
8377
fun `Display the answer text when there is answer`() {
8478
whenever(formEntryPrompt.answerText).thenReturn(initialAnswer.displayText)
8579

8680
val widget = widget!!
87-
assertThat(widget.binding.arbitraryFileAnswerText.visibility, equalTo(View.VISIBLE))
88-
assertThat(widget.binding.arbitraryFileAnswerText.text, equalTo(initialAnswer.displayText))
81+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.VISIBLE))
82+
assertThat(widgetAnswer.getAnswer(), equalTo(initialAnswer.displayText))
8983
}
9084

9185
@Test
@@ -99,7 +93,7 @@ class ArbitraryFileWidgetTest : FileWidgetTest<ArbitraryFileWidget?>() {
9993
whenever(formEntryPrompt.answerText).thenReturn(initialAnswer.displayText)
10094

10195
val widget = widget!!
102-
widget.binding.arbitraryFileAnswerText.performClick()
96+
widget.binding.answerViewContainer.performClick()
10397
verify(mediaUtils).openFile(activity, widget.answerFile!!, null)
10498
}
10599

@@ -109,7 +103,7 @@ class ArbitraryFileWidgetTest : FileWidgetTest<ArbitraryFileWidget?>() {
109103

110104
val widget = widget!!
111105
widget.clearAnswer()
112-
assertThat(widget.binding.arbitraryFileAnswerText.visibility, equalTo(View.GONE))
106+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.GONE))
113107
}
114108

115109
@Test
@@ -119,7 +113,7 @@ class ArbitraryFileWidgetTest : FileWidgetTest<ArbitraryFileWidget?>() {
119113
val widget = widget!!
120114
widget.setData(null)
121115
assertThat(widget.answer, equalTo(null))
122-
assertThat(widget.binding.arbitraryFileAnswerText.visibility, equalTo(View.GONE))
116+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.GONE))
123117
}
124118

125119
@Test
@@ -130,9 +124,9 @@ class ArbitraryFileWidgetTest : FileWidgetTest<ArbitraryFileWidget?>() {
130124

131125
val widget = widget!!
132126
assertThat(widget.binding.arbitraryFileButton.visibility, equalTo(View.GONE))
133-
assertThat(widget.binding.arbitraryFileAnswerText.visibility, equalTo(View.VISIBLE))
134-
assertThat(widget.binding.arbitraryFileAnswerText.text, equalTo(initialAnswer.displayText))
135-
assertThat(widget.binding.arbitraryFileAnswerText.hasOnClickListeners(), equalTo(true))
127+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.VISIBLE))
128+
assertThat(widgetAnswer.getAnswer(), equalTo(initialAnswer.displayText))
129+
assertThat(widget.binding.answerViewContainer.hasOnClickListeners(), equalTo(true))
136130
}
137131

138132
@Test
@@ -142,8 +136,8 @@ class ArbitraryFileWidgetTest : FileWidgetTest<ArbitraryFileWidget?>() {
142136

143137
val widget = widget!!
144138
assertThat(widget.binding.arbitraryFileButton.visibility, equalTo(View.GONE))
145-
assertThat(widget.binding.arbitraryFileAnswerText.visibility, equalTo(View.VISIBLE))
146-
assertThat(widget.binding.arbitraryFileAnswerText.text, equalTo(initialAnswer.displayText))
147-
assertThat(widget.binding.arbitraryFileAnswerText.hasOnClickListeners(), equalTo(true))
139+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.VISIBLE))
140+
assertThat(widgetAnswer.getAnswer(), equalTo(initialAnswer.displayText))
141+
assertThat(widget.binding.answerViewContainer.hasOnClickListeners(), equalTo(true))
148142
}
149143
}

‎collect_app/src/test/java/org/odk/collect/android/widgets/ExArbitraryFileWidgetTest.kt

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import org.odk.collect.android.utilities.MediaUtils
1818
import org.odk.collect.android.widgets.base.FileWidgetTest
1919
import org.odk.collect.android.widgets.support.FakeQuestionMediaManager
2020
import org.odk.collect.android.widgets.support.FakeWaitingForDataRegistry
21+
import org.odk.collect.android.widgets.support.QuestionWidgetHelpers
2122
import org.odk.collect.android.widgets.utilities.FileRequester
2223
import org.odk.collect.android.widgets.utilities.QuestionFontSizeUtils
2324
import org.odk.collect.android.widgets.utilities.QuestionFontSizeUtils.getFontSize
@@ -29,6 +30,7 @@ class ExArbitraryFileWidgetTest : FileWidgetTest<ExArbitraryFileWidget?>() {
2930
private val mediaUtils = mock<MediaUtils>().also {
3031
whenever(it.isAudioFile(any())).thenReturn(true)
3132
}
33+
private val widgetAnswer = ArbitraryFileWidgetAnswer(QuestionWidgetHelpers.widgetTestActivity())
3234

3335
@Before
3436
fun setup() {
@@ -49,7 +51,7 @@ class ExArbitraryFileWidgetTest : FileWidgetTest<ExArbitraryFileWidget?>() {
4951

5052
override fun createWidget(): ExArbitraryFileWidget {
5153
return ExArbitraryFileWidget(
52-
activity, QuestionDetails(formEntryPrompt, readOnlyOverride),
54+
activity, QuestionDetails(formEntryPrompt, readOnlyOverride), widgetAnswer,
5355
FakeQuestionMediaManager(), FakeWaitingForDataRegistry(), fileRequester
5456
)
5557
}
@@ -66,28 +68,20 @@ class ExArbitraryFileWidgetTest : FileWidgetTest<ExArbitraryFileWidget?>() {
6668
)
6769
)
6870
)
69-
assertThat(
70-
widget!!.binding.exArbitraryFileAnswerText.textSize.toInt(), equalTo(
71-
getFontSize(
72-
settingsProvider.getUnprotectedSettings(),
73-
QuestionFontSizeUtils.FontSize.HEADLINE_6
74-
)
75-
)
76-
)
7771
}
7872

7973
@Test
8074
fun `Hide the answer text when there is no answer`() {
81-
assertThat(widget!!.binding.exArbitraryFileAnswerText.visibility, equalTo(View.GONE))
75+
assertThat(widget!!.binding.answerViewContainer.visibility, equalTo(View.GONE))
8276
}
8377

8478
@Test
8579
fun `Display the answer text when there is answer`() {
8680
whenever(formEntryPrompt.answerText).thenReturn(initialAnswer.displayText)
8781

8882
val widget = widget!!
89-
assertThat(widget.binding.exArbitraryFileAnswerText.visibility, equalTo(View.VISIBLE))
90-
assertThat(widget.binding.exArbitraryFileAnswerText.text, equalTo(initialAnswer.displayText))
83+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.VISIBLE))
84+
assertThat(widgetAnswer.getAnswer(), equalTo(initialAnswer.displayText))
9185
}
9286

9387
@Test
@@ -101,7 +95,7 @@ class ExArbitraryFileWidgetTest : FileWidgetTest<ExArbitraryFileWidget?>() {
10195
whenever(formEntryPrompt.answerText).thenReturn(initialAnswer.displayText)
10296

10397
val widget = widget!!
104-
widget.binding.exArbitraryFileAnswerText.performClick()
98+
widget.binding.answerViewContainer.performClick()
10599
verify(mediaUtils).openFile(activity, widget.answerFile!!, null)
106100
}
107101

@@ -111,7 +105,7 @@ class ExArbitraryFileWidgetTest : FileWidgetTest<ExArbitraryFileWidget?>() {
111105

112106
val widget = widget!!
113107
widget.clearAnswer()
114-
assertThat(widget.binding.exArbitraryFileAnswerText.visibility, equalTo(View.GONE))
108+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.GONE))
115109
}
116110

117111
@Test
@@ -121,7 +115,7 @@ class ExArbitraryFileWidgetTest : FileWidgetTest<ExArbitraryFileWidget?>() {
121115
val widget = widget!!
122116
widget.setData(null)
123117
assertThat(widget.answer, equalTo(null))
124-
assertThat(widget.binding.exArbitraryFileAnswerText.visibility, equalTo(View.GONE))
118+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.GONE))
125119
}
126120

127121
@Test
@@ -132,8 +126,8 @@ class ExArbitraryFileWidgetTest : FileWidgetTest<ExArbitraryFileWidget?>() {
132126

133127
val widget = widget!!
134128
assertThat(widget.binding.exArbitraryFileButton.visibility, equalTo(View.GONE))
135-
assertThat(widget.binding.exArbitraryFileAnswerText.visibility, equalTo(View.VISIBLE))
136-
assertThat(widget.binding.exArbitraryFileAnswerText.text, equalTo(initialAnswer.displayText))
129+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.VISIBLE))
130+
assertThat(widgetAnswer.getAnswer(), equalTo(initialAnswer.displayText))
137131
}
138132

139133
@Test
@@ -143,7 +137,7 @@ class ExArbitraryFileWidgetTest : FileWidgetTest<ExArbitraryFileWidget?>() {
143137

144138
val widget = widget!!
145139
assertThat(widget.binding.exArbitraryFileButton.visibility, equalTo(View.GONE))
146-
assertThat(widget.binding.exArbitraryFileAnswerText.visibility, equalTo(View.VISIBLE))
147-
assertThat(widget.binding.exArbitraryFileAnswerText.text, equalTo(initialAnswer.displayText))
140+
assertThat(widget.binding.answerViewContainer.visibility, equalTo(View.VISIBLE))
141+
assertThat(widgetAnswer.getAnswer(), equalTo(initialAnswer.displayText))
148142
}
149143
}

0 commit comments

Comments
 (0)