try to fix startup tests

paulr34 · Jul 13, 2023 · 246e6a1 · 246e6a1
1 parent 7c86dd0
commit 246e6a1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 66 deletions.
diff --git a/src-electron/importexport/import.js b/src-electron/importexport/import.js
@@ -28,6 +28,7 @@ const env = require('../util/env')
 const script = require('../util/script')
 const dbEnum = require('../../src-shared/db-enum')
 const ff = require('./file-format.js')
+const util = require('../util/util.js')
 
 /**
  * Reads the data from the file and resolves with the state object if all is good.
@@ -95,6 +96,14 @@ async function importDataFromFile(
     let sid
     if (options.sessionId == null) {
       sid = await querySession.createBlankSession(db)
+      await util.ensurePackagesAndPopulateSessionOptions(
+        db,
+        sid,
+        {
+          zcl: env.builtinSilabsZclMetafile(),
+          template: env.builtinTemplateMetafile(),
+        }, null, null
+      )  
     } else {
       sid = options.sessionId
     }

diff --git a/src-electron/main-process/startup.js b/src-electron/main-process/startup.js
@@ -230,7 +230,6 @@ async function startConvert(argv, options) {
 
   await util.executePromisesSequentially(files, async (singlePath, index) => {
     let importResult = await importJs.importDataFromFile(db, singlePath, {
-      sessionId: options.sessionId,
       defaultZclMetafile: argv.zclProperties,
       postImportScript: argv.postImportScript,
       packageMatch: argv.packageMatch,
@@ -407,7 +406,6 @@ async function startAnalyze(argv, options) {
   await util.executePromisesSequentially(paths, (singlePath) =>
     importJs
       .importDataFromFile(db, singlePath, {
-        sessionId: options.sessionId,
         defaultZclMetafile: argv.zclProperties,
         postImportScript: argv.postImportScript,
         packageMatch: argv.packageMatch,
@@ -538,19 +536,22 @@ async function generateSingleFile(
     postImportScript: null,
     packageMatch: dbEnum.packageMatch.fuzzy,
     generationLog: null,
-    sessionId: null,
   }
 ) {
   let hrstart = process.hrtime.bigint()
   let sessionId
   let output
   if (zapFile === BLANK_SESSION) {
     options.logger(`👉 using empty configuration`)
-    if(options.sessionId) {
-      sessionId = options.sessionId
-    } else {
-      sessionId = await querySession.createBlankSession(db)
-    }
+    sessionId = await querySession.createBlankSession(db)
+    await util.ensurePackagesAndPopulateSessionOptions(
+      db,
+      sessionId,
+      {
+        zcl: env.builtinSilabsZclMetafile(),
+        template: env.builtinTemplateMetafile(),
+      }, null, null
+    )  
     output = outputPattern
   } else {
     options.logger(`👉 using input file: ${zapFile}`)

diff --git a/test/custom-cluster.test.js b/test/custom-cluster.test.js
@@ -26,7 +26,6 @@ const testQuery = require('./test-query')
 const queryPackage = require('../src-electron/db/query-package')
 const queryConfig = require('../src-electron/db/query-config')
 const queryDeviceType = require('../src-electron/db/query-device-type')
-const util = require('../src-electron/util/util.js')
 
 let db
 let sid

diff --git a/test/startup.test.js b/test/startup.test.js
@@ -32,24 +32,7 @@ beforeAll(async () => {
 
 test(
   'startup: start generation',
-  async () => {
-    let dbFile = env.sqliteFile('generate')
-    let db = await dbApi.initDatabaseAndLoadSchema(
-      dbFile,
-      env.schemaFile(),
-      env.zapVersion()
-    )
-    let sid = await querySession.createBlankSession(db)
-
-    await util.ensurePackagesAndPopulateSessionOptions(
-      db,
-      sid,
-      {
-        zcl: env.builtinSilabsZclMetafile(),
-        template: env.builtinTemplateMetafile(),
-      }, null, null
-    )
-
+  () => {
     let testGenDir = path.join(path.join(__dirname, '.zap/'), 'test-gen')
     if (!fs.existsSync(testGenDir))
       fs.mkdirSync(testGenDir, { recursive: true })
@@ -64,7 +47,6 @@ test(
       {
         quitFunction: null,
         logger: (msg) => {},
-        sessionId: sid,
       }
     )
   },
@@ -86,7 +68,7 @@ test(
 
 test(
   'startup: convert',
-  async () => {
+  () => {
     let files = []
     files.push(path.join(__dirname, 'resource/isc/test-light.isc'))
     let output = '{basename}.conversion'
@@ -99,23 +81,6 @@ test(
       'resource/isc/test-light.conversion.results.yaml'
     )
 
-    let dbFile = env.sqliteFile('convert')
-    let db = await dbApi.initDatabaseAndLoadSchema(
-      dbFile,
-      env.schemaFile(),
-      env.zapVersion()
-    )
-    let sid = await querySession.createBlankSession(db)
-
-    await util.ensurePackagesAndPopulateSessionOptions(
-      db,
-      sid,
-      {
-        zcl: env.builtinSilabsZclMetafile(),
-        template: env.builtinTemplateMetafile(),
-      }, null, null
-    )
-
     return startup
       .startConvert(
         {
@@ -128,7 +93,6 @@ test(
         {
           quitFunction: null,
           logger: (msg) => {},
-          sessionId: sid,
         }
       )
       .then(() => {
@@ -144,24 +108,7 @@ test(
 
 test(
   'startup: analyze',
-  async () => {
-    let dbFile = env.sqliteFile('analysis')
-    let db = await dbApi.initDatabaseAndLoadSchema(
-      dbFile,
-      env.schemaFile(),
-      env.zapVersion()
-    )
-    let sid = await querySession.createBlankSession(db)
-
-    await util.ensurePackagesAndPopulateSessionOptions(
-      db,
-      sid,
-      {
-        zcl: env.builtinSilabsZclMetafile(),
-        template: env.builtinTemplateMetafile(),
-      }, null, null
-    )
-
+  () => {
     let files = []
     files.push(path.join(__dirname, 'resource/isc/test-light.isc'))
     return startup.startAnalyze(
@@ -173,7 +120,6 @@ test(
         quitFunction: null,
         cleanDb: false,
         logger: (msg) => {},
-        sessionId: sid
       }
     )
   },