Move VisaCheckout files into VisaCheckout module.

Signed-off-by: Steven Shropshire <[email protected]>
braintree · Mar 8, 2021 · c09e80a · c09e80a
1 parent 7601548
commit c09e80a
Show file tree

Hide file tree

Showing 39 changed files with 7 additions and 412 deletions.
diff --git a/ZZZ/.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md b/ZZZ/.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md
diff --git a/ZZZ/.travis.yml → .travis.yml b/ZZZ/.travis.yml → .travis.yml
diff --git a/ZZZ/CHANGELOG.md → CHANGELOG.md b/ZZZ/CHANGELOG.md → CHANGELOG.md
diff --git a/ZZZ/CONTRIBUTING.md → CONTRIBUTING.md b/ZZZ/CONTRIBUTING.md → CONTRIBUTING.md
diff --git a/ZZZ/LICENSE → LICENSE b/ZZZ/LICENSE → LICENSE
diff --git a/ZZZ/README.md → README.md b/ZZZ/README.md → README.md
diff --git a/ZZZ/Rakefile → Rakefile b/ZZZ/Rakefile → Rakefile
diff --git a/VisaCheckout/.gitignore b/VisaCheckout/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/ZZZ/VisaCheckout/build.gradle → VisaCheckout/build.gradle b/ZZZ/VisaCheckout/build.gradle → VisaCheckout/build.gradle
@@ -32,10 +32,11 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.braintreepayments.api:braintree-core:4.0.0-SNAPSHOT'
+    implementation project(':BraintreeCore')
 
     implementation(group: 'com.visa.checkout', name: 'visacheckout-android-sdk', version: '6.6.1', ext: 'aar')
 
+    testImplementation project(':TestUtils')
     testImplementation 'com.google.android.gms:play-services-wallet:16.0.1'
     testImplementation 'androidx.test:core:1.1.0'
     testImplementation 'androidx.test:runner:1.1.1'

