This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
commit 59dc0cee07a65c59fe80fbd75a62a55460382755 Author: Gary Gregory <[email protected]> AuthorDate: Tue Jun 16 10:10:02 2026 +0000 Better names --- .../java/org/apache/bcel/util/BCELifierTest.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/apache/bcel/util/BCELifierTest.java b/src/test/java/org/apache/bcel/util/BCELifierTest.java index 94b845ca..2ab563e0 100644 --- a/src/test/java/org/apache/bcel/util/BCELifierTest.java +++ b/src/test/java/org/apache/bcel/util/BCELifierTest.java @@ -179,18 +179,18 @@ class BCELifierTest extends AbstractTest { @Test void testClassNamesEscapedInOutput() throws Exception { // Superclass and source file names are constant-pool derived and can hold any UTF-8. - final String evilSuper = "java.lang.Object\"); System.exit(1); _cg = new ClassGen(\"x"; - final String evilSource = "Example.java\"); System.exit(2); String s = (\""; - final ClassGen cg = new ClassGen("Example", evilSuper, evilSource, Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] {}); + final String toEscapeSuper = "java.lang.Object\"); System.exit(1); _cg = new ClassGen(\"x"; + final String toEscapeSource = "Example.java\"); System.exit(2); String s = (\""; + final ClassGen cg = new ClassGen("Example", toEscapeSuper, toEscapeSource, Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] {}); final ByteArrayOutputStream os = new ByteArrayOutputStream(); new BCELifier(cg.getJavaClass(), os).start(); final String source = new String(os.toByteArray(), StandardCharsets.UTF_8); - assertTrue(source.contains(Utility.convertString(evilSuper)), source); - assertTrue(source.contains(Utility.convertString(evilSource)), source); - assertFalse(source.contains('"' + evilSuper + '"'), source); - assertFalse(source.contains('"' + evilSource + '"'), source); + assertTrue(source.contains(Utility.convertString(toEscapeSuper)), source); + assertTrue(source.contains(Utility.convertString(toEscapeSource)), source); + assertFalse(source.contains('"' + toEscapeSuper + '"'), source); + assertFalse(source.contains('"' + toEscapeSource + '"'), source); } private void testClassOnPath(final String javaClassFileName) throws Exception { @@ -237,13 +237,13 @@ class BCELifierTest extends AbstractTest { @Test void testCreateInvokeEscapesConstantPoolName() throws Exception { // A hostile constant pool can hold any UTF-8 as a referenced method name. - final String evilName = "evil\"); System.exit(1); il.append(\""; + final String toEscapeName = "evil\"); System.exit(1); il.append(\""; final ClassGen cg = new ClassGen("Example", "java.lang.Object", "Example.java", Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] {}); final ConstantPoolGen cp = cg.getConstantPool(); final InstructionFactory factory = new InstructionFactory(cg, cp); final InstructionList il = new InstructionList(); il.append(InstructionConst.ALOAD_0); - il.append(factory.createInvoke("java.lang.Object", evilName, Type.VOID, Type.NO_ARGS, Const.INVOKEVIRTUAL)); + il.append(factory.createInvoke("java.lang.Object", toEscapeName, Type.VOID, Type.NO_ARGS, Const.INVOKEVIRTUAL)); il.append(InstructionConst.RETURN); final MethodGen mg = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] {}, "m", "Example", il, cp); mg.setMaxStack(); @@ -254,8 +254,8 @@ class BCELifierTest extends AbstractTest { new BCELifier(cg.getJavaClass(), os).start(); final String source = new String(os.toByteArray(), StandardCharsets.UTF_8); - assertTrue(source.contains("_factory.createInvoke(\"java.lang.Object\", \"" + Utility.convertString(evilName) + "\", "), source); - assertFalse(source.contains('"' + evilName + '"'), source); + assertTrue(source.contains("_factory.createInvoke(\"java.lang.Object\", \"" + Utility.convertString(toEscapeName) + "\", "), source); + assertFalse(source.contains('"' + toEscapeName + '"'), source); } @Test
