Skip to content

Commit 8e5ce96

Browse files
committed
Fixed testCreateFileWithFile to work with Java 1.6
JAVA-1813
1 parent 2b6b69c commit 8e5ce96

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

driver/src/test/functional/com/mongodb/gridfs/GridFSTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
import java.io.InputStream;
3434
import java.io.OutputStream;
3535
import java.net.URI;
36-
import java.nio.file.Files;
37-
import java.nio.file.Paths;
36+
import java.util.Scanner;
3837

3938
import static java.nio.charset.Charset.defaultCharset;
4039
import static org.junit.Assert.assertArrayEquals;
@@ -124,12 +123,14 @@ public void testCreateFileWithFile() throws Exception {
124123
GridFSInputFile in = gridFS.createFile(new File(fileURI));
125124
in.save();
126125

126+
String expectedString = new Scanner(new File(fileURI)).useDelimiter("\\Z").next();
127+
127128
GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
128129
ByteArrayOutputStream bout = new ByteArrayOutputStream();
129130
out.writeTo(bout);
130-
String outString = new String(bout.toByteArray(), defaultCharset());
131+
String outString = new String(bout.toByteArray(), defaultCharset()).trim();
131132

132-
assertEquals(new String(Files.readAllBytes(Paths.get(fileURI))), outString);
133+
assertEquals(expectedString, outString);
133134
}
134135

135136
@Test

0 commit comments

Comments
 (0)