From b53a5b2537aaedcbe546c03e82f1c79f10934653 Mon Sep 17 00:00:00 2001
From: Jeremy Lejoux <jeremy@processout.com>
Date: Thu, 31 Oct 2019 17:37:23 +0100
Subject: [PATCH] apm: fix tests

---
 .../processout_sdk/ProcessOutTest.java        | 23 +++++++++++++++--
 .../processout_sdk/UITestSuite.java           | 25 -------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/processout-sdk/src/androidTest/java/com/processout/processout_sdk/ProcessOutTest.java b/processout-sdk/src/androidTest/java/com/processout/processout_sdk/ProcessOutTest.java
index f1e88f4a..196e880d 100644
--- a/processout-sdk/src/androidTest/java/com/processout/processout_sdk/ProcessOutTest.java
+++ b/processout-sdk/src/androidTest/java/com/processout/processout_sdk/ProcessOutTest.java
@@ -10,6 +10,7 @@
 import org.json.JSONObject;
 import org.junit.Test;
 
+import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -54,7 +55,7 @@ public void onSuccess(String token) {
     }
 
     @Test
-    public void listAlternativePaymentGateways() {
+    public void listPaymentGateways() {
         final CountDownLatch signal = new CountDownLatch(1);
 
         Invoice invoice = new Invoice("test", "123.0", "EUR", new Device("android"));
@@ -68,7 +69,25 @@ public void onError(Exception error) {
 
                 @Override
                 public void onSuccess(JSONObject json) {
-                    signal.countDown();
+                    Invoice invoiceResult = null;
+                    try {
+                        invoiceResult = gson.fromJson(json.getJSONObject("invoice").toString(), Invoice.class);
+                    } catch (JSONException e) {
+                        fail("Unhandled exception");
+                        e.printStackTrace();
+                        return;
+                    }
+                    p.fetchGatewayConfigurations(invoiceResult.getId(), ProcessOut.GatewaysListingFilter.AlternativePaymentMethodWithTokenization, new FetchGatewaysConfigurationsCallback() {
+                        @Override
+                        public void onSuccess(ArrayList<GatewayConfiguration> gateways) {
+                            signal.countDown();
+                        }
+
+                        @Override
+                        public void onError(Exception e) {
+                            fail("Error while fetching gateways");
+                        }
+                    });
                 }
             });
         } catch (JSONException e) {
diff --git a/processout-sdk/src/androidTest/java/com/processout/processout_sdk/UITestSuite.java b/processout-sdk/src/androidTest/java/com/processout/processout_sdk/UITestSuite.java
index ebaa2980..91932e51 100644
--- a/processout-sdk/src/androidTest/java/com/processout/processout_sdk/UITestSuite.java
+++ b/processout-sdk/src/androidTest/java/com/processout/processout_sdk/UITestSuite.java
@@ -661,29 +661,4 @@ public void onError(Exception error) {
             fail("Could not run test");
         }
     }
-
-    @Test
-    public void testAPMTokenization() {
-        final CountDownLatch signal = new CountDownLatch(1);
-
-        final Activity withActivity = activityRule.getActivity();
-        final ProcessOut p = new ProcessOut(withActivity, "test-proj_gAO1Uu0ysZJvDuUpOGPkUBeE3pGalk3x");
-        p.listAlternativeMethods("iv_SuD6GUamoeLgYmRnDlEzM0wqamxW4WeY", new FetchGatewaysConfigurationsCallback() {
-            @Override
-            public void onSuccess(ArrayList<GatewayConfiguration> gateways) {
-                p.makeAPMToken(gateways.get(0), "cust_EiSdjbzbOPDMdFe0SFpe127T7eRcmLqK", "tok_ugUzL4AMG4ThOYOf2r12LKHFvlRyiEmV");
-            }
-
-            @Override
-            public void onError(Exception e) {
-                fail("Failed listing APM methods.");
-            }
-        });
-
-        try {
-            signal.await();// wait for callback
-        } catch (InterruptedException e) {
-            fail("Could not run test");
-        }
-    }
 }
\ No newline at end of file