junit4 aspect listener + local spi-off distribution fixes (via allure-framework#74)

ehborisov · baev · commit 6f2c2722ceb4 · 2017-06-05T19:09:14.000+03:00
diff --git a/allure-junit4-aspect/build.gradle b/allure-junit4-aspect/build.gradle
@@ -0,0 +1,23 @@
+description = 'Aspect for Allure JUnit 4 listener'
+
+apply plugin: 'java'
+apply from: "${gradleScriptDir}/maven-publish.gradle"
+apply from: "${gradleScriptDir}/bintray.gradle"
+
+
+repositories {
+    mavenCentral()
+}
+
+configurations {
+    agent
+}
+
+dependencies {
+    agent 'org.aspectj:aspectjweaver'
+    compileOnly 'org.aspectj:aspectjrt'
+    compileOnly 'junit:junit:4.12'
+    compile project(':allure-junit4')
+
+    testCompile 'junit:junit:4.12'
+}
diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/AllureJunit4ListenerAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/AllureJunit4ListenerAspect.java
@@ -0,0 +1,27 @@
+package io.qameta.allure.junit4;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.junit.runner.notification.RunNotifier;
+
+/**
+ * @author Egor Borisov ehborisov@gmail.com
+ */
+@Aspect
+public class AllureJunit4ListenerAspect {
+
+    private final AllureJunit4 allureJunit4 = new AllureJunit4();
+
+    @Pointcut("execution(org.junit.runner.notification.RunNotifier.new())")
+    public void run() {
+        //empty pointcut body
+    }
+
+    @After("run()")
+    public void run(final JoinPoint point) {
+        final RunNotifier notifier = (RunNotifier) point.getThis();
+        notifier.addListener(allureJunit4);
+    }
+}
diff --git a/allure-junit4-aspect/src/main/resources/META-INF/aop.xml b/allure-junit4-aspect/src/main/resources/META-INF/aop.xml
@@ -0,0 +1,5 @@
+<aspectj>
+    <aspects>
+        <aspect name="io.qameta.allure.junit4.AllureJunit4ListenerAspect"/>
+    </aspects>
+</aspectj>
diff --git a/allure-junit5/build.gradle b/allure-junit5/build.gradle
@@ -61,4 +61,5 @@ configurations {
 
 artifacts {
     spiOff spiOffJar
+    archives spiOffJar
 }
diff --git a/allure-testng/build.gradle b/allure-testng/build.gradle
@@ -55,4 +55,5 @@ configurations {
 
 artifacts {
     spiOff spiOffJar
+    archives spiOffJar
 }
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
@@ -4,7 +4,7 @@ bintray {
     user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
     key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
 
-    configurations = ['archives', 'spiOff']
+    configurations = ['archives']
 
     publish = true
     pkg {
diff --git a/settings.gradle b/settings.gradle
@@ -10,6 +10,7 @@ include 'allure-attachments'
 include 'allure-okhttp3'
 include 'allure-httpclient'
 include 'allure-rest-assured'
+include 'allure-junit4-aspect'
 
 def examples = [
         'testng',

Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,5 @@ configurations {`
`61`	`61`
`62`	`62`	`artifacts {`
`63`	`63`	`spiOff spiOffJar`
	`64`	`+ archives spiOffJar`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,5 @@ configurations {`
`55`	`55`
`56`	`56`	`artifacts {`
`57`	`57`	`spiOff spiOffJar`
	`58`	`+ archives spiOffJar`
`58`	`59`	`}`