Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#noissue] Update plugin-it method name #10914

Merged
merged 1 commit into from
Apr 16, 2024
Merged

[#noissue] Update plugin-it method name #10914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions ...avercorp/pinpoint/test/plugin/junit5/descriptor/PluginForkedTestMethodTestDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,33 @@

package com.navercorp.pinpoint.test.plugin.junit5.descriptor;

import com.navercorp.pinpoint.test.plugin.PluginForkedTestInstance;
import com.navercorp.pinpoint.test.plugin.junit5.engine.support.PluginForkedTestThrowableCollector;
import com.navercorp.pinpoint.test.plugin.junit5.engine.support.PluginTestReport;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.engine.config.JupiterConfiguration;
import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
import org.junit.platform.engine.TestExecutionResult;
import org.junit.platform.engine.TestSource;
import org.junit.platform.engine.UniqueId;
import org.junit.platform.engine.support.descriptor.MethodSource;
import org.junit.platform.engine.support.hierarchical.ThrowableCollector;

import java.lang.reflect.Method;
import java.util.Optional;

public class PluginForkedTestMethodTestDescriptor extends TestMethodTestDescriptor {

private final PluginForkedTestInstance pluginTestInstance;
private final MethodSource source;
private PluginTestReport testReport;

public PluginForkedTestMethodTestDescriptor(UniqueId uniqueId, Class<?> testClass, Method testMethod, JupiterConfiguration configuration) {

public PluginForkedTestMethodTestDescriptor(UniqueId uniqueId, Class<?> testClass, Method testMethod, JupiterConfiguration configuration, PluginForkedTestInstance pluginTestInstance) {
super(uniqueId, testClass, testMethod, configuration);
this.pluginTestInstance = pluginTestInstance;
this.source = MethodSource.from(testClass.getName(), testMethod.getName() + "[" + pluginTestInstance.getTestId() + "]");
}

@Override
Expand Down Expand Up @@ -84,4 +93,9 @@ public SkipResult shouldBeSkipped(JupiterEngineExecutionContext context) throws
}
return SkipResult.doNotSkip();
}
}

@Override
public Optional<TestSource> getSource() {
return Optional.of(source);
}
}
12 changes: 10 additions & 2 deletions .../com/navercorp/pinpoint/test/plugin/junit5/descriptor/PluginTestMethodTestDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,22 @@
import org.junit.jupiter.engine.config.JupiterConfiguration;
import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
import org.junit.platform.engine.TestSource;
import org.junit.platform.engine.UniqueId;
import org.junit.platform.engine.support.descriptor.MethodSource;

import java.lang.reflect.Method;
import java.util.Optional;

public class PluginTestMethodTestDescriptor extends TestMethodTestDescriptor {

private final PluginTestInstance pluginTestInstance;
private final MethodSource source;

public PluginTestMethodTestDescriptor(UniqueId uniqueId, Class<?> testClass, Method testMethod, JupiterConfiguration configuration, PluginTestInstance pluginTestInstance) {
super(uniqueId, testClass, testMethod, configuration);
this.pluginTestInstance = pluginTestInstance;
this.source = MethodSource.from(testClass.getName(), testMethod.getName() + "[" + pluginTestInstance.getTestId() + "]");
}

@Override
Expand All @@ -47,5 +52,8 @@ public JupiterEngineExecutionContext execute(JupiterEngineExecutionContext conte
}, true);
}


}
@Override
public Optional<TestSource> getSource() {
return Optional.of(source);
}
}
6 changes: 3 additions & 3 deletions ...rc/main/java/com/navercorp/pinpoint/test/plugin/junit5/engine/PluginForkedTestEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ TestDescriptor addPluginForkedTestDescriptor(TestDescriptor testDescriptor, Jupi
for (TestDescriptor descriptor : testDescriptor.getChildren()) {
if (descriptor instanceof TestMethodTestDescriptor) {
final Method method = ((TestMethodTestDescriptor) descriptor).getTestMethod();
final PluginForkedTestMethodTestDescriptor pluginTestMethodTestDescriptor = toPluginTestMethodTestDescriptor(configuration, pluginTestClassTestDescriptor, method);
final PluginForkedTestMethodTestDescriptor pluginTestMethodTestDescriptor = toPluginTestMethodTestDescriptor(configuration, pluginTestClassTestDescriptor, pluginTestInstance, method);
pluginTestClassTestDescriptor.addChild(pluginTestMethodTestDescriptor);
}
}
Expand All @@ -150,11 +150,11 @@ private static PluginForkedTestClassTestDescriptor toPluginTestClassTestDescript
return new PluginForkedTestClassTestDescriptor(parentTestDescriptor.getUniqueId().append(ClassTestDescriptor.SEGMENT_TYPE, testClass.getName()), testClass, configuration);
}

