Changeset 1047

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

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• CHANGES (modified) (2 diffs)
• config/ivy.xml (modified) (1 diff)
• src/java/org/jcoderz/phoenix/report/EmmaReportReader.java (added)
• src/java/org/jcoderz/phoenix/report/JcReportAntTask.java (modified) (8 diffs)
• src/java/org/jcoderz/phoenix/report/ReportNormalizer.java (modified) (1 diff)
• src/java/org/jcoderz/phoenix/report/ReportNormalizerAntTask.java (modified) (2 diffs)
• src/java/org/jcoderz/phoenix/report/ReportReaderFactory.java (modified) (3 diffs)
• src/java/org/jcoderz/phoenix/report/ResourceInfo.java (modified) (2 diffs)
• src/java/org/jcoderz/phoenix/report/package.html (modified) (2 diffs)

trunk/.classpath

@@ -158 +158 @@
                 </attributes>
         </classpathentry>
+        <classpathentry kind="lib" path="lib/default/emma/emma.jar"/>
         <classpathentry kind="output" path="eclipse/bin"/>
 </classpath>

trunk/CHANGES

@@ -22 +22 @@
   * Generated StrongTypes (immutable ones) do implement a
     common interface (StrongType).
+  * The jcreport can now read emma 'es' files to as coverage
+    info. http://emma.sourceforge.net/
 
 Fawkez 1.1 'The Man Trap' (March 31, 2007)
-https://www.jcoderz.org/fawkez/browser/tags/FAWKEZ_1_1_0
+http://www.jcoderz.org/fawkez/browser/tags/FAWKEZ_1_1_0
 
   * New features: #34
@@ -33 +35 @@
 
 Fawkez 1.0 'going public' (November 26, 2006)
-https://www.jcoderz.org/fawkez/browser/tags/FAWKEZ_1_0_0
+http://www.jcoderz.org/fawkez/browser/tags/FAWKEZ_1_0_0

trunk/config/ivy.xml

@@ -140 +140 @@
             <artifact name="avalon-framework" type="jar"/>
         </dependency>
+
+        <dependency org="emma" name="emma" rev="2.0.5312">
+            <artifact name="emma" type="jar"/>
+            <artifact name="emma_ant" type="jar"/>
+        </dependency>
    </dependencies>
 

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

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

@@ -339 +339 @@
                     addReport(ReportFormat.PMD, args[i + 1]);
                 }
+                else if (args[i].equals("-emma"))
+                {
+                    addReport(ReportFormat.EMMA, args[i + 1]);
+                }
                 else if (args[i].equals("-cpd"))
                 {

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

@@ -81 +81 @@
    /** The Java Commandline */
    private final CommandlineJava mCommandline = new CommandlineJava();
-   /** 
-    * List of source directories of type JcoderzReportAntTask.SourceDirectory. 
+   /**
+    * List of source directories of type JcoderzReportAntTask.SourceDirectory.
     */
    private final List mSourceDirectories = new ArrayList();
@@ -273 +273 @@
       cmd.setClassname(ReportNormalizer.class.getName());
 
-      cmd.createVmArgument().setValue("-Xmx1500m");
+// WOW      cmd.createVmArgument().setValue("-Xmx1500m");
 
       cmd.createArgument().setValue("-out");

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

@@ -37 +37 @@
 /**
  * Factory class to create a report reader for the requested report format.
- * 
+ *
  * @author Michael Griffel
  */
@@ -50 +50 @@
     /**
      * Creates a report reader for the given report format.
-     * 
+     *
      * @param format the report format.
      * @return a report reader for the given report format.
@@ -87 +87 @@
                 result = new SourceDirectoryReader();
             }
+            else if (ReportFormat.EMMA == format)
+            {
+                result = new EmmaReportReader();
+            }
             else if (ReportFormat.JCODERZ == format)
             {

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

@@ -149 +149 @@
 
     /**
+     * Searches the resource with the given class name and package.
+     *
+     * @param packageName resource package name.
+     * @param className resource class name.
+     * @return the resource for the given name or <tt>null</tt> if not found.
+     */
+    public static ResourceInfo lookup (String packageName, String className)
+    {
+        ResourceInfo result = null;
+        for (ResourceInfo resource: RESOURCES.values())
+        {
+            if (resource.getClassname().equals(className)
+                && resource.getPackage().equals(packageName))
+            {
+                result = resource;
+                break;
+            }
+        }
+        return result;
+    }
+
+    static String dump ()
+    {
+        return RESOURCES.toString();
+    }
+    /**
      * Returns the number of lines for the given file <tt>filename</tt>.
      * @param fileName the name of the file.
@@ -270 +296 @@
     {
         return "[ResourceInfo: name=" + mResourceName + ", pkg=" + mPackage
-                + ", sourceDir=" + mSourcDir + "]";
+                + ", sourceDir=" + mSourcDir + ", mClassname=" + mClassname
+                + "]";
     }
 

trunk/src/java/org/jcoderz/phoenix/report/package.html

@@ -1 +1 @@
 <body>
-<p>The JCReport performs the following steps:
+
+The JCReport performs the following steps:
 
 <ol>
@@ -8 +9 @@
 <li>Converting the report into a HTML representation.</li>
 </ol>
-</p>
 </body>