Add type for return value

ctc-oss · Nov 10, 2023 · 3812cb2 · 3812cb2
1 parent 60414b6
commit 3812cb2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/tdmlEditor/src/utilities/tdmlXmlUtils.ts b/src/tdmlEditor/src/utilities/tdmlXmlUtils.ts
@@ -27,6 +27,11 @@ type TDMLTestCaseDisplay = {
   dfdlInfosets: string[]
 }
 
+type TDMLTestSuiteDisplay = {
+  suiteName: string
+  testCases: TDMLTestCaseDisplay[]
+}
+
 const testSuiteAttribute = 'suiteName'
 const testCaseNameAttribute = 'name'
 const testCaseDescriptionAttribute = 'description'
@@ -54,11 +59,14 @@ export async function readTDMLFileContents(tdmlFilePath: string) {
 
 export async function getTestCaseDisplayData(
   xmlBuffer: string
-): Promise<[string, TDMLTestCaseDisplay[]]> {
+): Promise<TDMLTestSuiteDisplay> {
   const xmlDoc = parseXml(xmlBuffer)
   const rootNode = xmlDoc.root
   if (!rootNode) {
-    return ['', []]
+    return {
+      suiteName: '',
+      testCases: [],
+    }
   }
   const retVal: TDMLTestCaseDisplay[] = []
 
@@ -122,7 +130,10 @@ export async function getTestCaseDisplayData(
     })
   )
 
-  return [rootNode.attributes[testSuiteAttribute], retVal]
+  return {
+    suiteName: rootNode.attributes[testSuiteAttribute],
+    testCases: retVal,
+  }
 }
 
 export async function appendTestCase() {}
diff --git a/src/tests/suite/tdmlXmlUtils.test.ts b/src/tests/suite/tdmlXmlUtils.test.ts
@@ -26,10 +26,10 @@ suite('TDML Utils Test Suite', () => {
     readTDMLFileContents('/home/mike/Git/daffodil-vscode/infoset.tdml').then(
       (xmlBuffer) => {
         console.log(xmlBuffer)
-        getTestCaseDisplayData(xmlBuffer).then((dataTuple) => {
-          console.log(dataTuple[0])
+        getTestCaseDisplayData(xmlBuffer).then((testSuiteData) => {
+          console.log(testSuiteData.suiteName)
 
-          dataTuple[1].forEach((testCaseDisplayData) => {
+          testSuiteData.testCases.forEach((testCaseDisplayData) => {
             console.log(testCaseDisplayData.testCaseName)
             console.log(testCaseDisplayData.testCaseDescription)
             console.log(testCaseDisplayData.testCaseModel)