- Minor cleanup

- JIRA: ZAPP-1092
brdandu · Oct 29, 2024 · 9b46e0c · 9b46e0c
1 parent 3a163b4
commit 9b46e0c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/docs/api.md b/docs/api.md
@@ -17130,7 +17130,6 @@ Environment utilities for ZAP
     * [.builtinSilabsZclSpecialMetafile()](#module_JS API_ Environment utilities.builtinSilabsZclSpecialMetafile) ⇒
     * [.builtinSilabsZclGeneralXmlFile()](#module_JS API_ Environment utilities.builtinSilabsZclGeneralXmlFile) ⇒
     * [.builtinSilabsSpecialZclGeneralSpecialXmlFile()](#module_JS API_ Environment utilities.builtinSilabsSpecialZclGeneralSpecialXmlFile) ⇒
-    * [.builtinZclExtensionClusterToComponentFile()](#module_JS API_ Environment utilities.builtinZclExtensionClusterToComponentFile) ⇒
     * [.builtinMatterZclMetafile()](#module_JS API_ Environment utilities.builtinMatterZclMetafile) ⇒
     * [.builtinNewMatterZclMetafile()](#module_JS API_ Environment utilities.builtinNewMatterZclMetafile) ⇒
     * [.builtinDotdotZclMetafile()](#module_JS API_ Environment utilities.builtinDotdotZclMetafile) ⇒
@@ -17205,13 +17204,6 @@ Used to retrieve general-special.xml by zcl reload test in zcl-loader.test.js
 
 **Kind**: static method of [<code>JS API: Environment utilities</code>](#module_JS API_ Environment utilities)  
 **Returns**: path to general-special.xml file used by zcl-loader.test.js  
-<a name="module_JS API_ Environment utilities.builtinZclExtensionClusterToComponentFile"></a>
-
-### JS API: Environment utilities.builtinZclExtensionClusterToComponentFile() ⇒
-Used to retrieve cluster-to-component-dependencies.json by zcl reload test in zcl-loader.test.js
-
-**Kind**: static method of [<code>JS API: Environment utilities</code>](#module_JS API_ Environment utilities)  
-**Returns**: path to cluster-to-component-dependencies.json file used by zcl-loader.test.js  
 <a name="module_JS API_ Environment utilities.builtinMatterZclMetafile"></a>
 
 ### JS API: Environment utilities.builtinMatterZclMetafile() ⇒

diff --git a/src-electron/util/env.js b/src-electron/util/env.js
@@ -81,17 +81,6 @@ export function builtinSilabsSpecialZclGeneralSpecialXmlFile() {
   return locateProjectResource('./zcl-builtin/silabs/general-special.xml')
 }
 
-/**
- * Used to retrieve cluster-to-component-dependencies.json by zcl reload test in zcl-loader.test.js
- *
- * @returns path to cluster-to-component-dependencies.json file used by zcl-loader.test.js
- */
-export function builtinZclExtensionClusterToComponentFile() {
-  return locateProjectResource(
-    './test/gen-template/zigbee2/cluster-to-component-dependencies.json'
-  )
-}
-
 /**
  * Get builtin matter ZCL json file
  * @returns matter ZCL json file

diff --git a/test/test-util.js b/test/test-util.js
@@ -95,7 +95,9 @@ exports.testTemplate = {
   dotdotCount: 5,
   unittest: './test/gen-template/test/gen-test.json',
   testCount: 3,
-  meta: './test/resource/meta/gen-test.json'
+  meta: './test/resource/meta/gen-test.json',
+  zclExtensionClusterToComponentFile:
+    './test/gen-template/zigbee2/cluster-to-component-dependencies.json'
 }
 
 exports.otherTestFile = {

diff --git a/test/zcl-loader.test.js b/test/zcl-loader.test.js
@@ -296,7 +296,8 @@ test(
       expect(existingPackageDetails.isInSync).toEqual(1)
 
       // Update the cluster-to-component.json extension file
-      let extensionFile = env.builtinZclExtensionClusterToComponentFile()
+      let extensionFile =
+        testUtil.testTemplate.zclExtensionClusterToComponentFile
       let originalString = '"clusterCode": "zll commissioning-server"'
       let editString = '"clusterCode": "zll commissioningEdit-server"'
       let generalExtensionFileOriginalContent = fs.readFileSync(