|
|
|
@ -694,7 +694,7 @@ public void testSenderCancelsWhileTransfering()
|
|
|
|
,fileTransferCreatedEvent.getFileTransfer().getLocalFile()
|
|
|
|
,fileTransferCreatedEvent.getFileTransfer().getLocalFile()
|
|
|
|
,receiveFile);
|
|
|
|
,receiveFile);
|
|
|
|
|
|
|
|
|
|
|
|
receiverStatusListener.waitForEvent(4000, 3);
|
|
|
|
receiverStatusListener.waitForEvent(8000, 3);
|
|
|
|
assertTrue("Cancel event must be received",
|
|
|
|
assertTrue("Cancel event must be received",
|
|
|
|
receiverStatusListener.contains(FileTransferStatusChangeEvent.CANCELED));
|
|
|
|
receiverStatusListener.contains(FileTransferStatusChangeEvent.CANCELED));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -979,13 +979,20 @@ public boolean contains(int status)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Iterator<FileTransferStatusChangeEvent>
|
|
|
|
Iterator<FileTransferStatusChangeEvent>
|
|
|
|
iter = collectedEvents.iterator();
|
|
|
|
iter = collectedEvents.iterator();
|
|
|
|
|
|
|
|
String statuses = "";
|
|
|
|
while (iter.hasNext())
|
|
|
|
while (iter.hasNext())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
FileTransferStatusChangeEvent e = iter.next();
|
|
|
|
FileTransferStatusChangeEvent e = iter.next();
|
|
|
|
if(e.getNewStatus() == status)
|
|
|
|
if(e.getNewStatus() == status)
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
statuses += e.getNewStatus() + " ";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
logger.warn("Status not found : " + status +
|
|
|
|
|
|
|
|
" between statuses : " + statuses);
|
|
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|