Author: reschke
Date: Wed Feb 14 15:33:00 2018
New Revision: 1824249
URL: http://svn.apache.org/viewvc?rev=1824249&view=rev
Log:
OAK-7269: DocumentStore: add test coverage for various types of IDs
minor improvements
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1824249&r1=1824248&r2=1824249&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Wed Feb 14 15:33:00 2018
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeNotNull;
+import static org.junit.Assume.assumeTrue;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
@@ -681,6 +682,8 @@ public class BasicDocumentStoreTest exte
@Ignore("OAK-7261")
public void testInterestingInvalidIds() {
// OAK-7261
+ assumeTrue("fails on MongoDocumentStore, see OAK-7271", !(dsf
instanceof DocumentStoreFixture.MongoFixture));
+
String[] tests = new String[] {"nul:a\u0000b",
"brokensurrogate:\ud800" };
for (String t : tests) {
@@ -706,8 +709,8 @@ public class BasicDocumentStoreTest exte
NodeDocument nd = super.ds.find(Collection.NODES, id);
assertEquals("failure to round-trip " + t + " through " +
super.dsname, id, nd.getId());
- // if the character does not roundtrip through UTF-8, try to
delete
- // the remapped one and do another lookup
+ // if the character does not round-trip through UTF-8, try to
delete
+ // the remapped one and do another lookup
if (!roundtripsThroughJavaUTF8(id)) {
Charset utf8 = Charset.forName("UTF-8");
String mapped = new String(id.getBytes(utf8), utf8);