generate unique Id and use it to differentiate tests instead of sessi…

…onId

.gitignore

@@ -22,6 +22,7 @@ pids
 *.pid
 *.seed
 *.pid.lock
+*.class
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov

package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-reporter-plugin",
-  "version": "1.1.0-beta.01",
+  "version": "1.1.0-beta.02",
   "description": "Appium 2.0 plugin for generating html report with screenshots server side.",
   "main": "./lib/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "report",
     "screenshot"
   ],
-  "author": "",
+  "author": "Dileep Bellamkonda <[email protected]>",
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/AppiumTestDistribution/appium-reporter-plugin/issues"

src/reporter.js

@@ -40,8 +40,15 @@ async function getTestStatus(status){
 }
 
 async function setTestInfo(sessionId, testName, testStatus, error = undefined) {
-  if (sessionId === undefined || sessionId === null)
+  const tid = await uuidv4();  
+
+  if( sessionId !== undefined &&  sessionId !== null && sessionId !== 'null') {
+    const oldFileName = await getSessionFilePath(sessionId);
+    const newFileName = await getSessionFilePath(tid);
+    await fs.renameSync(oldFileName, newFileName);
+  } else if (sessionId === undefined || sessionId === null) {
     sessionId = await uuidv4();
+  }
 
   let file = await editJsonFile(jsonReportPath);
   const info = {};
@@ -50,8 +57,10 @@ async function setTestInfo(sessionId, testName, testStatus, error = undefined) {
   if (error) 
     info['error'] = error;
   info['sessionId'] = sessionId;
+  info['testId'] = tid;
   await file.append('tests', info);
   await file.save();
+
 }
 
 async function setCmdData(sessionId, key, value, args) {
@@ -68,12 +77,13 @@ async function buildReport() {
   let file = await editJsonFile(jsonReportPath);
   let allData = await file.toObject();
   allData.sessions = {};
-  const sessions = allData.tests.map(y => y.sessionId);
-  for(const session of sessions) {
-    const sessionFilePath = `${reportPath}/${session}.json`;
+  const testIds = allData.tests.map(y => [y.testId, y.sessionId]);
+  for(let i = 0; i < testIds.length; i++){
+    const testId = testIds[i][0];
+    const sessionFilePath = `${reportPath}/${testId}.json`;
     const sessionData = await editJsonFile(sessionFilePath);
-    allData.sessions[session] = sessionData.toObject();
-  }  
+    allData.sessions[testId] = sessionData.toObject();
+  }
 
   const htmlTemplate = await fs.readFileSync(htmlTemplatePath, 'utf8');
   let dom = await parse(htmlTemplate);

src/web/components/Command.js

@@ -2,18 +2,19 @@ import React, { useEffect } from 'react';
 
 export const Command = (props) => {
   let data = props.data;
-  let sessionId = props.sessionId;
+  let testId = props.testId;
   let cmd0 = props.cmd0;
   let cmd1 = props.cmd1;
 
   let dataId = cmd0 + cmd1;
-  let commandData = data.sessions[sessionId].data[dataId];
+  let commandData = data.sessions[testId].data[dataId];
 
   let args = commandData['args'];
   let execTime = args['execution time'];
   let request = args['request'];
   let response = args['response'];
   let error = args['error']
+  let sessionId = args['sessionId']
 
   return (
     <div>

src/web/components/Navbar.js

@@ -4,20 +4,20 @@ import { Test } from './Test';
 
 export const Navbar = (props) => {
   let data = props.data.data;
-  let sessions = data.tests.map(test => test.sessionId);
-  const [filteredSessions, setFilteredSessions] = useState(sessions);
+  let tests = data.tests.map(test => test.testId);
+  const [filteredTests, setFilteredTests] = useState(tests);
   const [showSummary, setShowSummary] = useState(true);
   const [selectTest, setSelectTest] = useState(null);
   const [showTestSummary, setShowTestSummary] = useState(true);
 
   const filter = (e) => {
     const value = e.target.value;
     if (value == 0) {
-      setFilteredSessions(sessions);
+      setFilteredTests(tests);
       return;
     }
 
-    let newFilteredSessions = [];
+    let newFilteredTests = [];
     let filterCondition = 'PASSED';
     if (value == 2) {
       filterCondition = 'FAILED';
@@ -28,18 +28,18 @@ export const Navbar = (props) => {
     data.tests.map((test, key) => {
         const testStatus =test.testStatus;
         if(testStatus === filterCondition) {
-            newFilteredSessions.push(test.sessionId);
+            newFilteredTests.push(test.testId);
         }
     });
-    setFilteredSessions(newFilteredSessions);
+    setFilteredTests(newFilteredTests);
   };
 
-  const SessionTab = ({ sessionId, testName, testStatus }) => {
+  const SessionTab = ({testName, testStatus, testId, sessionId}) => {
     return (
       <li
         className={
           !showSummary
-            ? selectTest == sessionId
+            ? selectTest == testId
               ? 'sidebar-link active'
               : 'sidebar-link'
             : 'sidebar-link'
@@ -51,7 +51,7 @@ export const Navbar = (props) => {
           onClick={() => {
             setShowSummary(false);
             setShowTestSummary(true);
-            setSelectTest(sessionId);
+            setSelectTest(testId);
           }}
         >
           {testName}
@@ -96,13 +96,14 @@ export const Navbar = (props) => {
           </select>
         </h6>
         <ul className="sidebar-links" id="testLinks">
-          {filteredSessions.map((sessionId, key) => {
-            const test = data.tests.filter(test => test.sessionId === sessionId)[0];
+          {filteredTests.map((testId, key) => {
+            const test = data.tests.filter(test => test.testId === testId)[0];
             const testName = test.testName;
             const testStatus = test.testStatus;
+            const sessionId = test.sessionId;
             return (
               <div key={key}>
-                <SessionTab testName={testName} testStatus={testStatus} sessionId={sessionId} />
+                <SessionTab testName={testName} testStatus={testStatus} testId={testId} sessionId={sessionId} />
               </div>
             );
           })}
@@ -111,7 +112,7 @@ export const Navbar = (props) => {
       {!showSummary && (
         <Test
           data={data}
-          sessionId={selectTest}
+          testId={selectTest}
           showTestSummary={showTestSummary}
           setShowTestSummary={setShowTestSummary}
         />

src/web/components/OverallExecutionSummary.js

@@ -22,7 +22,7 @@ export const OverAllExecutionSummary = (props) => {
     } else {
       unknownCount = unknownCount + 1;
     }
-    const testDetails = props.data.sessions[test.sessionId];
+    const testDetails = props.data.sessions[test.testId];
     const deviceDetails = 'deviceInfo' in testDetails ? testDetails.deviceInfo : undefined;
     resultElements = resultElements.concat({ name, status, ...deviceDetails });
   }

src/web/components/Test.js

@@ -3,9 +3,10 @@ import { TestStatus } from './TestStatus';
 import { Command } from './Command';
 
 export const Test = (props) => {
-  let sessionId = props.sessionId;
+  let testId = props.testId;
+  // let sessionId = props.sessionId;
   let data = props.data;
-  let session = data.sessions[sessionId];
+  let session = data.sessions[testId];
   let showTestSummary = props.showTestSummary;
   let setShowTestSummary = props.setShowTestSummary;
 
@@ -72,11 +73,11 @@ export const Test = (props) => {
           }
         </ul>
       </nav>
-      {showTestSummary && <TestStatus data={data} sessionId={sessionId} />}
+      {showTestSummary && <TestStatus data={data} testId={testId}/>}
       {!showTestSummary && selectedCommand0 && selectedCommand1 && (
         <Command
           data={props.data}
-          sessionId={props.sessionId}
+          testId={testId}
           cmd0={selectedCommand0}
           cmd1={selectedCommand1}
         />

src/web/components/TestStatus.js

@@ -1,13 +1,14 @@
 import React from 'react';
 
 export const TestStatus = (props) => {
-  const sessionId = props.sessionId;
+  const testId = props.testId;
+  // const sessionId = props.sessionId;
   const data = props.data;
-  const test = data.tests.filter(test => test.sessionId === sessionId)[0];
+  const test = data.tests.filter(test => test.testId === testId)[0];
   const testName = test.testName;
   const testStatus = test.testStatus;
   const error = test.error;
-  const testInfo = data.sessions[sessionId]
+  const testInfo = data.sessions[testId]
 
   let platformName, platformVersion, deviceManufacturer, deviceModel, deviceApiLevel, deviceName;
   try {