From a58f9440d5d1adcadfcc7ccd6941b403e5b08843 Mon Sep 17 00:00:00 2001
From: Kengo TODA <skypencil@gmail.com>
Date: Fri, 17 Apr 2015 07:34:11 +0800
Subject: [PATCH] pass compilation, but still have four test failures

---
 pom.xml                                        | 12 +++++++++++-
 .../regression/RegressionPredicate.java        | 11 ++++++++---
 .../regression/RegressionReportNotifier.java   | 18 ++++++++++++++----
 .../regression/TestResultToCaseResult.java     | 13 +++++++++++++
 4 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/jp/skypencil/jenkins/regression/TestResultToCaseResult.java

diff --git a/pom.xml b/pom.xml
index 78979fb..2d961bf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.436</version>
+    <version>1.596</version>
   </parent>
   <artifactId>regression-report-plugin</artifactId>
   <name>Regression Report Plugin</name>
@@ -73,6 +73,16 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>mailer</artifactId>
+      <version>1.10</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/src/main/java/jp/skypencil/jenkins/regression/RegressionPredicate.java b/src/main/java/jp/skypencil/jenkins/regression/RegressionPredicate.java
index fce2716..4d09efa 100755
--- a/src/main/java/jp/skypencil/jenkins/regression/RegressionPredicate.java
+++ b/src/main/java/jp/skypencil/jenkins/regression/RegressionPredicate.java
@@ -1,12 +1,17 @@
 package jp.skypencil.jenkins.regression;
 
 import hudson.tasks.junit.CaseResult;
+import hudson.tasks.test.TestResult;
 
 import com.google.common.base.Predicate;
 
-class RegressionPredicate implements Predicate<CaseResult> {
+class RegressionPredicate implements Predicate<TestResult> {
     @Override
-    public boolean apply(CaseResult input) {
-        return input.getStatus().isRegression();
+    public boolean apply(TestResult input) {
+        if (input instanceof CaseResult) {
+            CaseResult caseResult = (CaseResult) input;
+            return caseResult.getStatus().isRegression();
+        }
+        return false;
     }
 }
diff --git a/src/main/java/jp/skypencil/jenkins/regression/RegressionReportNotifier.java b/src/main/java/jp/skypencil/jenkins/regression/RegressionReportNotifier.java
index 2347f8f..a816744 100644
--- a/src/main/java/jp/skypencil/jenkins/regression/RegressionReportNotifier.java
+++ b/src/main/java/jp/skypencil/jenkins/regression/RegressionReportNotifier.java
@@ -16,6 +16,7 @@
 import hudson.tasks.Mailer;
 import hudson.tasks.junit.CaseResult;
 import hudson.tasks.test.AbstractTestResultAction;
+import hudson.tasks.test.TestResult;
 
 import java.io.PrintStream;
 import java.util.Date;
@@ -33,6 +34,7 @@
 import javax.mail.internet.MimeMessage;
 
 import jenkins.model.Jenkins;
+import jenkins.model.JenkinsLocationConfiguration;
 
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -103,8 +105,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher,
         }
 
         logger.println("regression reporter starts now...");
-        List<CaseResult> failedTest = testResultAction.getFailedTests();
-        List<CaseResult> regressionedTests = Lists.newArrayList(Iterables.filter(failedTest, new RegressionPredicate()));
+        List<CaseResult> regressionedTests = listRegressions(testResultAction);
 
         writeToConsole(regressionedTests, listener);
         try {
@@ -117,6 +118,15 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher,
         return true;
     }
 
+    private List<CaseResult> listRegressions(
+            AbstractTestResultAction<?> testResultAction) {
+        List<? extends TestResult> failedTest = testResultAction.getFailedTests();
+        Iterable<? extends TestResult> filtered = Iterables.filter(failedTest, new RegressionPredicate());
+        List<CaseResult> regressionedTests =
+                Lists.newArrayList(Iterables.transform(filtered, new TestResultToCaseResult()));
+        return regressionedTests;
+    }
+
     private void writeToConsole(List<CaseResult> regressions,
             BuildListener listener) {
         if (regressions.isEmpty()) {
@@ -147,8 +157,8 @@ private void mailReport(List<CaseResult> regressions, String recipients,
         if (Jenkins.getInstance() != null) {
             rootUrl = Jenkins.getInstance().getRootUrl();
             session = Mailer.descriptor().createSession();
-            adminAddress = new InternetAddress(Mailer.descriptor()
-                    .getAdminAddress());
+            adminAddress = new InternetAddress(
+                    JenkinsLocationConfiguration.get().getAdminAddress());
         }
         builder.append(Util.encode(rootUrl));
         builder.append(Util.encode(build.getUrl()));
diff --git a/src/main/java/jp/skypencil/jenkins/regression/TestResultToCaseResult.java b/src/main/java/jp/skypencil/jenkins/regression/TestResultToCaseResult.java
new file mode 100644
index 0000000..1d50688
--- /dev/null
+++ b/src/main/java/jp/skypencil/jenkins/regression/TestResultToCaseResult.java
@@ -0,0 +1,13 @@
+package jp.skypencil.jenkins.regression;
+
+import hudson.tasks.junit.CaseResult;
+import hudson.tasks.test.TestResult;
+
+import com.google.common.base.Function;
+
+class TestResultToCaseResult implements Function<TestResult, CaseResult> {
+    @Override
+    public CaseResult apply(TestResult input) {
+        return (CaseResult) input;
+    }
+}