fix: handle multiple classes in file

Resolves: #92
saschanowak · Apr 30, 2024 · b103770 · b103770
1 parent c0588f7
commit b103770
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 56 deletions.
diff --git a/__tests__/data/clover.xml b/__tests__/data/clover.xml
@@ -11,6 +11,9 @@
       <class name="Netlogix\Nxdummy\Options\MiddlewareOptions" namespace="global">
         <metrics complexity="5" methods="3" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="11" coveredstatements="10" elements="14" coveredelements="12"/>
       </class>
+      <class name="Netlogix\Nxdummy\Options\MiddlewareOptions2" namespace="global">
+        <metrics complexity="5" methods="3" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="11" coveredstatements="10" elements="14" coveredelements="12"/>
+      </class>
       <metrics loc="47" ncloc="47" classes="1" methods="3" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="11" coveredstatements="10" elements="14" coveredelements="12"/>
     </file>
     <file name="__tests__/data/nxdummy/Classes/Utility/UriUtility.php">

diff --git a/__tests__/data/code-coverage-details.md b/__tests__/data/code-coverage-details.md
@@ -30,6 +30,15 @@
   <td align="center">0.00%
   <td align="right">0/1
   <td align="center">➖
+<tr>
+  <td>Netlogix\Nxdummy\Options\MiddlewareOptions2
+  <td align="center">90.91%
+  <td align="right">10/11
+  <td align="center">66.67%
+  <td align="right">2/3
+  <td align="center">0.00%
+  <td align="right">0/1
+  <td align="center">➖
 <tr>
   <td>Netlogix\Nxdummy\Utility\UriUtility
   <td align="center">100.00%

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -237,41 +237,47 @@ export async function run(): Promise<{summary: string; details: string}> {
         if (!file.hasOwnProperty('class')) {
           continue
         }
-        const statements = parseInt(file.class.metrics['@_statements'], 10)
-        const coveredstatements = parseInt(
-          file.class.metrics['@_coveredstatements'],
-          10
-        )
 
-        const covered =
-          parseInt(((coveredstatements / statements) * 100).toString(), 10) ===
-          100
-            ? 1
-            : 0
-
-        packages[packageName].classes[file.class['@_name']] = {
-          name: file.class['@_name'],
-          classes: 1,
-          coveredclasses: covered,
-          complexity: parseInt(file.class.metrics['@_complexity'], 10),
-          loc: parseInt(file.class.metrics['@_loc'], 10),
-          ncloc: parseInt(file.class.metrics['@_ncloc'], 10),
-          methods: parseInt(file.class.metrics['@_methods'], 10),
-          coveredmethods: parseInt(file.class.metrics['@_coveredmethods'], 10),
-          conditionals: parseInt(file.class.metrics['@_conditionals'], 10),
-          coveredconditionals: parseInt(
-            file.class.metrics['@_coveredconditionals'],
+        const classes = !Array.isArray(file.class) ? [file.class] : file.class
+        for (const item of classes) {
+          const statements = parseInt(item.metrics['@_statements'], 10)
+          const coveredstatements = parseInt(
+            item.metrics['@_coveredstatements'],
             10
-          ),
-          statements: parseInt(file.class.metrics['@_statements'], 10),
-          coveredstatements: parseInt(
-            file.class.metrics['@_coveredstatements'],
-            10
-          ),
-          elements: parseInt(file.class.metrics['@_elements'], 10),
-          coveredelements: parseInt(file.class.metrics['@_coveredelements'], 10)
+          )
+
+          const covered =
+            parseInt(
+              ((coveredstatements / statements) * 100).toString(),
+              10
+            ) === 100
+              ? 1
+              : 0
+
+          packages[packageName].classes[item['@_name']] = {
+            name: item['@_name'],
+            classes: 1,
+            coveredclasses: covered,
+            complexity: parseInt(item.metrics['@_complexity'], 10),
+            loc: parseInt(item.metrics['@_loc'], 10),
+            ncloc: parseInt(item.metrics['@_ncloc'], 10),
+            methods: parseInt(item.metrics['@_methods'], 10),
+            coveredmethods: parseInt(item.metrics['@_coveredmethods'], 10),
+            conditionals: parseInt(item.metrics['@_conditionals'], 10),
+            coveredconditionals: parseInt(
+              item.metrics['@_coveredconditionals'],
+              10
+            ),
+            statements: parseInt(item.metrics['@_statements'], 10),
+            coveredstatements: parseInt(
+              item.metrics['@_coveredstatements'],
+              10
+            ),
+            elements: parseInt(item.metrics['@_elements'], 10),
+            coveredelements: parseInt(item.metrics['@_coveredelements'], 10)
+          }
+          packages[packageName].metrics.coveredclasses += covered
         }
-        packages[packageName].metrics.coveredclasses += covered
       }
 
       const summaryMetric: SummaryMetric = {