Author: reschke
Date: Thu Mar 15 18:57:57 2018
New Revision: 1826854
URL: http://svn.apache.org/viewvc?rev=1826854&view=rev
Log:
OAK-7339: Introduce LoopbackBlobStore
(fix test case names, previously breaking surefire XML output)
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreTest.java
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreTest.java?rev=1826854&r1=1826853&r2=1826854&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreTest.java
Thu Mar 15 18:57:57 2018
@@ -221,7 +221,7 @@ public class LoopbackBlobStoreTest {
assertEquals(numberOfBytesRead,
expectedNumberOfBytesRead);
assertEquals(expectedBufferContent,
- actualInputStreamAsString);
+
encodeBufferFreeSpace(actualInputStreamAsString));
}
}
}
@@ -273,33 +273,33 @@ public class LoopbackBlobStoreTest {
return new Object[]{
//blobId, offsetToRead, bufSize, bufOffset, lengthToRead,
expectedBufferContent, expectedNumOfBytesRead
new Object[]{
- "", 0, 0, 0, 0, "",
0},
+ "", 0, 0, 0, 0, "",
0},
new Object[]{
- "", 0, 0, 0, 1, "",
0},
+ "", 0, 0, 0, 1, "",
0},
new Object[]{
- "IDX1", 0, 4, 0, 4,
"IDX1", 4},
+ "IDX1", 0, 4, 0, 4,
"IDX1", 4},
new Object[]{
- "IDX1", 4, 0, 0, 4, "",
0},
+ "IDX1", 4, 0, 0, 4, "",
0},
new Object[]{
- "IDX1", 4, 4, 0, 4,
"\0\0\0\0", 0},
+ "IDX1", 4, 4, 0, 4,
"####", 0},
new Object[]{
- "IDX1", 0, 5, 0, 4,
"IDX1\0", 4},
+ "IDX1", 0, 5, 0, 4,
"IDX1#", 4},
new Object[]{
- "IDX1", 1, 4, 0, 3,
"DX1\0", 3},
+ "IDX1", 1, 4, 0, 3,
"DX1#", 3},
new Object[]{
- "IDX1", 1, 4, 0, 4,
"DX1\0", 3},
+ "IDX1", 1, 4, 0, 4,
"DX1#", 3},
new Object[]{
- "ID2XXXXXXXXXXXYYZYZYYXYZYZYXYZQ", 10, 20, 3, 10,
"\0\0\0XXXXYYZYZY\0\0\0\0\0\0\0", 10},
+ "ID2XXXXXXXXXXXYYZYZYYXYZYZYXYZQ", 10, 20, 3, 10,
"###XXXXYYZYZY#######", 10},
new Object[]{
- "ID2XXXXXXXXXXXYYZY", 10, 20, 3, 10,
"\0\0\0XXXXYYZY\0\0\0\0\0\0\0\0\0", 8},
+ "ID2XXXXXXXXXXXYYZY", 10, 20, 3, 10,
"###XXXXYYZY#########", 8},
new Object[]{
- "ID2XXXXXXXXXXXYYZY", 10, 20, 3, 10,
"\0\0\0XXXXYYZY\0\0\0\0\0\0\0\0\0", 8},
+ "ID2XXXXXXXXXXXYYZY", 10, 20, 3, 10,
"###XXXXYYZY#########", 8},
new Object[]{
- "ID2XXXXXXXXXXXYYZY", 10, 11, 3, 10,
"\0\0\0XXXXYYZY", 8},
+ "ID2XXXXXXXXXXXYYZY", 10, 11, 3, 10,
"###XXXXYYZY", 8},
new Object[]{
- "ID2XXXXXXXXXXXYYZY", 10, 11, 2, 10,
"\0\0XXXXYYZY\0", 8},
+ "ID2XXXXXXXXXXXYYZY", 10, 11, 2, 10,
"##XXXXYYZY#", 8},
new Object[]{
- "ID2XXXXXXXXXXXYYZY", 10, 11, 1, 10,
"\0XXXXYYZY\0\0", 8},
+ "ID2XXXXXXXXXXXYYZY", 10, 11, 1, 10,
"#XXXXYYZY##", 8},
};
}
@@ -346,6 +346,10 @@ public class LoopbackBlobStoreTest {
};
}
+ private String encodeBufferFreeSpace(final String
actualInputStreamAsString) {
+ return actualInputStreamAsString.replace('\0', '#');
+ }
+
private InputStream adaptToUtf8InputStream(final String string)
throws IOException {
return IOUtils.toInputStream(string,
