Misc (#140)

* Nullify task

* Rewrite circle view

* Add better encapsulation

* Update annotations

* Update kpref annotations

* Begin writing tests for color picker

* Add color selection tests

* Update changelog

* Cleanup

1 files changed, 8 insertions, 8 deletions

diff --git a/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt b/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt
index c2ffa8a..b396985 100644
--- a/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt
+++ b/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt
@@ -19,10 +19,10 @@ class FaqTest {
     fun simpleTest() {
         InstrumentationRegistry.getTargetContext().kauParseFaq(R.xml.test_faq) { data ->
             assertEquals(2, data.size, "FAQ size is incorrect")
-            assertEquals("1. This is a question", data.first().first.toString(), "First question does not match")
-            assertEquals("This is an answer", data.first().second.toString(), "First answer does not match")
-            assertEquals("2. This is another question", data.last().first.toString(), "Second question does not match")
-            assertEquals("This is another answer", data.last().second.toString(), "Second answer does not match")
+            assertEquals("1. This is a question", data.first().question.toString(), "First question does not match")
+            assertEquals("This is an answer", data.first().answer.toString(), "First answer does not match")
+            assertEquals("2. This is another question", data.last().question.toString(), "Second question does not match")
+            assertEquals("This is another answer", data.last().answer.toString(), "Second answer does not match")
         }
     }
 
@@ -30,10 +30,10 @@ class FaqTest {
     fun withoutNumbering() {
         InstrumentationRegistry.getTargetContext().kauParseFaq(R.xml.test_faq, false) { data ->
             assertEquals(2, data.size, "FAQ size is incorrect")
-            assertEquals("This is a question", data.first().first.toString(), "First question does not match")
-            assertEquals("This is an answer", data.first().second.toString(), "First answer does not match")
-            assertEquals("This is another question", data.last().first.toString(), "Second question does not match")
-            assertEquals("This is another answer", data.last().second.toString(), "Second answer does not match")
+            assertEquals("This is a question", data.first().question.toString(), "First question does not match")
+            assertEquals("This is an answer", data.first().answer.toString(), "First answer does not match")
+            assertEquals("This is another question", data.last().question.toString(), "Second question does not match")
+            assertEquals("This is another answer", data.last().answer.toString(), "Second answer does not match")
         }
     }