Skip to content

fix name collision #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2025
Merged

fix name collision #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Drop-In/src/androidTest/java/com/braintreepayments/api/GraphQLQueryHelperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.braintreepayments.api
import android.content.res.Resources.NotFoundException
import androidx.test.core.app.ApplicationProvider
import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
import com.braintreepayments.api.GraphQLQueryHelper.getQuery
import com.braintreepayments.api.GraphQLQueryHelper2.getQuery
import org.junit.Test
import org.junit.runner.RunWith

Expand Down
2 changes: 1 addition & 1 deletion ...aintreepayments/api/GraphQLQueryHelper.kt → ...intreepayments/api/GraphQLQueryHelper2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import android.content.res.Resources
import java.io.IOException
import java.io.InputStream

internal object GraphQLQueryHelper {
internal object GraphQLQueryHelper2 {
@JvmStatic
@Throws(Resources.NotFoundException::class, IOException::class)
fun getQuery(context: Context, queryResource: Int): String {
Expand Down
2 changes: 1 addition & 1 deletion Drop-In/src/main/java/com/braintreepayments/api/PaymentMethodClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void onAuthorizationResult(@Nullable Authorization authorization, @Nullab
.integration(braintreeClient.getIntegrationType())
.build());

base.put(GraphQLConstants.Keys.QUERY, GraphQLQueryHelper.getQuery(
base.put(GraphQLConstants.Keys.QUERY, GraphQLQueryHelper2.getQuery(
context, R.raw.delete_payment_method_mutation));
input.put(SINGLE_USE_TOKEN_ID, paymentMethodNonce.getString());
variables.put(INPUT, input);
Expand Down
3 changes: 1 addition & 2 deletions Drop-In/src/test/java/com/braintreepayments/api/PaymentMethodClientUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
Expand Down Expand Up @@ -379,7 +378,7 @@ public void deletePaymentMethodNonce_postToGraphQL()

JSONObject graphQlRequest = captor.getValue();

String expectedGraphQLQuery = GraphQLQueryHelper.getQuery(
String expectedGraphQLQuery = GraphQLQueryHelper2.getQuery(
ApplicationProvider.getApplicationContext(), R.raw.delete_payment_method_mutation);
assertEquals(expectedGraphQLQuery, graphQlRequest.getString(GraphQLConstants.Keys.QUERY));

Expand Down