Skip to content
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

Capitalize currency code in GooglePayJsonFactory #2462

Merged
merged 1 commit into from
May 11, 2020
Merged

Capitalize currency code in GooglePayJsonFactory #2462

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
4 changes: 2 additions & 2 deletions stripe/src/main/java/com/stripe/android/GooglePayJsonFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class GooglePayJsonFactory constructor(
transactionInfo: TransactionInfo
): JSONObject {
return JSONObject()
.put("currencyCode", transactionInfo.currencyCode)
.put("currencyCode", transactionInfo.currencyCode.toUpperCase(Locale.ROOT))
.put("totalPriceStatus", transactionInfo.totalPriceStatus.code)
.apply {
transactionInfo.countryCode?.let {
Expand Down Expand Up @@ -381,7 +381,7 @@ class GooglePayJsonFactory constructor(
internal val merchantName: String? = null
) : Parcelable

companion object {
private companion object {
private const val API_VERSION = 2
private const val API_VERSION_MINOR = 0

Expand Down
15 changes: 15 additions & 0 deletions stripe/src/test/java/com/stripe/android/GooglePayJsonFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,21 @@ class GooglePayJsonFactoryTest {
.isEqualTo("US")
}

@Test
fun currencyCode_shouldBeCapitalized() {
val createPaymentDataRequestJson = factory.createPaymentDataRequest(
transactionInfo = GooglePayJsonFactory.TransactionInfo(
currencyCode = "usd",
totalPriceStatus = GooglePayJsonFactory.TransactionInfo.TotalPriceStatus.Final
)
)
val currencyCode = createPaymentDataRequestJson
.getJSONObject("transactionInfo")
.getString("currencyCode")
assertThat(currencyCode)
.isEqualTo("USD")
}

@Test
fun shippingAddressAllowedCountryCodes_shouldBeCapitalized() {
val createPaymentDataRequestJson = factory.createPaymentDataRequest(
Expand Down