Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed DataBufferUtilsTest on Windows

Browse Source 
DataBufferUtilsTests checked for newline characters before, resulting in
failures on Windows.
This commit is contained in:
Arjen Poutsma
2016-07-18 17:08:46 +02:00
parent 03e6eeeadc
commit 041437f3ee
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-core/src/test/java/org/springframework/core/io/buffer/support/DataBufferUtilsTests.java
View File

@@ -42,15 +42,15 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
.toURI();
FileChannel channel = FileChannel.open(Paths.get(uri), StandardOpenOption.READ);
Flux<DataBuffer> flux = DataBufferUtils.read(channel, this.bufferFactory, 4);
Flux<DataBuffer> flux = DataBufferUtils.read(channel, this.bufferFactory, 3);
TestSubscriber
.subscribe(flux)
.assertNoError()
.assertComplete()
.assertValuesWith(
stringConsumer("foo\n"), stringConsumer("bar\n"),
stringConsumer("baz\n"), stringConsumer("qux\n"));
stringConsumer("foo"), stringConsumer("bar"),
stringConsumer("baz"), stringConsumer("qux"));
assertFalse(channel.isOpen());
}
@@ -61,16 +61,17 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
.toURI();
FileChannel channel = FileChannel.open(Paths.get(uri), StandardOpenOption.READ);
Flux<DataBuffer> flux = DataBufferUtils.read(channel, this.bufferFactory, 3);
Flux<DataBuffer> flux = DataBufferUtils.read(channel, this.bufferFactory, 2);
TestSubscriber
.subscribe(flux)
.assertNoError()
.assertComplete()
.assertValuesWith(
stringConsumer("foo"), stringConsumer("\nba"),
stringConsumer("r\nb"), stringConsumer("az\n"),
stringConsumer("qux"), stringConsumer("\n"));
stringConsumer("fo"), stringConsumer("ob"),
stringConsumer("ar"), stringConsumer("ba"),
stringConsumer("zq"), stringConsumer("ux")
);
assertFalse(channel.isOpen());
}
@@ -80,15 +81,15 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
InputStream is = DataBufferUtilsTests.class
.getResourceAsStream("DataBufferUtilsTests.txt");
Flux<DataBuffer> flux = DataBufferUtils.read(is, this.bufferFactory, 4);
Flux<DataBuffer> flux = DataBufferUtils.read(is, this.bufferFactory, 3);
TestSubscriber
.subscribe(flux)
.assertNoError()
.assertComplete()
.assertValuesWith(
stringConsumer("foo\n"), stringConsumer("bar\n"),
stringConsumer("baz\n"), stringConsumer("qux\n"));
stringConsumer("foo"), stringConsumer("bar"),
stringConsumer("baz"), stringConsumer("qux"));
}
@Test