diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java index 1ee9c5209..dab364a77 100644 --- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java +++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java @@ -16,6 +16,7 @@ package io.qameta.allure.description; import io.qameta.allure.Description; +import io.qameta.allure.util.ResultsUtils; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Filer; @@ -85,8 +86,8 @@ public boolean process(final Set annotations, final Round final String hash = generateMethodSignatureHash(el.getEnclosingElement().toString(), name, typeParams); try { - final FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT, - "allureDescriptions", hash); + final FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT, "", + ResultsUtils.ALLURE_DESCRIPTIONS_FOLDER + hash); try (Writer writer = file.openWriter()) { writer.write(docs); } diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java index d285ea178..9f3d4c705 100644 --- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java +++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java @@ -18,6 +18,7 @@ import com.google.testing.compile.Compilation; import com.google.testing.compile.Compiler; import com.google.testing.compile.JavaFileObjects; +import io.qameta.allure.util.ResultsUtils; import org.junit.jupiter.api.Test; import javax.tools.JavaFileObject; @@ -30,9 +31,6 @@ * @author Egor Borisov ehborisov@gmail.com */ class ProcessDescriptionsTest { - - private static final String ALLURE_PACKAGE_NAME = "allureDescriptions"; - @Test void captureDescriptionTest() { final String expectedMethodSignatureHash = "4e7f896021ef2fce7c1deb7f5b9e38fb"; @@ -58,8 +56,8 @@ void captureDescriptionTest() { Compilation compilation = compiler.compile(source); assertThat(compilation).generatedFile( StandardLocation.CLASS_OUTPUT, - ALLURE_PACKAGE_NAME, - expectedMethodSignatureHash + "", + ResultsUtils.ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash ); } @@ -121,8 +119,8 @@ void captureDescriptionParametrizedTestWithGenericParameterTest() { Compilation compilation = compiler.compile(source); assertThat(compilation).generatedFile( StandardLocation.CLASS_OUTPUT, - ALLURE_PACKAGE_NAME, - expectedMethodSignatureHash + "", + ResultsUtils.ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash ); } @@ -154,8 +152,8 @@ void captureDescriptionParametrizedTestWithPrimitivesParameterTest() { Compilation compilation = compiler.compile(source); assertThat(compilation).generatedFile( StandardLocation.CLASS_OUTPUT, - ALLURE_PACKAGE_NAME, - expectedMethodSignatureHash + "", + ResultsUtils.ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash ); } } diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java index 4893dd4d5..334727e1f 100644 --- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java +++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java @@ -95,9 +95,9 @@ public final class ResultsUtils { public static final String PACKAGE_LABEL_NAME = "package"; public static final String FRAMEWORK_LABEL_NAME = "framework"; public static final String LANGUAGE_LABEL_NAME = "language"; + public static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/"; private static final Logger LOGGER = LoggerFactory.getLogger(ResultsUtils.class); - private static final String ALLURE_DESCRIPTIONS_PACKAGE = "allureDescriptions/"; private static final String MD_5 = "MD5"; private static String cachedHost; @@ -305,7 +305,7 @@ public static Optional getJavadocDescription(final ClassLoader classLoad name, parameterTypes); - return readResource(classLoader, ALLURE_DESCRIPTIONS_PACKAGE + signatureHash) + return readResource(classLoader, ALLURE_DESCRIPTIONS_FOLDER + signatureHash) .map(desc -> separateLines() ? desc.replace("\n", "
") : desc); }