From 5ef58187721ab1c15cc0fa4569557b5113ac50d7 Mon Sep 17 00:00:00 2001 From: stritti Date: Mon, 18 Sep 2017 10:23:22 +0200 Subject: [PATCH 1/2] reorder variables --- .../sybit/airtable/mock/WireMockBaseTest.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java b/src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java index 37a983c..1d8e679 100644 --- a/src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java +++ b/src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java @@ -24,11 +24,17 @@ /** * Base Class to test using WireMock. * - * Config files for the requests are stored at - * 'src/test/resources/__files' and 'src/test/resources/mappings'. + * Config files for the requests are stored at 'src/test/resources/__files' and + * 'src/test/resources/mappings'. */ public class WireMockBaseTest { + private static WireMockServer wireMockServer; + private static WiremockProp prop; + + protected static Airtable airtable = new Airtable(); + protected static Base base; + private class WiremockProp { private boolean recording; @@ -128,20 +134,14 @@ public void setServerPort(int aServerPort) { } }; - private static WireMockServer wireMockServer; - private static WiremockProp prop; - - protected static Airtable airtable = new Airtable(); - protected static Base base; - @Before public void setUp() throws AirtableException { - + airtable.configure(); airtable.setProxy("127.0.0.1"); airtable.setEndpointUrl("http://localhost:8080"); base = airtable.base("appTtHA5PfJnVfjdu"); - + prop.setRecording(false); prop.setCleanDirectorys(false); prop.setProxyBase("192.168.1.254"); @@ -223,4 +223,3 @@ public static void cleanExistingRecords() { } } - From 2a26f777368bf17a5fc7112328456b317d7451b6 Mon Sep 17 00:00:00 2001 From: stritti Date: Mon, 18 Sep 2017 11:14:42 +0200 Subject: [PATCH 2/2] FIX integration tests --- src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java b/src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java index 1d8e679..3e143a2 100644 --- a/src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java +++ b/src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java @@ -142,6 +142,7 @@ public void setUp() throws AirtableException { airtable.setEndpointUrl("http://localhost:8080"); base = airtable.base("appTtHA5PfJnVfjdu"); + prop = new WiremockProp(); prop.setRecording(false); prop.setCleanDirectorys(false); prop.setProxyBase("192.168.1.254");