From b09c9eb6870cd0d2f0a5a84a01018c7f0f845c55 Mon Sep 17 00:00:00 2001
From: Amos Shi <ashi@openjdk.org>
Date: Tue, 25 Jun 2024 15:59:43 +0000
Subject: [PATCH] 8333398: Uncomment the commented test in
test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
Backport-of: d230b30353f59135287436b09949b80e9fd73a93
---
.../java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
index 114816d4787..e8abec354ed 100644
--- a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
+++ b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -101,15 +101,12 @@ public class MultiReleaseJarAPI {
testCustomMultiReleaseValue("true", true);
testCustomMultiReleaseValue("true\r\nOther: value", true);
testCustomMultiReleaseValue("true\nOther: value", true);
- // JDK-8200530: '\r' support in Manifest/Attributes will be addressed separately
- // testCustomMultiReleaseValue("true\rOther: value", true);
+ testCustomMultiReleaseValue("true\rOther: value", true);
testCustomMultiReleaseValue("false", false);
testCustomMultiReleaseValue(" true", false);
testCustomMultiReleaseValue("true ", false);
testCustomMultiReleaseValue("true\n true", false);
-
- // JDK-8200530: '\r' support in Manifest/Attributes will be addressed separately
testCustomMultiReleaseValue("true\r true", false);
testCustomMultiReleaseValue("true\r\n true", false);
--
GitLab