[WIP] Migrate method tests to scenario test cases

apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java

@@ -70,10 +70,8 @@ public boolean hasShutdownExceptions() {
 
     @Override
     public void logExceptions(List<Throwable> exceptions, org.slf4j.Logger log) {
-        StringBuilder errorBuilder = new StringBuilder();
         for (Throwable t : exceptions) {
             log.error("", t);
-            errorBuilder.append(t.getMessage()).append("\n");
         }
     }
 

apitest/src/test/java/bisq/apitest/method/MethodTest.java

@@ -43,11 +43,14 @@
 import java.util.stream.Collectors;
 
 import static bisq.apitest.config.BisqAppConfig.alicedaemon;
+import static bisq.apitest.config.BisqAppConfig.arbdaemon;
 import static bisq.apitest.config.BisqAppConfig.bobdaemon;
 import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY;
 import static bisq.core.payment.payload.PaymentMethod.PERFECT_MONEY;
+import static java.util.Arrays.stream;
 import static java.util.Comparator.comparing;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 
@@ -67,6 +70,33 @@ public class MethodTest extends ApiTestCase {
     protected PaymentAccount alicesDummyAcct;
     protected PaymentAccount bobsDummyAcct;
 
+    public static void startSupportingApps(boolean registerDisputeAgents,
+                                           boolean generateBtcBlock,
+                                           Enum<?>... supportingApps) {
+        try {
+            // To run Bisq apps in debug mode, use the other setUpScaffold method:
+            // setUpScaffold(new String[]{"--supportingApps", "bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon",
+            //                            "--enableBisqDebugging", "true"});
+            setUpScaffold(supportingApps);
+            if (registerDisputeAgents) {
+                registerDisputeAgents(arbdaemon);
+            }
+
+            if (stream(supportingApps).map(Enum::name).anyMatch(name -> name.equals(alicedaemon.name())))
+                aliceStubs = grpcStubs(alicedaemon);
+
+            if (stream(supportingApps).map(Enum::name).anyMatch(name -> name.equals(bobdaemon.name())))
+                bobStubs = grpcStubs(bobdaemon);
+
+            // Generate 1 regtest block for alice's and/or bob's wallet to
+            // show 10 BTC balance, and allow time for daemons parse the new block.
+            if (generateBtcBlock)
+                genBtcBlocksThenWait(1, 1500);
+        } catch (Exception ex) {
+            fail(ex);
+        }
+    }
+
     protected final void initAlicesDummyPaymentAccount() {
         alicesDummyAcct = getDefaultPerfectDummyPaymentAccount(alicedaemon);
     }

apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java

@@ -62,30 +62,20 @@ public abstract class AbstractOfferTest extends MethodTest {
 
     @BeforeAll
     public static void setUp() {
-        startSupportingApps();
+        startSupportingApps(true,
+                true,
+                bitcoind,
+                seednode,
+                arbdaemon,
+                alicedaemon,
+                bobdaemon);
     }
 
     @BeforeEach
     public void initDummyPaymentAccount() {
         super.initAlicesDummyPaymentAccount();
     }
 
-    static void startSupportingApps() {
-        try {
-            // setUpScaffold(new String[]{"--supportingApps", "bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon", "--enableBisqDebugging", "true"});
-            setUpScaffold(bitcoind, seednode, arbdaemon, alicedaemon, bobdaemon);
-            registerDisputeAgents(arbdaemon);
-            aliceStubs = grpcStubs(alicedaemon);
-            bobStubs = grpcStubs(bobdaemon);
-
-            // Generate 1 regtest block for alice's wallet to show 10 BTC balance,
-            // and give alicedaemon time to parse the new block.
-            genBtcBlocksThenWait(1, 1500);
-        } catch (Exception ex) {
-            fail(ex);
-        }
-    }
-
     protected final OfferInfo createAliceOffer(PaymentAccount paymentAccount,
                                                String direction,
                                                String currencyCode,

apitest/src/test/java/bisq/apitest/method/offer/CancelOfferTest.java

@@ -26,14 +26,15 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
+@Disabled
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class CancelOfferTest extends AbstractOfferTest {

apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java

@@ -23,6 +23,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -32,6 +33,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
+@Disabled
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest {

apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java

@@ -26,6 +26,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -40,6 +41,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static protobuf.OfferPayload.Direction.BUY;
 
+@Disabled
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest {

apitest/src/test/java/bisq/apitest/method/offer/ValidateCreateOfferTest.java

@@ -25,6 +25,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -33,6 +34,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+@Disabled
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class ValidateCreateOfferTest extends AbstractOfferTest {

apitest/src/test/java/bisq/apitest/scenario/OfferTest.java

@@ -0,0 +1,74 @@
+package bisq.apitest.scenario;
+
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
+import static bisq.apitest.config.BisqAppConfig.alicedaemon;
+import static bisq.apitest.config.BisqAppConfig.arbdaemon;
+import static bisq.apitest.config.BisqAppConfig.seednode;
+
+
+
+import bisq.apitest.method.offer.CancelOfferTest;
+import bisq.apitest.method.offer.CreateOfferUsingFixedPriceTest;
+import bisq.apitest.method.offer.CreateOfferUsingMarketPriceMarginTest;
+import bisq.apitest.method.offer.ValidateCreateOfferTest;
+
+@Slf4j
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class OfferTest extends ScenarioTest {
+
+    @BeforeAll
+    public static void setUp() {
+        startSupportingApps(true,
+                true,
+                bitcoind,
+                seednode,
+                arbdaemon,
+                alicedaemon);
+    }
+
+    @Test
+    @Order(1)
+    public void testAmtTooLargeShouldThrowException() {
+        ValidateCreateOfferTest test = new ValidateCreateOfferTest();
+        test.initDummyPaymentAccount();
+        test.testAmtTooLargeShouldThrowException();
+    }
+
+    @Test
+    @Order(2)
+    public void testCancelOffer() {
+        CancelOfferTest test = new CancelOfferTest();
+        test.initDummyPaymentAccount();
+        test.testCancelOffer();
+    }
+
+    @Test
+    @Order(3)
+    public void testCreateOfferUsingFixedPrice() {
+        CreateOfferUsingFixedPriceTest test = new CreateOfferUsingFixedPriceTest();
+        test.initDummyPaymentAccount();
+        test.testCreateAUDBTCBuyOfferUsingFixedPrice16000();
+        test.testCreateUSDBTCBuyOfferUsingFixedPrice100001234();
+        test.testCreateEURBTCSellOfferUsingFixedPrice95001234();
+    }
+
+    @Test
+    @Order(4)
+    public void testCreateOfferUsingMarketPriceMargin() {
+        CreateOfferUsingMarketPriceMarginTest test = new CreateOfferUsingMarketPriceMarginTest();
+        test.initDummyPaymentAccount();
+        test.testCreateUSDBTCBuyOffer5PctPriceMargin();
+        test.testCreateNZDBTCBuyOfferMinus2PctPriceMargin();
+        test.testCreateGBPBTCSellOfferMinus1Point5PctPriceMargin();
+        test.testCreateBRLBTCSellOffer6Point55PctPriceMargin();
+    }
+}