private static PluginForkedTestMethodTestDescriptor toPluginTestMethodTestDescriptor(JupiterConfiguration configuration, PluginForkedTestClassTestDescriptor parentTestDescriptor, Method method) {
private static PluginForkedTestMethodTestDescriptor toPluginTestMethodTestDescriptor(JupiterConfiguration configuration, PluginForkedTestClassTestDescriptor parentTestDescriptor, PluginForkedTestInstance pluginForkedTestInstance, Method method) {
final Class<?> testClass = parentTestDescriptor.getTestClass();
final Method testMethod = method;
String methodId = String.format("%s(%s)", method.getName(), ClassUtils.nullSafeToString(method.getParameterTypes()));
return new PluginForkedTestMethodTestDescriptor(parentTestDescriptor.getUniqueId().append(TestMethodTestDescriptor.SEGMENT_TYPE, methodId), testClass, testMethod, configuration);
return new PluginForkedTestMethodTestDescriptor(parentTestDescriptor.getUniqueId().append(TestMethodTestDescriptor.SEGMENT_TYPE, methodId), testClass, testMethod, configuration, pluginForkedTestInstance);
}

TestDescriptor addPluginJunitTestDescriptor(TestDescriptor testDescriptor, JupiterConfiguration configuration) {
Expand Down
6 changes: 3 additions & 3 deletions ...test/src/main/java/com/navercorp/pinpoint/test/plugin/junit5/engine/PluginTestEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ TestDescriptor addPluginForkedTestDescriptor(TestDescriptor testDescriptor, Jupi
for (TestDescriptor descriptor : testDescriptor.getChildren()) {
if (descriptor instanceof TestMethodTestDescriptor) {
final Method method = ((TestMethodTestDescriptor) descriptor).getTestMethod();
final PluginForkedTestMethodTestDescriptor pluginTestMethodTestDescriptor = toPluginForkedTestMethodTestDescriptor(configuration, pluginTestClassTestDescriptor, method);
final PluginForkedTestMethodTestDescriptor pluginTestMethodTestDescriptor = toPluginForkedTestMethodTestDescriptor(configuration, pluginTestClassTestDescriptor, pluginTestInstance, method);
pluginTestClassTestDescriptor.addChild(pluginTestMethodTestDescriptor);
}
}
Expand Down Expand Up @@ -259,12 +259,12 @@ private static PluginTestMethodTestDescriptor toPluginTestMethodTestDescriptor(J
}
}

private static PluginForkedTestMethodTestDescriptor toPluginForkedTestMethodTestDescriptor(JupiterConfiguration configuration, PluginForkedTestClassTestDescriptor parentTestDescriptor, Method method) {
private static PluginForkedTestMethodTestDescriptor toPluginForkedTestMethodTestDescriptor(JupiterConfiguration configuration, PluginForkedTestClassTestDescriptor parentTestDescriptor, PluginForkedTestInstance pluginTestInstance, Method method) {
try {
final Class<?> testClass = parentTestDescriptor.getTestClass();
final Method testMethod = ReflectionUtils.findMethod(testClass, method.getName(), method.getParameterTypes()).orElseThrow(() -> new IllegalStateException("not found method"));
String methodId = String.format("%s(%s)", method.getName(), ClassUtils.nullSafeToString(method.getParameterTypes()));
return new PluginForkedTestMethodTestDescriptor(parentTestDescriptor.getUniqueId().append(TestMethodTestDescriptor.SEGMENT_TYPE, methodId), testClass, testMethod, configuration);
return new PluginForkedTestMethodTestDescriptor(parentTestDescriptor.getUniqueId().append(TestMethodTestDescriptor.SEGMENT_TYPE, methodId), testClass, testMethod, configuration, pluginTestInstance);
} catch (Throwable t) {
System.out.println(t.getMessage());
return null;
Expand Down
Loading