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.

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

add executor info #22

Merged
merged 3 commits into from
Sep 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import org.gradle.api.tasks.TaskAction
import java.nio.file.Files
import java.nio.file.Path

import static io.qameta.allure.gradle.util.BuildUtils.copyExecutorInfo

/**
* @author Egor Borisov ehborisov@gmail.com
*/
Expand Down Expand Up @@ -46,6 +48,7 @@ class AllureReport extends DefaultTask implements Reporting<AllureReportContaine
void generateAllureReport() {
Path allureHome = project.rootDir.toPath().resolve('.allure').resolve("allure-${version}")
Path allureExecutable = allureHome.resolve('bin').resolve(BuildUtils.allureExecutable).toAbsolutePath()
Map<String, String> executorInfo = [name: 'Gradle', type: 'gradle', buildName: project.displayName]

if (Files.notExists(allureExecutable)) {
logger.warn("Cannot find allure commanline in $allureHome")
Expand All @@ -57,6 +60,7 @@ class AllureReport extends DefaultTask implements Reporting<AllureReportContaine
commandLine("$allureExecutable")
args(GENERATE_COMMAND)
resultsDirs.each {
copyExecutorInfo(it, executorInfo)
args("$it.absolutePath")
}
args('-o', "$reportDir.absolutePath")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import org.gradle.api.tasks.TaskAction
import java.nio.file.Files
import java.nio.file.Path

import static io.qameta.allure.gradle.util.BuildUtils.copyExecutorInfo

/**
* @author Egor Borisov ehborisov@gmail.com
*/
Expand All @@ -33,6 +35,7 @@ class AllureServe extends DefaultTask {
void serveAllureReport() {
Path allureHome = project.rootDir.toPath().resolve('.allure').resolve("allure-${version}")
Path allureExecutable = allureHome.resolve('bin').resolve(BuildUtils.allureExecutable).toAbsolutePath()
Map<String, String> executorInfo = [name: 'Gradle', type: 'gradle', buildName: project.displayName]

if (Files.notExists(allureExecutable)) {
logger.warn("Cannot find allure commanline in $allureHome")
Expand All @@ -44,6 +47,7 @@ class AllureServe extends DefaultTask {
commandLine("$allureExecutable")
args(SERVE_COMMAND)
resultsDirs.each {
copyExecutorInfo(it, executorInfo)
args("$it.absolutePath")
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package io.qameta.allure.gradle.util

import groovy.json.JsonOutput

import java.nio.file.Paths

/**
* @author Egor Borisov ehborisov@gmail.com
*/
Expand All @@ -13,4 +17,9 @@ class BuildUtils {
return isWindows() ? 'allure.bat' : 'allure'
}

static void copyExecutorInfo(File resultsDir, Map<String, String> executorInfo) {
File executorInfoFile = Paths.get(resultsDir.absoluteFile.path).resolve('executor.json').toFile()
executorInfoFile.text = JsonOutput.toJson(executorInfo)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import static org.gradle.testkit.runner.TaskOutcome.SUCCESS;

@RunWith(Parameterized.class)
public class ReportTest {
public class AggregatedReportTest {

@Parameterized.Parameter(0)
public String version;
Expand All @@ -35,9 +35,6 @@ public class ReportTest {
@Parameterized.Parameters(name = "{1} [{0}]")
public static Collection<Object[]> getFrameworks() {
return Arrays.asList(
new Object[]{"3.5", "src/it/test-finalized-by-report", new String[]{"test"}},
new Object[]{"3.5", "src/it/report-task", new String[]{"allureReport"}},
new Object[]{"4.0", "src/it/report-task", new String[]{"allureReport"}},
new Object[]{"3.5", "src/it/report-multi", new String[]{"allureAggregatedReport"}},
new Object[]{"4.0", "src/it/report-multi", new String[]{"allureAggregatedReport"}}
);
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/io/qameta/allure/gradle/DependenciesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ public void shouldCreateAllureResults() {
.extracting("outcome")
.containsExactly(SUCCESS);

File projectDir = gradleRunner.getProjectDir();
File resultsDir = new File(projectDir, "build/allure-results");
File resultsDir = new File(gradleRunner.getProjectDir(), "build/allure-results");
assertThat(resultsDir).as("Allure results directory")
.exists();

Expand Down
68 changes: 68 additions & 0 deletions src/test/java/io/qameta/allure/gradle/SingleReportTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package io.qameta.allure.gradle;

import io.qameta.allure.gradle.rule.GradleRunnerRule;
import org.gradle.testkit.runner.BuildResult;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

import java.io.File;
import java.util.Arrays;
import java.util.Collection;

import static org.assertj.core.api.Assertions.assertThat;
import static org.gradle.testkit.runner.TaskOutcome.SUCCESS;

@RunWith(Parameterized.class)
public class SingleReportTest {

@Parameterized.Parameter(0)
public String version;

@Parameterized.Parameter(1)
public String project;

@Parameterized.Parameter(2)
public String[] tasks;

@Rule
public GradleRunnerRule gradleRunner = new GradleRunnerRule()
.version(() -> version)
.project(() -> project)
.tasks(() -> tasks);

@Parameterized.Parameters(name = "{1} [{0}]")
public static Collection<Object[]> getFrameworks() {
return Arrays.asList(
new Object[]{"3.5", "src/it/test-finalized-by-report", new String[]{"test"}},
new Object[]{"3.5", "src/it/report-task", new String[]{"allureReport"}},
new Object[]{"4.0", "src/it/report-task", new String[]{"allureReport"}}
);
}

@Test
public void shouldGenerateAllureReport() {
BuildResult buildResult = gradleRunner.getBuildResult();
File resultsDir = new File(gradleRunner.getProjectDir(), "build/allure-results");

assertThat(buildResult.getTasks()).as("Download allure task status")
.filteredOn(task -> task.getPath().equals(":downloadAllure"))
.extracting("outcome")
.containsExactly(SUCCESS);

assertThat(resultsDir.listFiles()).as("Allure executor info")
.filteredOn(file -> file.getName().endsWith("executor.json"))
.hasSize(1);

File projectDir = gradleRunner.getProjectDir();
File reportDir = new File(projectDir, "build/reports/allure-report");
assertThat(reportDir).as("Allure report directory")
.exists();

File testCasesDir = new File(reportDir, "data/test-cases");
assertThat(testCasesDir.listFiles()).as("Allure test cases directory")
.isNotEmpty();

}
}