support allure1 step template (via #196)

Artem Eroshenko · web-flow · commit 25f99d9c6715 · 2018-02-11T15:08:13.000+03:00
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
@@ -5,12 +5,14 @@
 import io.qameta.allure.Step;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StepResult;
+import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 
 import static io.qameta.allure.util.AspectUtils.getParameters;
@@ -34,10 +36,13 @@ public class StepsAspects {
     public Object step(final ProceedingJoinPoint joinPoint) throws Throwable {
         final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
         final Step step = methodSignature.getMethod().getAnnotation(Step.class);
-        final String name = step.value().isEmpty()
-                ? methodSignature.getName()
-                : processNameTemplate(step.value(), getParametersMap(methodSignature, joinPoint.getArgs()));
+
         final String uuid = UUID.randomUUID().toString();
+        final String name = Optional.of(step.value())
+                .filter(StringUtils::isNoneEmpty)
+                .map(value -> processNameTemplate(value, getParametersMap(methodSignature, joinPoint.getArgs())))
+                .orElse(methodSignature.getName());
+
         final StepResult result = new StepResult()
                 .withName(name)
                 .withParameters(getParameters(methodSignature, joinPoint.getArgs()));
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
@@ -29,8 +29,10 @@ public static Parameter[] getParameters(final MethodSignature signature, final O
     public static Map<String, Object> getParametersMap(final MethodSignature signature, final Object... args) {
         final String[] parameterNames = signature.getParameterNames();
         final Map<String, Object> params = new HashMap<>();
+        params.put("method", signature.getName());
         for (int i = 0; i < Math.max(parameterNames.length, args.length); i++) {
             params.put(parameterNames[i], args[i]);
+            params.put(Integer.toString(i), args[i]);
         }
         return params;
     }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
@@ -28,13 +28,17 @@ public class NamingUtilsTest {
     @Parameterized.Parameter(2)
     public String expected;
 
-    @Parameterized.Parameters
+    @Parameterized.Parameters(name = "{0}")
     public static Collection<Object[]> data() {
         return Arrays.asList(
-                new Object[]{"Hello word", Collections.emptyMap(), "Hello word"},
-                new Object[]{"{missing}", Collections.emptyMap(), "{missing}"},
                 new Object[]{"", Collections.singletonMap("a", "b"), ""},
                 new Object[]{"", Collections.singletonMap("a", "b"), ""},
+                new Object[]{"Hello word", Collections.emptyMap(), "Hello word"},
+
+                new Object[]{"Hello {0}", Collections.singletonMap("0", "world"), "Hello world"},
+                new Object[]{"Hello {method}", Collections.singletonMap("method", "world"), "Hello world"},
+
+                new Object[]{"{missing}", Collections.emptyMap(), "{missing}"},
                 new Object[]{"Hello {user}!", Collections.singletonMap("user", "Ivan"), "Hello Ivan!"},
                 new Object[]{"Hello {user}", Collections.singletonMap("user", null), "Hello null"},
                 new Object[]{"Hello {users}", Collections.singletonMap("users", Arrays.asList("Ivan", "Petr")), "Hello [Ivan, Petr]"},

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,10 @@ public static Parameter[] getParameters(final MethodSignature signature, final O`
`29`	`29`	`public static Map<String, Object> getParametersMap(final MethodSignature signature, final Object... args) {`
`30`	`30`	`final String[] parameterNames = signature.getParameterNames();`
`31`	`31`	`final Map<String, Object> params = new HashMap<>();`
	`32`	`+ params.put("method", signature.getName());`
`32`	`33`	`for (int i = 0; i < Math.max(parameterNames.length, args.length); i++) {`
`33`	`34`	`params.put(parameterNames[i], args[i]);`
	`35`	`+ params.put(Integer.toString(i), args[i]);`
`34`	`36`	`}`
`35`	`37`	`return params;`
`36`	`38`	`}`