diff --git a/ZZZ/VisaCheckout/proguard.pro → VisaCheckout/proguard.pro b/ZZZ/VisaCheckout/proguard.pro → VisaCheckout/proguard.pro
diff --git a/...VisaCheckout/src/main/AndroidManifest.xml → VisaCheckout/src/main/AndroidManifest.xml b/...VisaCheckout/src/main/AndroidManifest.xml → VisaCheckout/src/main/AndroidManifest.xml
diff --git a/...m/braintreepayments/api/VisaCheckout.java → ...m/braintreepayments/api/VisaCheckout.java b/...m/braintreepayments/api/VisaCheckout.java → ...m/braintreepayments/api/VisaCheckout.java
diff --git a/...treepayments/api/VisaCheckoutBuilder.java → ...treepayments/api/VisaCheckoutBuilder.java b/...treepayments/api/VisaCheckoutBuilder.java → ...treepayments/api/VisaCheckoutBuilder.java
diff --git a/...ntreepayments/api/VisaCheckoutButton.java → ...ntreepayments/api/VisaCheckoutButton.java b/...ntreepayments/api/VisaCheckoutButton.java → ...ntreepayments/api/VisaCheckoutButton.java
diff --git a/...CheckoutCreateProfileBuilderCallback.java → ...CheckoutCreateProfileBuilderCallback.java b/...CheckoutCreateProfileBuilderCallback.java → ...CheckoutCreateProfileBuilderCallback.java
diff --git a/...VisaCheckoutOnActivityResultCallback.java → ...VisaCheckoutOnActivityResultCallback.java b/...VisaCheckoutOnActivityResultCallback.java → ...VisaCheckoutOnActivityResultCallback.java
diff --git a/...nts/api/VisaCheckoutTokenizeCallback.java → ...nts/api/VisaCheckoutTokenizeCallback.java b/...nts/api/VisaCheckoutTokenizeCallback.java → ...nts/api/VisaCheckoutTokenizeCallback.java
diff --git a/...s/layout/visa_checkout_button_wrapper.xml → ...s/layout/visa_checkout_button_wrapper.xml b/...s/layout/visa_checkout_button_wrapper.xml → ...s/layout/visa_checkout_button_wrapper.xml
diff --git a/...res/configuration/with_visa_checkout.json → ...res/configuration/with_visa_checkout.json b/...res/configuration/with_visa_checkout.json → ...res/configuration/with_visa_checkout.json
diff --git a/...yment_methods/visa_checkout_response.json → ...yment_methods/visa_checkout_response.json b/...yment_methods/visa_checkout_response.json → ...yment_methods/visa_checkout_response.json
diff --git a/...ents/api/VisaCheckoutBuilderUnitTest.java → ...ents/api/VisaCheckoutBuilderUnitTest.java b/...ents/api/VisaCheckoutBuilderUnitTest.java → ...ents/api/VisaCheckoutBuilderUnitTest.java
diff --git a/...reepayments/api/VisaCheckoutUnitTest.java → ...reepayments/api/VisaCheckoutUnitTest.java b/...reepayments/api/VisaCheckoutUnitTest.java → ...reepayments/api/VisaCheckoutUnitTest.java
@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import static com.braintreepayments.api.FixturesHelper.stringFromFixture;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 import static org.mockito.Matchers.isNull;
@@ -45,8 +44,7 @@ public class VisaCheckoutUnitTest {
 
     @Before
     public void setup() throws Exception {
-        JSONObject visaConfiguration = new JSONObject(stringFromFixture("configuration/with_visa_checkout.json"));
-        mConfigurationWithVisaCheckout = Configuration.fromJson(visaConfiguration.toString());
+        mConfigurationWithVisaCheckout = Configuration.fromJson(Fixtures.CONFIGURATION_WITH_VISA_CHECKOUT);
 
         visaPaymentSummary = PowerMockito.mock(VisaPaymentSummary.class);
         when(visaPaymentSummary.getCallId()).thenReturn("stubbedCallId");
@@ -144,7 +142,7 @@ public void onResult(ProfileBuilder profileBuilder, Exception error) {
     @Test
     public void tokenize_whenSuccessful_postsVisaPaymentMethodNonce() throws Exception {
         VisaCheckoutNonce visaCheckoutNonce =
-            VisaCheckoutNonce.fromJson(stringFromFixture("payment_methods/visa_checkout_response.json"));
+                VisaCheckoutNonce.fromJson(Fixtures.PAYMENT_METHODS_VISA_CHECKOUT_RESPONSE);
 
         TokenizationClient tokenizationClient = new MockTokenizationClientBuilder()
                 .successNonce(visaCheckoutNonce)
@@ -164,7 +162,7 @@ public void tokenize_whenSuccessful_postsVisaPaymentMethodNonce() throws Excepti
     @Test
     public void tokenize_whenSuccessful_sendsAnalyticEvent() throws Exception {
         VisaCheckoutNonce visaCheckoutNonce =
-                VisaCheckoutNonce.fromJson(stringFromFixture("payment_methods/visa_checkout_response.json"));
+                VisaCheckoutNonce.fromJson(Fixtures.PAYMENT_METHODS_VISA_CHECKOUT_RESPONSE);
 
         TokenizationClient tokenizationClient = new MockTokenizationClientBuilder()
                 .successNonce(visaCheckoutNonce)

diff --git a/...o/configuration/MockitoConfiguration.java → ...o/configuration/MockitoConfiguration.java b/...o/configuration/MockitoConfiguration.java → ...o/configuration/MockitoConfiguration.java
diff --git a/...src/test/resources/robolectric.properties → ...src/test/resources/robolectric.properties b/...src/test/resources/robolectric.properties → ...src/test/resources/robolectric.properties
diff --git a/ZZZ/ACKNOWLEDGEMENT.md b/ZZZ/ACKNOWLEDGEMENT.md
diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/FixturesHelper.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/FixturesHelper.java
diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/JSONBuilder.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/JSONBuilder.java
diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockBraintreeClientBuilder.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockBraintreeClientBuilder.java
diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockTokenizationClientBuilder.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockTokenizationClientBuilder.java
diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/TestActivity.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/TestActivity.java