Fix merge shenanigans

Author: BoD

tests/cache-options/src/commonTest/kotlin/test/CacheOptionsTest.kt

@@ -7,9 +7,11 @@ import com.apollographql.apollo.api.Error
 import com.apollographql.apollo.api.Operation
 import com.apollographql.apollo.exception.CacheMissException
 import com.apollographql.cache.normalized.CacheManager
+import com.apollographql.cache.normalized.FetchPolicy
 import com.apollographql.cache.normalized.allowCachedErrors
 import com.apollographql.cache.normalized.allowCachedPartialResults
 import com.apollographql.cache.normalized.cacheManager
+import com.apollographql.cache.normalized.fetchPolicy
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.noCache
 import com.apollographql.cache.normalized.onlyIfCached
@@ -27,7 +29,6 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
 import kotlin.test.assertNull
-import kotlin.test.assertNull
 
 class CacheOptionsTest {
   private lateinit var mockServer: MockServer
@@ -178,7 +179,6 @@ class CacheOptionsTest {
     ApolloClient.Builder()
         .serverUrl(mockServer.url())
         .cacheManager(cacheManager)
-        .cachePolicyResponseMapper(cachePolicyResponseMapper)
         .build()
         .use { apolloClient ->
           val networkResult1 = apolloClient.query(UserByCategoryQuery(Category(0, "test")))
@@ -215,7 +215,9 @@ class CacheOptionsTest {
           )
 
           val cacheResult = apolloClient.query(UserByCategoryQuery(Category(1, "test2")))
-              .fetchPolicy(FetchPolicy.CacheOnly)
+              .onlyIfCached(true)
+              .allowCachedErrors(true)
+              .allowCachedPartialResults(true)
               .execute()
           assertEquals(
               networkResult2.data,
@@ -383,6 +385,7 @@ class CacheOptionsTest {
           val cacheResult = apolloClient.query(UsersQuery(listOf("1", "2", "3", "4", "5", "6", "7")))
               .onlyIfCached(true)
               .allowCachedErrors(true)
+              .allowCachedPartialResults(true)
               .execute()
           assertEquals(
               UsersQuery.Data(
@@ -485,7 +488,6 @@ class CacheOptionsTest {
     ApolloClient.Builder()
         .serverUrl(mockServer.url())
         .cacheManager(cacheManager)
-        .cachePolicyResponseMapper(cachePolicyResponseMapper)
         .build()
         .use { apolloClient ->
           val networkResult1 = apolloClient.query(AllUsersQuery())
@@ -521,7 +523,9 @@ class CacheOptionsTest {
           )
 
           val cacheResult1 = apolloClient.query(AllUsersQuery())
-              .fetchPolicy(FetchPolicy.CacheOnly)
+              .onlyIfCached(true)
+              .allowCachedErrors(true)
+              .allowCachedPartialResults(true)
               .execute()
           assertEquals(
               AllUsersQuery.Data(
@@ -554,6 +558,8 @@ class CacheOptionsTest {
 
           val cacheResult2 = apolloClient.query(UsersQuery(listOf("1", "2", "3", "4")))
               .fetchPolicy(FetchPolicy.CacheOnly)
+              .allowCachedErrors(true)
+              .allowCachedPartialResults(true)
               .execute()
           assertEquals(
               UsersQuery.Data(