gnodet-bot commented on code in PR #1158: URL: https://github.com/apache/maven-compiler-plugin/pull/1158#discussion_r4192364266
########## src/test/java/org/apache/maven/plugin/compiler/ByteCodeTransformerTest.java: ########## @@ -0,0 +1,171 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.plugin.compiler; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.spi.ToolProvider; + +import org.apache.maven.api.plugin.Log; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.Opcodes; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; + +/** + * Tests for {@link ByteCodeTransformer#patchJdkModuleVersion}. + * + * <p>On JDK 24+, surefire prepends {@code META-INF/versions/24/} on the test classpath, + * so this test exercises the {@code java.lang.classfile}-backed implementation. + * On JDK 17-23, it exercises the ASM fallback. + * + * @see <a href="https://issues.apache.org/jira/browse/MCOMPILER-542";>MCOMPILER-542</a> + */ +class ByteCodeTransformerTest { + + private static final Log LOG = mock(Log.class); + + @Test + void returnsNullForNonModuleClass(@TempDir Path tempDir) throws Exception { + byte[] bytes = compileRegularClass(tempDir); + assertNull( + ByteCodeTransformer.patchJdkModuleVersion(bytes, "21", LOG), + "Regular class has no ModuleAttribute -> null"); + } + + @Test + void patchesJdkRequiresVersionToTarget(@TempDir Path tempDir) throws Exception { + byte[] bytes = compileModuleInfo( + tempDir, "jdkRequires", "module com.example { requires java.base; requires java.logging; }"); + byte[] result = ByteCodeTransformer.patchJdkModuleVersion(bytes, "21", LOG); + // javac on JDK 21+ emits requires version attributes for jdk modules. + // If the compiler wrote version attributes, patchJdkModuleVersion must replace them with "21". + if (result != null) { + assertTrue(result.length > 0, "Patched result must be non-empty"); + Map<String, String> versions = readRequiresVersions(result); + for (Map.Entry<String, String> entry : versions.entrySet()) { + String mod = entry.getKey(); + if (mod.startsWith("java.") || mod.startsWith("jdk.")) { + assertEquals( + "21", + entry.getValue(), + "JDK module " + mod + " requires version should be patched to '21'"); + } Review Comment: 💡 **Observation (low):** The `if (result != null)` guard means that on a JDK where `javac` doesn't emit `requires` version attributes, this test silently passes without verifying any patching behavior. On JDK 25+ (the only build JDK per the enforcer rule) this should always be non-null, so the guard is redundant and obscures intent. Consider making the assertion unconditional so a regression (e.g. a future JDK stops emitting version attrs) fails loudly rather than passing silently: ```suggestion assertNotNull(result, "javac on JDK 25+ should emit requires version attributes"); assertTrue(result.length > 0, "Patched result must be non-empty"); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
