Merge pull request #6445 from jmacxx/backup_zip_logfiles

Fix FileTransferSession tests.
bisq-network · Dec 7, 2022 · 39db3cc · 39db3cc
2 parents 555742d + 09a7a09
commit 39db3cc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/core/src/main/java/bisq/core/support/dispute/Dispute.java b/core/src/main/java/bisq/core/support/dispute/Dispute.java
@@ -182,7 +182,7 @@ public FileTransferReceiver createOrGetFileTransferReceiver(NetworkNode networkN
     public FileTransferSender createFileTransferSender(NetworkNode networkNode,
                                                        NodeAddress peerNodeAddress,
                                                        FileTransferSession.FtpCallback callback) {
-        return new FileTransferSender(networkNode, peerNodeAddress, this.tradeId, this.traderId, this.getRoleStringForLogFile(), callback);
+        return new FileTransferSender(networkNode, peerNodeAddress, this.tradeId, this.traderId, this.getRoleStringForLogFile(), false, callback);
     }
 
 

diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/FileTransferSender.java b/core/src/main/java/bisq/core/support/dispute/mediation/FileTransferSender.java
@@ -55,15 +55,18 @@
 @Slf4j
 public class FileTransferSender extends FileTransferSession {
     protected final String zipFilePath;
+    private final boolean isTest;
 
     public FileTransferSender(NetworkNode networkNode,
                               NodeAddress peerNodeAddress,
                               String tradeId,
                               int traderId,
                               String traderRole,
+                              boolean isTest,
                               @Nullable FileTransferSession.FtpCallback callback) {
         super(networkNode, peerNodeAddress, tradeId, traderId, traderRole, callback);
         zipFilePath = Utilities.getUserDataDir() + FileSystems.getDefault().getSeparator() + zipId + ".zip";
+        this.isTest = isTest;
         updateProgress();
     }
 
@@ -172,6 +175,9 @@ public boolean processAckForFilePart(String ackUid) {
         dataAwaitingAck = Optional.empty();
         checkpointLastActivity();
         updateProgress();
+        if (isTest) {
+            return true;
+        }
         UserThread.runAfter(() -> {        // to trigger continuing the file transfer
             try {
                 sendNextBlock();

diff --git a/core/src/test/java/bisq/core/support/dispute/mediation/FileTransferSessionTest.java b/core/src/test/java/bisq/core/support/dispute/mediation/FileTransferSessionTest.java
@@ -55,20 +55,21 @@ public void setUp() throws Exception {
 
     @Test
     public void testSendCreate() {
-        new FileTransferSender(networkNode, counterpartyNodeAddress, testTradeId, testTraderId, testClientId, this);
+        new FileTransferSender(networkNode, counterpartyNodeAddress, testTradeId, testTraderId, testClientId, true, this);
         Assert.assertEquals(0.0, notedProgressPct, 0.0);
         Assert.assertEquals(1, progressInvocations);
     }
 
     @Test
     public void testCreateZip() {
-        FileTransferSender sender = new FileTransferSender(networkNode, counterpartyNodeAddress, testTradeId, testTraderId, testClientId, this);
+        FileTransferSender sender = new FileTransferSender(networkNode, counterpartyNodeAddress, testTradeId, testTraderId, testClientId, true, this);
         Assert.assertEquals(0.0, notedProgressPct, 0.0);
         Assert.assertEquals(1, progressInvocations);
         sender.createZipFileToSend();
         File file = new File(sender.zipFilePath);
-        Assert.assertTrue(file.exists());
-        Assert.assertTrue(file.length() > 0);
+        Assert.assertTrue(file.getAbsoluteFile().exists());
+        Assert.assertTrue(file.getAbsoluteFile().length() > 0);
+        file.deleteOnExit();
     }
 
     @Test
@@ -192,7 +193,7 @@ public void testSendTwoFullBlocksPlusOneByte() {
 
     private FileTransferSender initializeSession(int testSize) {
         try {
-            FileTransferSender session = new FileTransferSender(networkNode, counterpartyNodeAddress, testTradeId, testTraderId, testClientId, this);
+            FileTransferSender session = new FileTransferSender(networkNode, counterpartyNodeAddress, testTradeId, testTraderId, testClientId, true, this);
             // simulate a file for sending
             FileWriter fileWriter = new FileWriter(session.zipFilePath);
             char[] buf = new char[testSize];