Skip to content

Commit 3e37206

Browse files
committed
Fix tests
1 parent ee71faf commit 3e37206

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ChartDataTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import org.junit.Test
1212
class ChartDataTest {
1313
@Test
1414
fun testDynamicChartData() {
15-
val entries1: MutableList<Entry> = ArrayList()
15+
val entries1: MutableList<Entry?> = ArrayList()
1616
entries1.add(Entry(10f, 10f))
1717
entries1.add(Entry(15f, -2f))
1818
entries1.add(Entry(21f, 50f))
1919

2020
val set1 = ScatterDataSet(entries1, "")
2121

22-
val entries2: MutableList<Entry> = ArrayList()
22+
val entries2: MutableList<Entry?> = ArrayList()
2323
entries2.add(Entry(-1f, 10f))
2424
entries2.add(Entry(10f, 2f))
2525
entries2.add(Entry(20f, 5f))
@@ -66,7 +66,7 @@ class ChartDataTest {
6666
Assert.assertEquals(-100f, data.getYMin(YAxis.AxisDependency.RIGHT), 0.01f)
6767
Assert.assertEquals(100f, data.getYMax(YAxis.AxisDependency.RIGHT), 0.01f)
6868

69-
val entries3: MutableList<Entry> = ArrayList()
69+
val entries3: MutableList<Entry?> = ArrayList()
7070
entries3.add(Entry(0f, 200f))
7171
entries3.add(Entry(0f, -50f))
7272

@@ -96,7 +96,7 @@ class ChartDataTest {
9696

9797
Assert.assertEquals(0, lineData.dataSetCount)
9898

99-
val lineEntries1: MutableList<Entry> = ArrayList()
99+
val lineEntries1: MutableList<Entry?> = ArrayList()
100100
lineEntries1.add(Entry(10f, 90f))
101101
lineEntries1.add(Entry(1000f, 1000f))
102102

@@ -120,7 +120,7 @@ class ChartDataTest {
120120
Assert.assertEquals(90f, lineData.getYMin(YAxis.AxisDependency.RIGHT), 0.01f)
121121
Assert.assertEquals(1000f, lineData.getYMax(YAxis.AxisDependency.RIGHT), 0.01f)
122122

123-
val lineEntries2: MutableList<Entry> = ArrayList()
123+
val lineEntries2: MutableList<Entry?> = ArrayList()
124124
lineEntries2.add(Entry(-1000f, 2000f))
125125
lineEntries2.add(Entry(2000f, -3000f))
126126

MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/DataSetTest.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.junit.Test
99
class DataSetTest {
1010
@Test
1111
fun testCalcMinMax() {
12-
val entries: MutableList<Entry> = ArrayList()
12+
val entries: MutableList<Entry?> = ArrayList()
1313
entries.add(Entry(10f, 10f))
1414
entries.add(Entry(15f, 2f))
1515
entries.add(Entry(21f, 5f))
@@ -45,7 +45,7 @@ class DataSetTest {
4545

4646
@Test
4747
fun testAddRemoveEntry() {
48-
val entries: MutableList<Entry> = ArrayList()
48+
val entries: MutableList<Entry?> = ArrayList()
4949
entries.add(Entry(10f, 10f))
5050
entries.add(Entry(15f, 2f))
5151
entries.add(Entry(21f, 5f))
@@ -129,7 +129,7 @@ class DataSetTest {
129129

130130
@Test
131131
fun testGetEntryForXValue() {
132-
val entries: MutableList<Entry> = ArrayList()
132+
val entries: MutableList<Entry?> = ArrayList()
133133
entries.add(Entry(10f, 10f))
134134
entries.add(Entry(15f, 5f))
135135
entries.add(Entry(21f, 5f))
@@ -169,7 +169,7 @@ class DataSetTest {
169169
fun testGetEntryForXValueWithDuplicates() {
170170
// sorted list of values (by x position)
171171

172-
val values: MutableList<Entry> = ArrayList()
172+
val values: MutableList<Entry?> = ArrayList()
173173
values.add(Entry(0f, 10f))
174174
values.add(Entry(1f, 20f))
175175
values.add(Entry(2f, 30f))
@@ -210,15 +210,15 @@ class DataSetTest {
210210
Assert.assertEquals(60f, closest.y, 0.01f)
211211

212212
var entries = set.getEntriesForXValue(4f)
213-
Assert.assertEquals(2, entries!!.size)
213+
Assert.assertEquals(2, entries.size)
214214
Assert.assertEquals(60f, entries[0]!!.y, 0.01f)
215215
Assert.assertEquals(70f, entries[1]!!.y, 0.01f)
216216

217217
entries = set.getEntriesForXValue(3.5f)
218-
Assert.assertEquals(0, entries!!.size)
218+
Assert.assertEquals(0, entries.size)
219219

220220
entries = set.getEntriesForXValue(2f)
221-
Assert.assertEquals(1, entries!!.size)
221+
Assert.assertEquals(1, entries.size)
222222
Assert.assertEquals(30f, entries[0]!!.y, 0.01f)
223223
}
224224
}

0 commit comments

Comments
 (0)