You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ma...@apache.org on 2019/09/07 17:30:44 UTC
svn commit: r1866560 -
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java
Author: mattryan
Date: Sat Sep 7 17:30:44 2019
New Revision: 1866560
URL: http://svn.apache.org/viewvc?rev=1866560&view=rev
Log:
OAK-8601: Fix failing ITs due to workaround in OAK-8013
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java?rev=1866560&r1=1866559&r2=1866560&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java Sat Sep 7 17:30:44 2019
@@ -377,9 +377,19 @@ public class BinaryAccessIT extends Abst
String contentDisposition = conn.getHeaderField("Content-Disposition");
assertNotNull(contentDisposition);
String encodedName = new String(expectedName.getBytes(StandardCharsets.UTF_8));
+ // This proper behavior is disabled due to
+ // https://github.com/Azure/azure-sdk-for-java/issues/2900
+ // (see also https://issues.apache.org/jira/browse/OAK-8013,
+ // https://issues.apache.org/jira/browse/OAK-8104, and
+ // https://issues.apache.org/jira/browse/OAK-8105). We can re-enable
+ // the full test once the issue is resolved. -MR
+// assertEquals(
+// String.format("inline; filename=\"%s\"; filename*=UTF-8''%s",
+// expectedName, encodedName),
+// contentDisposition
+// );
assertEquals(
- String.format("inline; filename=\"%s\"; filename*=UTF-8''%s",
- expectedName, encodedName),
+ String.format("inline; filename=\"%s\"", expectedName),
contentDisposition
);
@@ -408,9 +418,19 @@ public class BinaryAccessIT extends Abst
String contentDisposition = conn.getHeaderField("Content-Disposition");
assertNotNull(contentDisposition);
String encodedName = new String(expectedName.getBytes(StandardCharsets.UTF_8));
+ // This proper behavior is disabled due to
+ // https://github.com/Azure/azure-sdk-for-java/issues/2900
+ // (see also https://issues.apache.org/jira/browse/OAK-8013,
+ // https://issues.apache.org/jira/browse/OAK-8104, and
+ // https://issues.apache.org/jira/browse/OAK-8105). We can re-enable
+ // the full test once the issue is resolved. -MR
+// assertEquals(
+// String.format("attachment; filename=\"%s\"; filename*=UTF-8''%s",
+// expectedName, encodedName),
+// contentDisposition
+// );
assertEquals(
- String.format("attachment; filename=\"%s\"; filename*=UTF-8''%s",
- expectedName, encodedName),
+ String.format("attachment; filename=\"%s\"", expectedName),
contentDisposition
);
@@ -486,9 +506,19 @@ public class BinaryAccessIT extends Abst
String contentDisposition = conn.getHeaderField("Content-Disposition");
assertNotNull(contentDisposition);
String encodedName = new String(expectedName.getBytes(StandardCharsets.UTF_8));
+ // This proper behavior is disabled due to
+ // https://github.com/Azure/azure-sdk-for-java/issues/2900
+ // (see also https://issues.apache.org/jira/browse/OAK-8013,
+ // https://issues.apache.org/jira/browse/OAK-8104, and
+ // https://issues.apache.org/jira/browse/OAK-8105). We can re-enable
+ // the full test once the issue is resolved. -MR
+// assertEquals(
+// String.format("attachment; filename=\"%s\"; filename*=UTF-8''%s",
+// expectedName, encodedName),
+// contentDisposition
+// );
assertEquals(
- String.format("attachment; filename=\"%s\"; filename*=UTF-8''%s",
- expectedName, encodedName),
+ String.format("attachment; filename=\"%s\"", expectedName),
contentDisposition
);