Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions impl/maven-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx256m @{jacocoArgLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hardcodes the argLine at the module level, bypassing the parent pom's mockito profile mechanism (root pom lines 942-961). The parent already has maven-dependency-plugin:properties + a profile that adds -javaagent:${org.mockito:mockito-core:jar} to surefire.

If the parent mechanism doesn't work here, it would be better to fix it at the parent level. Also note that the parent's mockito profile (line 955) itself drops @{jacocoArgLine} — that's a pre-existing bug worth fixing regardless.

<properties>
<configurationParameters>junit.jupiter.testclass.order.default = org.junit.jupiter.api.ClassOrderer$OrderAnnotation</configurationParameters>
</properties>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* 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.cling.invoker.mvnup.goals;

import java.lang.management.ManagementFactory;
import java.util.List;

import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertTrue;

@DisplayName("Mockito agent configuration")
class MockitoAgentConfigurationTest {

@Test
@DisplayName("should run tests with mockito configured as javaagent")
void shouldRunTestsWithMockitoAsJavaAgent() {
List<String> inputArguments = ManagementFactory.getRuntimeMXBean().getInputArguments();

assertTrue(
inputArguments.stream().anyMatch(a -> a.startsWith("-javaagent:") && a.contains("mockito-core")),
() -> "Expected Mockito javaagent in JVM arguments, but got: " + inputArguments);
}
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test only verifies build infrastructure (that the javaagent JVM flag is present). It doesn't test any production code. If the mockito agent were missing, any test using Mockito.mock() on a non-interface would already fail with a clear error, making this test redundant.

I'd suggest removing this file — the real fix is just the surefire configuration.

Loading