add support for this keyword to step templates (fixes allure-framework#385, via allure-framework#377)

Denysss · baev · commit 9aa3be0b4191 · 2019-08-08T13:40:22.000+03:00
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
@@ -79,7 +79,7 @@ public void attachment(final JoinPoint joinPoint, final Object result) {
 
         final String name = attachment.value().isEmpty()
                 ? methodSignature.getName()
-                : processNameTemplate(attachment.value(), getParametersMap(methodSignature, joinPoint.getArgs()));
+                : processNameTemplate(attachment.value(), getParametersMap(joinPoint));
         getLifecycle().addAttachment(name, attachment.type(), attachment.fileExtension(), bytes);
     }
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
@@ -68,7 +68,7 @@ public void stepStart(final JoinPoint joinPoint) {
         final Step step = methodSignature.getMethod().getAnnotation(Step.class);
 
         final String uuid = UUID.randomUUID().toString();
-        final String name = getName(step.value(), methodSignature, joinPoint.getArgs());
+        final String name = getName(step.value(), joinPoint);
         final List<Parameter> parameters = getParameters(methodSignature, joinPoint.getArgs());
 
         final StepResult result = new StepResult()
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
@@ -16,6 +16,7 @@
 package io.qameta.allure.util;
 
 import io.qameta.allure.model.Parameter;
+import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
 
 import java.util.HashMap;
@@ -37,6 +38,10 @@ private AspectUtils() {
         throw new IllegalStateException("Do not instance");
     }
 
+    /**
+     * @deprecated use {@link AspectUtils#getName(String,JoinPoint)} instead.
+     */
+    @Deprecated
     public static String getName(final String nameTemplate,
                                  final MethodSignature methodSignature,
                                  final Object... args) {
@@ -46,6 +51,17 @@ public static String getName(final String nameTemplate,
                 .orElseGet(methodSignature::getName);
     }
 
+    public static String getName(final String nameTemplate, final JoinPoint joinPoint) {
+        return Optional.of(nameTemplate)
+                .filter(v -> !v.isEmpty())
+                .map(value -> processNameTemplate(value, getParametersMap(joinPoint)))
+                .orElseGet(joinPoint.getSignature()::getName);
+    }
+
+    /**
+     * @deprecated use {@link AspectUtils#getParametersMap(JoinPoint)} instead.
+     */
+    @Deprecated
     public static Map<String, Object> getParametersMap(final MethodSignature signature, final Object... args) {
         final String[] parameterNames = signature.getParameterNames();
         final Map<String, Object> params = new HashMap<>();
@@ -57,6 +73,13 @@ public static Map<String, Object> getParametersMap(final MethodSignature signatu
         return params;
     }
 
+    public static Map<String, Object> getParametersMap(final JoinPoint joinPoint) {
+        final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
+        final Map<String, Object> params = getParametersMap(methodSignature, joinPoint.getArgs());
+        Optional.ofNullable(joinPoint.getThis()).ifPresent(objThis -> params.put("this", objThis));
+        return params;
+    }
+
     public static List<Parameter> getParameters(final MethodSignature signature, final Object... args) {
         return IntStream
                 .range(0, args.length)

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void attachment(final JoinPoint joinPoint, final Object result) {`
`79`	`79`
`80`	`80`	`final String name = attachment.value().isEmpty()`
`81`	`81`	`? methodSignature.getName()`
`82`		`- : processNameTemplate(attachment.value(), getParametersMap(methodSignature, joinPoint.getArgs()));`
	`82`	`+ : processNameTemplate(attachment.value(), getParametersMap(joinPoint));`
`83`	`83`	`getLifecycle().addAttachment(name, attachment.type(), attachment.fileExtension(), bytes);`
`84`	`84`	`}`
`85`	`85`