1 files changed, 30 insertions, 23 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 f9ce24b..7ec2a41 100644
--- a/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt
+++ b/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt
@@ -1,8 +1,25 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ca.allanwang.kau.xml
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.MediumTest
-import android.support.test.runner.AndroidJUnit4
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import ca.allanwang.kau.test.R
 import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.test.assertEquals
@@ -14,26 +31,16 @@ import kotlin.test.assertEquals
 @MediumTest
 class FaqTest {
 
-    @Test
-    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().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")
-        }
-    }
+    val context: Context
+        get() = ApplicationProvider.getApplicationContext<Context>()
 
     @Test
-    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().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")
-        }
+    fun simpleTest() {
+        val data = context.kauParseFaq(R.xml.test_faq, false)
+        assertEquals(2, data.size, "FAQ size is incorrect")
+        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")
     }
-
-}
\ No newline at end of file
+}