Changeset 1047 for trunk/src/java/org/jcoderz/phoenix/report/JcReportAntTask.java

Timestamp:

06/27/08 19:04:30 (4 years ago)

Author:

amandel

Message:

Added support for emma coverage report files. The 'es' files are read directly using the emma classes

Files:

• trunk/src/java/org/jcoderz/phoenix/report/JcReportAntTask.java (modified) (8 diffs)

trunk/src/java/org/jcoderz/phoenix/report/JcReportAntTask.java

@@ -402 +402 @@
         }
 
+        final File emmaFile;
+        if (mTools.getEmma() != null)
+        {   // EXCEPTION?
+            emmaFile = new File(mTools.getEmma().mDatafile);
+        }
+        else
+        {
+            emmaFile = null;
+        }
+
         // Merge the different reports into one jcoderz-report.xml
         // This must be done on a level by level basis
         return executeReportNormalizer(srcDir, reportTmpDir,
               nre.getLevel(), checkstyleXml, findbugsXml, pmdXml,
-              cpdXml, coberturaXml);
+              cpdXml, coberturaXml, emmaFile);
     }
 
@@ -488 +498 @@
    private File executeReportNormalizer (File srcDir, File reportDir,
             ReportLevel level, File checkstyleXml,
-            File findbugsXml, File pmdXml, File cpdXml, File coberturaXml)
+            File findbugsXml, File pmdXml, File cpdXml, File coberturaXml,
+            File emmaSummary)
        throws IOException, JAXBException, TransformerException
    {
@@ -543 +554 @@
          cmd.createArgument().setValue("-cobertura");
          cmd.createArgument().setFile(coberturaXml);
+      }
+
+      if (emmaSummary != null)
+      {
+         cmd.createArgument().setValue("-emma");
+         cmd.createArgument().setFile(emmaSummary);
       }
 
@@ -676 +693 @@
    }
 
-   
+
    //
    // Reports section
@@ -898 +915 @@
       private NestedCheckstyleElement mCheckstyle = null;
       private NestedCoberturaElement mCobertura = null;
+      private NestedEmmaElement mEmma = null;
 
       public NestedToolsElement (JcReportAntTask task)
@@ -972 +990 @@
       {
          return mCobertura;
+      }
+
+      public NestedEmmaElement createEmma ()
+      {
+         mTask.log("Creating Emma element...");
+         mEmma = new NestedEmmaElement(mTask);
+         return mEmma;
+      }
+
+      public NestedEmmaElement getEmma ()
+      {
+         return mEmma;
       }
    }
@@ -1462 +1492 @@
              cmd.getSystemProperties().addVariable(var);
          }
-        
+
          forkToolProcess(mTask, cmd, new LogStreamHandler(mTask,
             Project.MSG_INFO, Project.MSG_WARN));
@@ -1537 +1567 @@
    }
 
-
+   public static class NestedEmmaElement
+        extends NestedToolElement
+    {
+        private String mDatafile;
+
+        public NestedEmmaElement (JcReportAntTask task)
+        {
+            super(task);
+        }
+
+        public void setDatafile (String datafile)
+        {
+            mDatafile = datafile;
+        }
+
+        /**
+         * Nothing to be done for emma.
+         */
+        public File execute (File reportDir, File srcDir, File clsPath)
+        {
+            return new File(mDatafile);
+        }
+    }
    //
    // Filters section