@@ -23,7 +23,6 @@ import com.google.android.gms.tasks.Tasks
2323import com.google.firebase.appcheck.AppCheckProvider
2424import com.google.firebase.appcheck.AppCheckProviderFactory
2525import com.google.firebase.appcheck.FirebaseAppCheck
26- import com.google.firebase.dataconnect.core.FirebaseDataConnectInternal
2726import com.google.firebase.dataconnect.generated.GeneratedConnector
2827import com.google.firebase.dataconnect.generated.GeneratedMutation
2928import com.google.firebase.dataconnect.generated.GeneratedQuery
@@ -32,6 +31,8 @@ import com.google.firebase.dataconnect.testutil.DataConnectIntegrationTestBase
3231import com.google.firebase.dataconnect.testutil.DataConnectTestAppCheckToken
3332import com.google.firebase.dataconnect.testutil.FirebaseAuthBackend
3433import com.google.firebase.dataconnect.testutil.InProcessDataConnectGrpcServer
34+ import com.google.firebase.dataconnect.testutil.awaitAppCheckReady
35+ import com.google.firebase.dataconnect.testutil.awaitAuthReady
3536import com.google.firebase.dataconnect.testutil.getFirebaseAppIdFromStrings
3637import com.google.firebase.dataconnect.testutil.newInstance
3738import com.google.firebase.dataconnect.util.SuspendingLazy
@@ -138,7 +139,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
138139 fun executeQueryShouldNotSendAuthMetadataWhenNotLoggedIn () = runTest {
139140 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
140141 val dataConnect = dataConnectFactory.newInstance(grpcServer)
141- ( dataConnect as FirebaseDataConnectInternal ) .awaitAuthReady()
142+ dataConnect.awaitAuthReady()
142143 val queryRef = dataConnect.query(" qryfyk7yfppfe" , Unit , serializer<Unit >(), serializer<Unit >())
143144 val metadatasJob = async { grpcServer.metadatas.first() }
144145
@@ -151,7 +152,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
151152 fun executeMutationShouldNotSendAuthMetadataWhenNotLoggedIn () = runTest {
152153 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
153154 val dataConnect = dataConnectFactory.newInstance(grpcServer)
154- ( dataConnect as FirebaseDataConnectInternal ) .awaitAuthReady()
155+ dataConnect.awaitAuthReady()
155156 val mutationRef =
156157 dataConnect.mutation(" mutckjpte9v9j" , Unit , serializer<Unit >(), serializer<Unit >())
157158 val metadatasJob = async { grpcServer.metadatas.first() }
@@ -165,7 +166,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
165166 fun executeQueryShouldSendAuthMetadataWhenLoggedIn () = runTest {
166167 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
167168 val dataConnect = dataConnectFactory.newInstance(grpcServer)
168- ( dataConnect as FirebaseDataConnectInternal ) .awaitAuthReady()
169+ dataConnect.awaitAuthReady()
169170 val queryRef = dataConnect.query(" qryyarwrxe2fv" , Unit , serializer<Unit >(), serializer<Unit >())
170171 val metadatasJob = async { grpcServer.metadatas.first() }
171172 firebaseAuthSignIn(dataConnect)
@@ -179,7 +180,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
179180 fun executeMutationShouldSendAuthMetadataWhenLoggedIn () = runTest {
180181 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
181182 val dataConnect = dataConnectFactory.newInstance(grpcServer)
182- ( dataConnect as FirebaseDataConnectInternal ) .awaitAuthReady()
183+ dataConnect.awaitAuthReady()
183184 val mutationRef =
184185 dataConnect.mutation(" mutayn7as5k7d" , Unit , serializer<Unit >(), serializer<Unit >())
185186 val metadatasJob = async { grpcServer.metadatas.first() }
@@ -194,7 +195,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
194195 fun executeQueryShouldNotSendAuthMetadataAfterLogout () = runTest {
195196 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
196197 val dataConnect = dataConnectFactory.newInstance(grpcServer)
197- ( dataConnect as FirebaseDataConnectInternal ) .awaitAuthReady()
198+ dataConnect.awaitAuthReady()
198199 val queryRef = dataConnect.query(" qryyarwrxe2fv" , Unit , serializer<Unit >(), serializer<Unit >())
199200 val metadatasJob1 = async { grpcServer.metadatas.first() }
200201 val metadatasJob2 = async { grpcServer.metadatas.take(2 ).last() }
@@ -212,7 +213,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
212213 fun executeMutationShouldNotSendAuthMetadataAfterLogout () = runTest {
213214 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
214215 val dataConnect = dataConnectFactory.newInstance(grpcServer)
215- ( dataConnect as FirebaseDataConnectInternal ) .awaitAuthReady()
216+ dataConnect.awaitAuthReady()
216217 val mutationRef =
217218 dataConnect.mutation(" mutvw945ag3vv" , Unit , serializer<Unit >(), serializer<Unit >())
218219 val metadatasJob1 = async { grpcServer.metadatas.first() }
@@ -233,7 +234,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
233234 // appcheck token is sent at all.
234235 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
235236 val dataConnect = dataConnectFactory.newInstance(grpcServer)
236- ( dataConnect as FirebaseDataConnectInternal ) .awaitAppCheckReady()
237+ dataConnect.awaitAppCheckReady()
237238 val queryRef = dataConnect.query(" qrybbeekpkkck" , Unit , serializer<Unit >(), serializer<Unit >())
238239 val metadatasJob = async { grpcServer.metadatas.first() }
239240
@@ -248,7 +249,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
248249 // appcheck token is sent at all.
249250 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
250251 val dataConnect = dataConnectFactory.newInstance(grpcServer)
251- ( dataConnect as FirebaseDataConnectInternal ) .awaitAppCheckReady()
252+ dataConnect.awaitAppCheckReady()
252253 val mutationRef =
253254 dataConnect.mutation(" mutbs7hhxk39c" , Unit , serializer<Unit >(), serializer<Unit >())
254255 val metadatasJob = async { grpcServer.metadatas.first() }
@@ -262,7 +263,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
262263 fun executeQueryShouldSendAppCheckMetadataWhenAppCheckIsEnabled () = runTest {
263264 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
264265 val dataConnect = dataConnectFactory.newInstance(grpcServer)
265- ( dataConnect as FirebaseDataConnectInternal ) .awaitAppCheckReady()
266+ dataConnect.awaitAppCheckReady()
266267 val queryRef = dataConnect.query(" qryyarwrxe2fv" , Unit , serializer<Unit >(), serializer<Unit >())
267268 val metadatasJob = async { grpcServer.metadatas.first() }
268269 val appCheck = FirebaseAppCheck .getInstance(dataConnect.app)
@@ -277,7 +278,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
277278 fun executeMutationShouldSendAppCheckMetadataWhenAppCheckIsEnabled () = runTest {
278279 val grpcServer = inProcessDataConnectGrpcServer.newInstance()
279280 val dataConnect = dataConnectFactory.newInstance(grpcServer)
280- ( dataConnect as FirebaseDataConnectInternal ) .awaitAppCheckReady()
281+ dataConnect.awaitAppCheckReady()
281282 val mutationRef =
282283 dataConnect.mutation(" mutz4hzqzpgb4" , Unit , serializer<Unit >(), serializer<Unit >())
283284 val metadatasJob = async { grpcServer.metadatas.first() }
0 commit comments