|
1 | 1 | /* |
2 | | - * Copyright (C) 2006, 2007, 2009, 2010, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2024 XStream Committers. |
| 2 | + * Copyright (C) 2006, 2007, 2009, 2010, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2024, 2025 XStream Committers. |
3 | 3 | * All rights reserved. |
4 | 4 | * |
5 | 5 | * The software in this package is published under the terms of the BSD |
|
28 | 28 | import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider; |
29 | 29 | import com.thoughtworks.xstream.core.JVM; |
30 | 30 | import com.thoughtworks.xstream.io.xml.DomDriver; |
| 31 | +import com.thoughtworks.xstream.io.xml.MXParserDriver; |
31 | 32 | import com.thoughtworks.xstream.io.xml.SimpleStaxDriver; |
32 | | -import com.thoughtworks.xstream.io.xml.Xpp3Driver; |
33 | 33 | import com.thoughtworks.xstream.testutil.DynamicSecurityManager; |
34 | 34 |
|
35 | 35 | import junit.framework.TestCase; |
@@ -202,7 +202,7 @@ public void testSerializeWithXppDriverAndSunUnsafeReflectionProviderAndActiveSec |
202 | 202 | sm.setReadOnly(); |
203 | 203 | System.setSecurityManager(sm); |
204 | 204 |
|
205 | | - xstream = new XStream(new Xpp3Driver()); |
| 205 | + xstream = new XStream(new MXParserDriver()); |
206 | 206 |
|
207 | 207 | assertBothWays(); |
208 | 208 | } |
@@ -246,7 +246,7 @@ public void testSerializeWithXppDriverAndPureJavaReflectionProviderAndActiveSecu |
246 | 246 | sm.setReadOnly(); |
247 | 247 | System.setSecurityManager(sm); |
248 | 248 |
|
249 | | - xstream = new XStream(new PureJavaReflectionProvider(), new Xpp3Driver()); |
| 249 | + xstream = new XStream(new PureJavaReflectionProvider(), new MXParserDriver()); |
250 | 250 |
|
251 | 251 | assertBothWays(); |
252 | 252 | } |
@@ -300,6 +300,8 @@ public void testSerializeWithDomDriverAndPureJavaReflectionProviderAndActiveSecu |
300 | 300 | sm.addPermission(source, new PropertyPermission("jdk.xml.overrideDefaultParser", "read")); |
301 | 301 | sm.addPermission(source, new PropertyPermission("jdk.xml.resetSymbolTable", "read")); |
302 | 302 | sm.addPermission(source, new PropertyPermission("jdk.xml.totalEntitySizeLimit", "read")); |
| 303 | + sm.addPermission(source, new PropertyPermission("jdk.xml.xpathExprGrpLimit", "read")); |
| 304 | + sm.addPermission(source, new PropertyPermission("jdk.xml.xpathExprOpLimit", "read")); |
303 | 305 | sm.addPermission(source, new PropertyPermission("maxOccurLimit", "read")); |
304 | 306 | sm.addPermission(source, new PropertyPermission("sun.boot.class.path", "read")); |
305 | 307 | sm.addPermission(source, new PropertyPermission("sun.io.serialization.extendedDebugInfo", "read")); |
|
0 commit comments