Merge pull request #128 from joreilly/apollo_4

Apollo 4

Author: joreilly

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ coroutines = "1.7.3"
 androidGradlePlugin = "8.1.4"
 koin = "3.5.0"
 koinCompose = "3.5.0"
-apollo = "3.8.2"
+apollo = "4.0.0-alpha.2"
 kmpNativeCoroutines = "1.0.0-ALPHA-18"
 
 androidxActivity = "1.8.0"

shared/build.gradle.kts

@@ -61,7 +61,7 @@ apollo {
         packageName.set("dev.johnoreilly.starwars")
         codegenModels.set("operationBased")
         generateSchema.set(true)
-        generateTestBuilders.set(true)
+        generateDataBuilders.set(true)
     }
 }
 

shared/src/commonTest/kotlin/dev/johnoreilly/starwars/shared/MockResponses.kt

@@ -1,59 +1,49 @@
 package dev.johnoreilly.starwars.shared
 
-import com.apollographql.apollo3.api.json.buildJsonString
-import com.apollographql.apollo3.api.json.writeAny
-import com.apollographql.apollo3.api.json.writeObject
-import dev.johnoreilly.starwars.test.GetAllFilmsQuery_TestBuilder
-import dev.johnoreilly.starwars.test.GetAllPeopleQuery_TestBuilder
+import dev.johnoreilly.starwars.GetAllFilmsQuery
+import dev.johnoreilly.starwars.GetAllPeopleQuery
+import dev.johnoreilly.starwars.type.buildFilm
+import dev.johnoreilly.starwars.type.buildFilmsConnection
+import dev.johnoreilly.starwars.type.buildPeopleConnection
+import dev.johnoreilly.starwars.type.buildPerson
+import dev.johnoreilly.starwars.type.buildPlanet
 
-val getAllPeopleMockResponse = buildJsonString {
-  writeObject {
-    name("data")
-    writeAny(
-      GetAllPeopleQuery_TestBuilder.DataBuilder().apply {
-        allPeople = allPeople {
-          people = listOf(
-            person {
-              id = "1"
-              name = "Person 1"
-              homeworld = homeworld {
-                name = "Home World 1"
-              }
+
+val getAllPeopleMockResponse = GetAllPeopleQuery.Data {
+    allPeople = buildPeopleConnection {
+        people = listOf(
+            buildPerson {
+                id = "1"
+                name = "Person 1"
+                homeworld = buildPlanet {
+                  name = "Home World 1"
+                }
             },
-            person {
-              id = "2"
-              name = "Person 2"
-              homeworld = homeworld {
-                name = "Home World 2"
-              }
+            buildPerson {
+                id = "2"
+                name = "Person 2"
+                homeworld = buildPlanet {
+                  name = "Home World 2"
+                }
             }
-          )
-        }
-      }.build()
-    )
-  }
+        )
+    }
 }
 
-val getAllFilmsMockResponse = buildJsonString {
-  writeObject {
-    name("data")
-    writeAny(
-      GetAllFilmsQuery_TestBuilder.DataBuilder().apply {
-        allFilms = allFilms {
-          films = listOf(
-            film {
-              id = "1"
-              title = "Film 1"
-              director = "Director 1"
+val getAllFilmsMockResponse = GetAllFilmsQuery.Data {
+    allFilms = buildFilmsConnection {
+        films = listOf(
+            buildFilm {
+                id = "1"
+                title = "Film 1"
+                director = "Director 1"
             },
-            film {
-              id = "2"
-              title = "Film 2"
-              director = "Director 1"
+            buildFilm {
+                id = "2"
+                title = "Film 2"
+                director = "Director 1"
             }
-          )
-        }
-      }.build()
-    )
-  }
-}
+        )
+    }
+}
+

shared/src/commonTest/kotlin/dev/johnoreilly/starwars/shared/StarWarsRepositoryTest.kt

@@ -2,11 +2,12 @@ package dev.johnoreilly.starwars.shared
 
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.annotations.ApolloExperimental
+import com.apollographql.apollo3.api.toResponseJson
 import com.apollographql.apollo3.mockserver.MockResponse
 import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.testing.runTest
 import dev.johnoreilly.starwars.shared.di.commonModule
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
 import org.koin.core.context.startKoin
 import org.koin.dsl.module
 import org.koin.test.KoinTest
@@ -38,14 +39,14 @@ class StarWarsRepositoryTest: KoinTest {
     fun testStarWarsRepository() = runTest {
         mockServerUrl = mockServer.url()
 
-        mockServer.enqueue(MockResponse(body = getAllPeopleMockResponse))
+        mockServer.enqueue(MockResponse.Builder().body(getAllPeopleMockResponse.toResponseJson()).build())
         val people = repo.people.first()
         assertEquals(2, people.size)
         assertEquals("Person 1", people[0].name)
         assertEquals("Home World 1", people[0].homeworld.name)
         println(people)
 
-        mockServer.enqueue(MockResponse(body = getAllFilmsMockResponse))
+        mockServer.enqueue(MockResponse.Builder().body(getAllFilmsMockResponse.toResponseJson()).build())
         val films = repo.films.first()
         assertEquals(2, films.size)
         assertEquals("Film 1", films[0].title)