diff options
author | Alex Clayton <alex.clayton@isode.com> | 2016-02-08 12:30:12 (GMT) |
---|---|---|
committer | Alex Clayton <alex.clayton@isode.com> | 2016-02-16 11:02:39 (GMT) |
commit | 2ebf488dfee7156fbbe0b3d3eccebe13d86a8634 (patch) | |
tree | 8f0c873e2048e9f3a5bca51f358f60b21e690dd2 /src/com/isode/stroke/filetransfer/ByteArrayReadBytestream.java | |
parent | 810abab2eb236c68c75025e383609d952af71e4f (diff) | |
download | stroke-2ebf488dfee7156fbbe0b3d3eccebe13d86a8634.zip stroke-2ebf488dfee7156fbbe0b3d3eccebe13d86a8634.tar.bz2 |
Add the FileTransfer tests
Add the missing FileTransfer tests to stroke. When porting the tests
I found some of them were failing and required changes to the classes
being tested to fix. Had to add a DummyNetworkEnvironment as well for
the OutgoingJingleFileTransferTest.
Test-information:
All unit tests pass.
Change-Id: Id511a556ef3a5d66e0e107f36f736db3bbb3a437
Diffstat (limited to 'src/com/isode/stroke/filetransfer/ByteArrayReadBytestream.java')
-rw-r--r-- | src/com/isode/stroke/filetransfer/ByteArrayReadBytestream.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/isode/stroke/filetransfer/ByteArrayReadBytestream.java b/src/com/isode/stroke/filetransfer/ByteArrayReadBytestream.java index 41528fa..5b3542f 100644 --- a/src/com/isode/stroke/filetransfer/ByteArrayReadBytestream.java +++ b/src/com/isode/stroke/filetransfer/ByteArrayReadBytestream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -11,6 +11,8 @@ package com.isode.stroke.filetransfer; +import java.util.Arrays; + import com.isode.stroke.base.ByteArray; public class ByteArrayReadBytestream extends ReadBytestream { @@ -30,9 +32,9 @@ public class ByteArrayReadBytestream extends ReadBytestream { if (position + readSize > data.getSize()) { readSize = data.getSize() - position; } - String s = data.toString(); - s = s.substring(position, position+readSize); - ByteArray result = new ByteArray(s); + byte[] rawBytes = data.getData(); + byte[] resultRawBytes = Arrays.copyOfRange(rawBytes, position, position+readSize); + ByteArray result = new ByteArray(resultRawBytes); onRead.emit(result); position += readSize; |