github-repos/testable-mock
1
0
Fork 0
mirror of https://github.com/alibaba/testable-mock.git synced 2025-03-23 16:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix mock method signature print in verbose log

Browse Source
This commit is contained in:
金戟 2021-02-16 17:58:04 +08:00
parent d8ffcacdaf
commit 02d7fb6e91
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testable-agent/src/main/java/com/alibaba/testable/agent/handler/MockClassHandler.java
View File

@ -49,7 +49,7 @@ public class MockClassHandler extends BaseClassWithContextHandler {
for (AnnotationNode an : mn.visibleAnnotations) { for (AnnotationNode an : mn.visibleAnnotations) {
if (ClassUtil.toByteCodeClassName(ConstPool.MOCK_METHOD).equals(an.desc)) { if (ClassUtil.toByteCodeClassName(ConstPool.MOCK_METHOD).equals(an.desc)) {
Type type = AnnotationUtil.getAnnotationParameter(an, ConstPool.FIELD_TARGET_CLASS, null, Type.class); Type type = AnnotationUtil.getAnnotationParameter(an, ConstPool.FIELD_TARGET_CLASS, null, Type.class);
if (type != null && !type.getClassName().equals(NullType.class.getName())) { if (type != null) {
targetClassName = ClassUtil.toByteCodeClassName(type.getClassName()); targetClassName = ClassUtil.toByteCodeClassName(type.getClassName());
} }
AnnotationUtil.removeAnnotationParameter(an, ConstPool.FIELD_TARGET_CLASS); AnnotationUtil.removeAnnotationParameter(an, ConstPool.FIELD_TARGET_CLASS);

12
testable-agent/src/main/java/com/alibaba/testable/agent/transformer/TestableClassTransformer.java
View File

@ -202,7 +202,7 @@ public class TestableClassTransformer implements ClassFileTransformer {
ClassUtil.extractParameters(mn.desc), ClassUtil.getReturnType(mn.desc)); ClassUtil.extractParameters(mn.desc), ClassUtil.getReturnType(mn.desc));
addMockConstructor(methodInfos, cn, mn); addMockConstructor(methodInfos, cn, mn);
} else if (fullClassName.equals(ConstPool.MOCK_METHOD)) { } else if (fullClassName.equals(ConstPool.MOCK_METHOD)) {
LogUtil.verbose(" Mock method \"%s\" as \"%s\"", mn.name, mn.desc); LogUtil.verbose(" Mock method \"%s\" as \"%s\"", mn.name, getTargetMethodDesc(mn, an));
String targetMethod = AnnotationUtil.getAnnotationParameter( String targetMethod = AnnotationUtil.getAnnotationParameter(
an, ConstPool.FIELD_TARGET_METHOD, mn.name, String.class); an, ConstPool.FIELD_TARGET_METHOD, mn.name, String.class);
if (ConstPool.CONSTRUCTOR.equals(targetMethod)) { if (ConstPool.CONSTRUCTOR.equals(targetMethod)) {
@ -218,9 +218,15 @@ public class TestableClassTransformer implements ClassFileTransformer {
} }
} }
private String getTargetMethodDesc(MethodNode mn, AnnotationNode mockMethodAnnotation) {
Type type = AnnotationUtil.getAnnotationParameter(mockMethodAnnotation, ConstPool.FIELD_TARGET_CLASS,
null, Type.class);
return type == null ? ClassUtil.removeFirstParameter(mn.desc) : mn.desc;
}
private MethodInfo getMethodInfo(MethodNode mn, AnnotationNode an, String targetMethod) { private MethodInfo getMethodInfo(MethodNode mn, AnnotationNode an, String targetMethod) {
Type targetType = AnnotationUtil.getAnnotationParameter(an, ConstPool.FIELD_TARGET_CLASS, null, Type.class); Type targetType = AnnotationUtil.getAnnotationParameter(an, ConstPool.FIELD_TARGET_CLASS, null, Type.class);
if (targetType == null || targetType.getClassName().equals(NullType.class.getName())) { if (targetType == null) {
// "targetClass" unset, use first parameter as target class type // "targetClass" unset, use first parameter as target class type
ImmutablePair<String, String> methodDescPair = extractFirstParameter(mn.desc); ImmutablePair<String, String> methodDescPair = extractFirstParameter(mn.desc);
if (methodDescPair == null) { if (methodDescPair == null) {
@ -299,7 +305,7 @@ public class TestableClassTransformer implements ClassFileTransformer {
ClassType.class); ClassType.class);
if (isExpectedType(cn.name, type, expectedType)) { if (isExpectedType(cn.name, type, expectedType)) {
Type clazz = AnnotationUtil.getAnnotationParameter(an, FIELD_VALUE, null, Type.class); Type clazz = AnnotationUtil.getAnnotationParameter(an, FIELD_VALUE, null, Type.class);
if (clazz == null || NullType.class.getName().equals(clazz.getClassName())) { if (clazz == null) {
return null; return null;
} }
return clazz.getClassName(); return clazz.getClassName();