Changeset 1051

Timestamp:

06/29/08 16:48:36 (4 years ago)

Author:

amandel

Message:

Also mark classes as not covered if there is no coverage information (but analysis information) available.

Files:

• trunk/src/java/org/jcoderz/phoenix/report/EmmaReportReader.java (modified) (2 diffs)

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

@@ -119 +119 @@
         {
             ClassDescriptor clazz = (ClassDescriptor) i.next();
-            DataHolder coverage = mEmmaCoverageData.getCoverage(clazz);
-            if (coverage != null)
-            {
-                final String classname
-                    = clazz.getClassVMName().substring(
-                        clazz.getClassVMName().lastIndexOf('/') + 1);
-                final ResourceInfo source
-                    = ResourceInfo.lookup(
-                        clazz.getPackageVMName().replaceAll("/", "."),
-                        classname);
-                if (source != null)
-                {
-                    processClazz(itemMap, source, clazz, coverage);
-                }
-                else
-                {
-                    logger.finer(
-                        "Ignoring coverage info for resource "
-                            + clazz.getPackageVMName().replaceAll("/", ".")
-                            + classname);
-                }
+            final String classname
+                = clazz.getClassVMName().substring(
+                    clazz.getClassVMName().lastIndexOf('/') + 1);
+            final ResourceInfo source
+                = ResourceInfo.lookup(
+                    clazz.getPackageVMName().replaceAll("/", "."), classname);
+            if (source != null)
+            {
+                processClazz(itemMap, source, clazz,
+                    mEmmaCoverageData.getCoverage(clazz));
+            }
+            else
+            {
+                logger.finer(
+                    "Ignoring coverage info for resource "
+                        + clazz.getPackageVMName().replaceAll("/", ".")
+                        + classname);
             }
         }
@@ -191 +187 @@
                 && method.getBlockMap() != null)
             {
-                final boolean[] methodCoverage
-                    = coverage.m_coverage[methodNr];
+                boolean[] methodCoverage = null;
+                if (coverage!= null)
+                {
+                    methodCoverage = coverage.m_coverage[methodNr];
+                }
                 final int[][] map = method.getBlockMap();
                 for (int blockNr = 0;
-                    blockNr < methodCoverage.length; blockNr++)
+                    blockNr < map.length; blockNr++)
                 {
                     int[] blockLines = map[blockNr];
-                    if (methodCoverage[blockNr])
+                    if (methodCoverage != null && methodCoverage[blockNr])
                     {
                         markCovered(lineCoverage, blockLines);