Update DatabaseTest (not passing yet)

2 files changed, 43 insertions, 56 deletions

diff --git a/app/src/androidTest/java/email/schaal/ocreader/DatabaseTest.kt b/app/src/androidTest/java/email/schaal/ocreader/DatabaseTest.kt
index 7542999a..4e0af43b 100644
--- a/app/src/androidTest/java/email/schaal/ocreader/DatabaseTest.kt
+++ b/app/src/androidTest/java/email/schaal/ocreader/DatabaseTest.kt
@@ -19,8 +19,8 @@
  */
 package email.schaal.ocreader
 
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.ActivityTestRule
 import email.schaal.ocreader.database.Queries
 import email.schaal.ocreader.database.model.Feed
 import email.schaal.ocreader.database.model.Folder
@@ -35,8 +35,8 @@ import org.junit.runner.RunWith
  */
 @RunWith(AndroidJUnit4::class)
 class DatabaseTest {
-    @Rule
-    var activityTestRule = ActivityTestRule(ListActivity::class.java)
+    @get:Rule
+    var activityTestRule = ActivityScenarioRule(ListActivity::class.java)
 
     @Before
     fun setUp() {
@@ -57,60 +57,44 @@ class DatabaseTest {
 
     @Test
     fun testFolderInsert() {
-        var realm: Realm? = null
-        try {
-            val folder = TestGenerator.testFolder
-            realm = Realm.getDefaultInstance()
+        Realm.getDefaultInstance().use { realm ->
             realm.beginTransaction()
-            folder.insert(realm)
+            TestGenerator.testFolder.insert(realm)
             realm.commitTransaction()
-            val dbFolder = Folder.get(realm, 1)
-            Assert.assertNotNull(dbFolder)
-            Assert.assertEquals(dbFolder?.name, TestGenerator.FOLDER_TITLE)
-        } finally {
-            Assert.assertNotNull(realm)
-            realm?.close()
+            Folder.get(realm, 1).let { dbFolder ->
+                Assert.assertNotNull(dbFolder)
+                Assert.assertEquals(dbFolder?.name, TestGenerator.FOLDER_TITLE)
+            }
         }
     }
 
     @Test
     fun testFeedInsert() {
-        var realm: Realm? = null
-        try {
-            var feed: Feed? = TestGenerator.testFeed
-            realm = Realm.getDefaultInstance()
+        Realm.getDefaultInstance().use { realm ->
             realm.beginTransaction()
-            feed?.insert(realm)
+            TestGenerator.testFeed.insert(realm)
             realm.commitTransaction()
-            feed = Feed.get(realm, 1)
-            Assert.assertNotNull(feed)
-            Assert.assertEquals(feed!!.name, TestGenerator.FEED_TITLE)
-        } finally {
-            Assert.assertNotNull(realm)
-            realm!!.close()
+            Feed.get(realm, 1).let { feed ->
+                Assert.assertNotNull(feed)
+                Assert.assertEquals(feed?.name, TestGenerator.FEED_TITLE)
+            }
         }
     }
 
     @Test
     fun testItemInsert() {
-        var realm: Realm? = null
-        try {
-            val feed: Feed? = TestGenerator.testFeed
-            var item: Item? = TestGenerator.testItem
-            realm = Realm.getDefaultInstance()
+        Realm.getDefaultInstance().use { realm ->
             realm.beginTransaction()
-            feed?.insert(realm)
-            item?.insert(realm)
+            TestGenerator.testFeed.insert(realm)
+            TestGenerator.testItem.insert(realm)
             realm.commitTransaction()
-            item = realm.where<Item>().findFirst()
-            Assert.assertEquals(item!!.id, 1)
-            Assert.assertEquals(item.title, TestGenerator.ITEM_TITLE)
-            Assert.assertEquals(item.body, TestGenerator.BODY)
-            Assert.assertEquals(item.author, TestGenerator.AUTHOR)
-            Assert.assertNull(item.enclosureLink)
-        } finally {
-            Assert.assertNotNull(realm)
-            realm?.close()
+            realm.where<Item>().findFirst().let { item ->
+                Assert.assertEquals(item?.id, 1)
+                Assert.assertEquals(item?.title, TestGenerator.ITEM_TITLE)
+                Assert.assertEquals(item?.body, TestGenerator.BODY)
+                Assert.assertEquals(item?.author, TestGenerator.AUTHOR)
+                Assert.assertNull(item?.enclosureLink)
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/email/schaal/ocreader/TestGenerator.kt b/app/src/androidTest/java/email/schaal/ocreader/TestGenerator.kt
index 27ca6319..5379f864 100644
--- a/app/src/androidTest/java/email/schaal/ocreader/TestGenerator.kt
+++ b/app/src/androidTest/java/email/schaal/ocreader/TestGenerator.kt
@@ -14,35 +14,38 @@ internal object TestGenerator {
     const val ITEM_TITLE = "TestItemTitle"
     const val BODY = "<p>TestBody</p>"
     const val AUTHOR = "TestAuthor"
+
     val testFolder: Folder
         get() {
-            val folder = Folder(1)
-            folder.name = FOLDER_TITLE
-            return folder
+            return Folder().apply {
+                id = 1L
+                name = FOLDER_TITLE
+            }
         }
 
     val testFeed: Feed
         get() = getTestFeed(1)
 
     fun getTestFeed(id: Long): Feed {
-        val feed = Feed(id)
-        feed.folderId = 0L
-        feed.name = FEED_TITLE
-        return feed
+        return Feed().apply {
+            this.id = id
+            folderId = 0L
+            name = FEED_TITLE
+        }
     }
 
     val testItem: Item
         get() = getTestItem(1)
 
     fun getTestItem(id: Long): Item {
-        return Item().also {
-            it.id = id
-            it.title = ITEM_TITLE
-            it.body = BODY
-            it.author = AUTHOR
-            it.feedId = 1
-            it.feed = testFeed
-            it.lastModified = Date().time / 1000
+        return Item().apply {
+            this.id = id
+            title = ITEM_TITLE
+            body = BODY
+            author = AUTHOR
+            feedId = 1
+            feed = testFeed
+            lastModified = Date()
         }
     }
 }
\ No newline at end of file