Fix some tests

app/src/test/java/com/nytimes/android/sample/StoreIntegrationTest.kt

@@ -1,41 +1,28 @@
 package com.nytimes.android.sample
 
-import com.nytimes.android.external.store3.base.Fetcher
 import com.nytimes.android.external.store3.base.impl.BarCode
 import com.nytimes.android.external.store3.base.impl.Store
 import com.nytimes.android.external.store3.base.impl.StoreBuilder
 import junit.framework.Assert.assertEquals
 import kotlinx.coroutines.runBlocking
-import org.junit.Before
 import org.junit.Test
 import java.util.concurrent.atomic.AtomicInteger
 
 class StoreIntegrationTest {
 
-    lateinit var store: Store<String, BarCode>
+    private val atomicInt = AtomicInteger(0)
-    val atomicInt = AtomicInteger(0)
+
-    @Before
+    private val store: Store<String, BarCode> = StoreBuilder.barcode<String>()
-    @Throws(Exception::class)
+            .fetcher { atomicInt.incrementAndGet().toString() }
-    fun setUp() {
+            .open()
-        store = StoreBuilder.barcode<String>()
-                .fetcher(fetcher = object : Fetcher<String, BarCode> {
-                    override suspend fun fetch(key: BarCode): String {
-                        return atomicInt.incrementAndGet().toString()
-                    }
-                })
-                .open()
-    }
 
     @Test
-    @Throws(Exception::class)
     fun testRepeatedGet() {
         val barcode = BarCode.empty()
         runBlocking {
-            val first = store.get(barcode)
+            val first = store.fresh(barcode)
-            val same = store.fresh(barcode)
+            val same = store.get(barcode)
             assertEquals(first, same)
         }
     }
-
-
 }

filesystem/src/test/java/com/nytimes/android/external/fs3/SourceDiskDaoStoreTest.kt

@@ -33,7 +33,7 @@ class SourceDiskDaoStoreTest {
                 .open()
 
         val foo = Foo()
-        foo.bar = barCode.getKey()
+        foo.bar = barCode.key
 
         val sourceData = Gson().toJson(foo)
         val source = source(sourceData)

filesystem/src/test/java/com/nytimes/android/external/fs3/StoreNetworkBeforeStaleTest.kt

@@ -31,7 +31,7 @@ class StoreNetworkBeforeStaleTest {
     @Test
     fun networkBeforeDiskWhenStale() = runBlocking<Unit> {
         whenever(fetcher.fetch(barCode))
-                .thenThrow(Exception())
+                .thenThrow(RuntimeException())
         whenever(persister.read(barCode))
                 .thenReturn(disk1)  //get should return from disk
         whenever(persister.getRecordState(barCode)).thenReturn(RecordState.STALE)

store/src/test/java/com/nytimes/android/external/store3/NoNetworkTest.kt

@@ -6,18 +6,14 @@ import com.nytimes.android.external.store3.base.impl.StoreBuilder
 import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.fail
-import org.junit.Before
 import org.junit.Test
 
 class NoNetworkTest {
-    private lateinit var store: Store<Any, BarCode>
+    private val store: Store<Any, BarCode> = StoreBuilder.barcode<Any>()
-
+            .fetcher {
-    @Before
+                throw EXCEPTION
-    fun setUp() {
+            }
-        store = StoreBuilder.barcode<Any>()
+            .open()
-                .fetcher { throw EXCEPTION }
-                .open()
-    }
 
     @Test
     fun testNoNetwork() = runBlocking<Unit> {
@@ -25,7 +21,7 @@ class NoNetworkTest {
             store.get(BarCode("test", "test"))
             fail("Exception not thrown")
         } catch (e: Exception) {
-            assertThat(e).isEqualTo(EXCEPTION)
+            assertThat(e.message).isEqualTo(EXCEPTION.message)
         }
     }
 
@@ -38,6 +34,6 @@ class NoNetworkTest {
 //    }
 
     companion object {
-        private val EXCEPTION = RuntimeException()
+        private val EXCEPTION = RuntimeException("abc")
     }
 }