added evaluatedHttpCalls and executionTimeInSeconds. renamed totalHttpCalls into outputHttpCalls

Author: arcuri82

src/main/resources/wfc/schemas/report.yaml

@@ -48,14 +48,28 @@ properties:
     type: array
     items:
       $ref: "#/$defs/TestCase"
+  executionTimeInSeconds:
+      type: integer
+      minimum: 0
+      description: "For how long, in seconds, the tool was running in total."
   #OPTIONAL
   extra:
     description: "Extra, optional coverage information, collected by different tools."
     type: [array, "null"]
     items:
       $ref: "#/$defs/Coverage"
 
-required: ["schemaVersion","toolName","toolVersion","creationTime","faults","problemDetails","totalTests","testFilePaths","testCases"]
+required:
+  - "schemaVersion"
+  - "toolName"
+  - "toolVersion"
+  - "creationTime"
+  - "faults"
+  - "problemDetails"
+  - "totalTests"
+  - "testFilePaths"
+  - "testCases"
+  - "executionTimeInSeconds"
 
 $defs:
   OperationId:
@@ -122,11 +136,18 @@ $defs:
   RESTReport:
     type: object
     properties:
-      totalHttpCalls:
-        description: "Total number of HTTP calls made in all the test cases. A test case could contain several HTTP calls, \
+      outputHttpCalls:
+        description: "Total number of HTTP calls made in all the generated test cases given as output. \ 
+                      A test case could contain several HTTP calls, \
                       e.g., a POST followed by a GET and then a DELETE."
         type: integer
         minimum: 0
+      evaluatedHttpCalls:
+        description: "Total number of all HTTP calls made during the whole fuzzing session. \
+                      If the fuzzing was left running for hours, millions of HTTP could have been made.
+                      The output generated tests will only contain a tiny subset of these evaluated calls."
+        type: integer
+        minimum: 0
       endpointIds:
         description: "Unique ids of all the endpoints in the tested API."
         type: array
@@ -138,7 +159,7 @@ $defs:
         type: array
         items:
           $ref: "#/$defs/CoveredEndpoint"
-    required: ["totalHttpCalls","endpointIds","coveredHttpStatus"]
+    required: ["outputHttpCalls","evaluatedHttpCalls","endpointIds","coveredHttpStatus"]
 
   TestCase:
     type: object

web-report/src-e2e/App.test.tsx

@@ -79,11 +79,11 @@ describe('App test', () => {
         render(<App />);
         expect(screen.getByText(/Please wait, files are loading.../)).toBeInTheDocument();
         const total = reportData.problemDetails.rest.endpointIds.length;
-        const totalHttpCalls = reportData.problemDetails.rest.totalHttpCalls;
+        const outputHttpCalls = reportData.problemDetails.rest.outputHttpCalls;
 
         await waitFor(() => {
             expect(screen.getByTestId('rest-report-endpoint')).toContainHTML(`${total}`);
-            expect(screen.getByTestId('rest-report-http-calls')).toContainHTML(`${totalHttpCalls}`);
+            expect(screen.getByTestId('rest-report-http-calls')).toContainHTML(`${outputHttpCalls}`);
         });
 
     });

web-report/src-e2e/static/report.json

@@ -2970,7 +2970,7 @@
   },
   "problemDetails": {
     "rest": {
-      "totalHttpCalls": 130,
+      "outputHttpCalls": 130,
       "endpointIds": [
         "GET:/app/api/assignments",
         "POST:/app/api/assignments",

web-report/src/components/GeneratedTests.tsx

@@ -11,10 +11,10 @@ interface IGeneratedTests {
         fileName: string,
         numberOfTestCases: number
     }>
-    totalHttpCalls?: number
+    outputHttpCalls?: number
 }
 
-export const GeneratedTests: React.FC<IGeneratedTests> = ({totalTests, testFiles, totalHttpCalls}) => (
+export const GeneratedTests: React.FC<IGeneratedTests> = ({totalTests, testFiles, outputHttpCalls}) => (
     <Card className="border-2 border-black p-6 rounded-none">
         <div className="flex items-start gap-4">
             <Target className="w-6 h-6 text-gray-500"/>
@@ -35,7 +35,7 @@ export const GeneratedTests: React.FC<IGeneratedTests> = ({totalTests, testFiles
                     <ReportTooltip tooltipText={info.numberOfHttpCalls}>
                         <span className="text-lg font-bold"># HTTP Calls:</span>
                     </ReportTooltip>
-                    <span className="text-lg font-bold" data-testid="rest-report-http-calls">{totalHttpCalls}</span>
+                    <span className="text-lg font-bold" data-testid="rest-report-http-calls">{outputHttpCalls}</span>
                 </div>
 
                 <div className="mt-4 pt-4 border-t border-gray-200">

web-report/src/pages/Overview.tsx

@@ -22,7 +22,7 @@ export const Overview: React.FC<IOverviewType> = ({rest, testCases, testFiles, f
             {/* Right Panel */}
             <div className="flex flex-col gap-6">
                 {/* Generated Tests */}
-                <GeneratedTests totalTests={testCases.length} testFiles={testFiles} totalHttpCalls={rest?.totalHttpCalls}/>
+                <GeneratedTests totalTests={testCases.length} testFiles={testFiles} outputHttpCalls={rest?.outputHttpCalls}/>
                 {/* Faults */}
                 <FaultsComponent {...faults}/>
             </div>

web-report/src/types/GeneratedTypes.tsx

@@ -56,6 +56,10 @@ export interface WebFuzzingCommonsReport {
    * Information on each generated test case.
    */
   testCases: TestCase[];
+  /**
+   * For how long, in seconds, the tool was running in total.
+   */
+  executionTimeInSeconds: number;
   /**
    * Extra, optional coverage information, collected by different tools.
    */
@@ -101,9 +105,13 @@ export interface FaultCategoryId {
 }
 export interface RESTReport {
   /**
-   * Total number of HTTP calls made in all the test cases. A test case could contain several HTTP calls, e.g., a POST followed by a GET and then a DELETE.
+   * Total number of HTTP calls made in all the generated test cases given as output.   A test case could contain several HTTP calls, e.g., a POST followed by a GET and then a DELETE.
+   */
+  outputHttpCalls: number;
+  /**
+   * Total number of all HTTP calls made during the whole fuzzing session. If the fuzzing was left running for hours, millions of HTTP could have been made. The output generated tests will only contain a tiny subset of these evaluated calls.
    */
-  totalHttpCalls: number;
+  evaluatedHttpCalls: number;
   /**
    * Unique ids of all the endpoints in the tested API.
    */

web-report/src/types/GeneratedTypesZod.ts

@@ -44,7 +44,8 @@ export const coverageCriterionSchema = z.record(z.unknown()).and(
 
 export const rESTReportSchema = z.record(z.unknown()).and(
   z.object({
-    totalHttpCalls: z.number(),
+    outputHttpCalls: z.number(),
+    evaluatedHttpCalls: z.number(),
     endpointIds: z.array(operationIdSchema),
     coveredHttpStatus: z.array(coveredEndpointSchema),
   }),
@@ -89,6 +90,7 @@ export const webFuzzingCommonsReportSchema = z.record(z.unknown()).and(
     totalTests: z.number(),
     testFilePaths: z.array(testFilePathSchema),
     testCases: z.array(testCaseSchema),
+    executionTimeInSeconds: z.number(),
     extra: z.array(coverageSchema).optional().nullable(),
   }),
 );