diff options
author | Damian Minkov <damencho@jitsi.org> | 2012-02-29 09:40:12 +0000 |
---|---|---|
committer | Damian Minkov <damencho@jitsi.org> | 2012-02-29 09:40:12 +0000 |
commit | 0a0c71237ad7e5d6bfe6277834389b5e4cb2eb6c (patch) | |
tree | 022dc68938fa3a031170a195c29d9bf134616870 /test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java | |
parent | 2119d43b7a5256681a6cdb3ef90d365e876885ab (diff) | |
download | jitsi-0a0c71237ad7e5d6bfe6277834389b5e4cb2eb6c.zip jitsi-0a0c71237ad7e5d6bfe6277834389b5e4cb2eb6c.tar.gz jitsi-0a0c71237ad7e5d6bfe6277834389b5e4cb2eb6c.tar.bz2 |
Updates smack library to 3.2.2.
Diffstat (limited to 'test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java')
-rw-r--r-- | test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java b/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java index 4c184c2..c71ed46 100644 --- a/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java +++ b/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java @@ -353,7 +353,7 @@ public abstract class TestOperationSetFileTransfer if(!enableTestReceiverDecline()) return; - logger.trace("Start test: receiver will decline incoming fileTransfer"); + logger.info("Start test: receiver will decline incoming fileTransfer"); File fileToTransfer = getTempFileToTransfer(12345); @@ -452,9 +452,11 @@ public abstract class TestOperationSetFileTransfer fileTransferStatusEvent = senderStatusListener.collectedEvents.get(0); - assertEquals("Event must be refused" - ,FileTransferStatusChangeEvent.REFUSED - ,fileTransferStatusEvent.getNewStatus()); + assertTrue("Event must be refused (or failed)" + ,(fileTransferStatusEvent.getNewStatus() + == FileTransferStatusChangeEvent.REFUSED) + || (fileTransferStatusEvent.getNewStatus() + == FileTransferStatusChangeEvent.FAILED)); } finally { @@ -817,7 +819,8 @@ public abstract class TestOperationSetFileTransfer /** * Creates an instance of this call event collector and registers it * with listenedOpSet. - * @param listenedOpSet the operation set + * @param name of collector + * @param statusCollector the event collector */ public FileTransferEventCollector( String name, FileTransferStatusEventCollector statusCollector) |