Skip to content

Commit 354422c

Browse files
AlCalzoneAlCalzone
committed
fix: broken test automations
1 parent 2d3d42b commit 354422c

6 files changed

Lines changed: 360 additions & 76 deletions

File tree

‎ctt/keys/E6D68AF7.txt‎

Lines changed: 230 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,230 @@
1+
98;C6D90542DE4E66BBE66FBFCB84E9FF67;1
2+
9F;CE07372267DCB354DB216761B6E9C378;1
3+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
4+
9F;21A29A69145E38C1601DFF55E2658521;1
5+
9F;3D54A7E5DE9D444B28B479CF13B4CA70;1
6+
9F;C2B0A8CE070B71F409A889BCCC54A49B;1
7+
9F;21A29A69145E38C1601DFF55E2658521;1
8+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
9+
9F;CE07372267DCB354DB216761B6E9C378;1
10+
9F;21A29A69145E38C1601DFF55E2658521;1
11+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
12+
9F;CE07372267DCB354DB216761B6E9C378;1
13+
9F;21A29A69145E38C1601DFF55E2658521;1
14+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
15+
9F;CE07372267DCB354DB216761B6E9C378;1
16+
9F;21A29A69145E38C1601DFF55E2658521;1
17+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
18+
9F;CE07372267DCB354DB216761B6E9C378;1
19+
9F;21A29A69145E38C1601DFF55E2658521;1
20+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
21+
9F;CE07372267DCB354DB216761B6E9C378;1
22+
9F;21A29A69145E38C1601DFF55E2658521;1
23+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
24+
9F;CE07372267DCB354DB216761B6E9C378;1
25+
9F;21A29A69145E38C1601DFF55E2658521;1
26+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
27+
9F;CE07372267DCB354DB216761B6E9C378;1
28+
9F;21A29A69145E38C1601DFF55E2658521;1
29+
9F;21A29A69145E38C1601DFF55E2658521;1
30+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
31+
9F;CE07372267DCB354DB216761B6E9C378;1
32+
9F;21A29A69145E38C1601DFF55E2658521;1
33+
9F;21A29A69145E38C1601DFF55E2658521;1
34+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
35+
9F;CE07372267DCB354DB216761B6E9C378;1
36+
9F;21A29A69145E38C1601DFF55E2658521;1
37+
9F;21A29A69145E38C1601DFF55E2658521;1
38+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
39+
9F;CE07372267DCB354DB216761B6E9C378;1
40+
9F;21A29A69145E38C1601DFF55E2658521;1
41+
9F;21A29A69145E38C1601DFF55E2658521;1
42+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
43+
9F;CE07372267DCB354DB216761B6E9C378;1
44+
9F;21A29A69145E38C1601DFF55E2658521;1
45+
9F;21A29A69145E38C1601DFF55E2658521;1
46+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
47+
9F;CE07372267DCB354DB216761B6E9C378;1
48+
9F;21A29A69145E38C1601DFF55E2658521;1
49+
9F;21A29A69145E38C1601DFF55E2658521;1
50+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
51+
9F;CE07372267DCB354DB216761B6E9C378;1
52+
9F;21A29A69145E38C1601DFF55E2658521;1
53+
9F;21A29A69145E38C1601DFF55E2658521;1
54+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
55+
9F;CE07372267DCB354DB216761B6E9C378;1
56+
9F;21A29A69145E38C1601DFF55E2658521;1
57+
9F;21A29A69145E38C1601DFF55E2658521;1
58+
9F;21A29A69145E38C1601DFF55E2658521;1
59+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
60+
9F;CE07372267DCB354DB216761B6E9C378;1
61+
9F;21A29A69145E38C1601DFF55E2658521;1
62+
9F;21A29A69145E38C1601DFF55E2658521;1
63+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
64+
9F;CE07372267DCB354DB216761B6E9C378;1
65+
9F;21A29A69145E38C1601DFF55E2658521;1
66+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
67+
9F;CE07372267DCB354DB216761B6E9C378;1
68+
9F;21A29A69145E38C1601DFF55E2658521;1
69+
9F;21A29A69145E38C1601DFF55E2658521;1
70+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
71+
9F;CE07372267DCB354DB216761B6E9C378;1
72+
9F;21A29A69145E38C1601DFF55E2658521;1
73+
9F;21A29A69145E38C1601DFF55E2658521;1
74+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
75+
9F;CE07372267DCB354DB216761B6E9C378;1
76+
9F;21A29A69145E38C1601DFF55E2658521;1
77+
9F;21A29A69145E38C1601DFF55E2658521;1
78+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
79+
9F;CE07372267DCB354DB216761B6E9C378;1
80+
9F;21A29A69145E38C1601DFF55E2658521;1
81+
9F;21A29A69145E38C1601DFF55E2658521;1
82+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
83+
9F;CE07372267DCB354DB216761B6E9C378;1
84+
9F;21A29A69145E38C1601DFF55E2658521;1
85+
9F;21A29A69145E38C1601DFF55E2658521;1
86+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
87+
9F;CE07372267DCB354DB216761B6E9C378;1
88+
9F;21A29A69145E38C1601DFF55E2658521;1
89+
9F;21A29A69145E38C1601DFF55E2658521;1
90+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
91+
9F;CE07372267DCB354DB216761B6E9C378;1
92+
9F;21A29A69145E38C1601DFF55E2658521;1
93+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
94+
9F;CE07372267DCB354DB216761B6E9C378;1
95+
9F;21A29A69145E38C1601DFF55E2658521;1
96+
9F;21A29A69145E38C1601DFF55E2658521;1
97+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
98+
9F;CE07372267DCB354DB216761B6E9C378;1
99+
9F;21A29A69145E38C1601DFF55E2658521;1
100+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
101+
9F;CE07372267DCB354DB216761B6E9C378;1
102+
9F;21A29A69145E38C1601DFF55E2658521;1
103+
9F;21A29A69145E38C1601DFF55E2658521;1
104+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
105+
9F;CE07372267DCB354DB216761B6E9C378;1
106+
9F;21A29A69145E38C1601DFF55E2658521;1
107+
9F;21A29A69145E38C1601DFF55E2658521;1
108+
9F;21A29A69145E38C1601DFF55E2658521;1
109+
9F;21A29A69145E38C1601DFF55E2658521;1
110+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
111+
9F;CE07372267DCB354DB216761B6E9C378;1
112+
9F;21A29A69145E38C1601DFF55E2658521;1
113+
9F;21A29A69145E38C1601DFF55E2658521;1
114+
9F;21A29A69145E38C1601DFF55E2658521;1
115+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
116+
9F;CE07372267DCB354DB216761B6E9C378;1
117+
9F;21A29A69145E38C1601DFF55E2658521;1
118+
9F;21A29A69145E38C1601DFF55E2658521;1
119+
9F;21A29A69145E38C1601DFF55E2658521;1
120+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
121+
9F;CE07372267DCB354DB216761B6E9C378;1
122+
9F;21A29A69145E38C1601DFF55E2658521;1
123+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
124+
9F;CE07372267DCB354DB216761B6E9C378;1
125+
9F;21A29A69145E38C1601DFF55E2658521;1
126+
9F;21A29A69145E38C1601DFF55E2658521;1
127+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
128+
9F;CE07372267DCB354DB216761B6E9C378;1
129+
9F;21A29A69145E38C1601DFF55E2658521;1
130+
9F;21A29A69145E38C1601DFF55E2658521;1
131+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
132+
9F;CE07372267DCB354DB216761B6E9C378;1
133+
9F;21A29A69145E38C1601DFF55E2658521;1
134+
9F;21A29A69145E38C1601DFF55E2658521;1
135+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
136+
9F;CE07372267DCB354DB216761B6E9C378;1
137+
9F;21A29A69145E38C1601DFF55E2658521;1
138+
9F;21A29A69145E38C1601DFF55E2658521;1
139+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
140+
9F;CE07372267DCB354DB216761B6E9C378;1
141+
9F;21A29A69145E38C1601DFF55E2658521;1
142+
9F;21A29A69145E38C1601DFF55E2658521;1
143+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
144+
9F;CE07372267DCB354DB216761B6E9C378;1
145+
9F;21A29A69145E38C1601DFF55E2658521;1
146+
9F;21A29A69145E38C1601DFF55E2658521;1
147+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
148+
9F;CE07372267DCB354DB216761B6E9C378;1
149+
9F;21A29A69145E38C1601DFF55E2658521;1
150+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
151+
9F;CE07372267DCB354DB216761B6E9C378;1
152+
9F;21A29A69145E38C1601DFF55E2658521;1
153+
9F;21A29A69145E38C1601DFF55E2658521;1
154+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
155+
9F;CE07372267DCB354DB216761B6E9C378;1
156+
9F;21A29A69145E38C1601DFF55E2658521;1
157+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
158+
9F;CE07372267DCB354DB216761B6E9C378;1
159+
9F;21A29A69145E38C1601DFF55E2658521;1
160+
9F;21A29A69145E38C1601DFF55E2658521;1
161+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
162+
9F;CE07372267DCB354DB216761B6E9C378;1
163+
9F;21A29A69145E38C1601DFF55E2658521;1
164+
9F;21A29A69145E38C1601DFF55E2658521;1
165+
9F;21A29A69145E38C1601DFF55E2658521;1
166+
9F;21A29A69145E38C1601DFF55E2658521;1
167+
9F;21A29A69145E38C1601DFF55E2658521;1
168+
9F;21A29A69145E38C1601DFF55E2658521;1
169+
9F;21A29A69145E38C1601DFF55E2658521;1
170+
9F;21A29A69145E38C1601DFF55E2658521;1
171+
9F;21A29A69145E38C1601DFF55E2658521;1
172+
9F;21A29A69145E38C1601DFF55E2658521;1
173+
9F;21A29A69145E38C1601DFF55E2658521;1
174+
9F;21A29A69145E38C1601DFF55E2658521;1
175+
9F;C6D90542DE4E66BBE66FBFCB84E9FF67;1
176+
9F;CE07372267DCB354DB216761B6E9C378;1
177+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
178+
9F;21A29A69145E38C1601DFF55E2658521;1
179+
9F;3D54A7E5DE9D444B28B479CF13B4CA70;1
180+
9F;C2B0A8CE070B71F409A889BCCC54A49B;1
181+
9F;C2B0A8CE070B71F409A889BCCC54A49B;1
182+
9F;21A29A69145E38C1601DFF55E2658521;1
183+
9F;4D167E8E17DBE15F5BC19D5B0B2AEA65;1
184+
9F;21A29A69145E38C1601DFF55E2658521;1
185+
9F;21A29A69145E38C1601DFF55E2658521;1
186+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
187+
9F;CE07372267DCB354DB216761B6E9C378;1
188+
9F;21A29A69145E38C1601DFF55E2658521;1
189+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
190+
9F;CE07372267DCB354DB216761B6E9C378;1
191+
9F;21A29A69145E38C1601DFF55E2658521;1
192+
9F;21A29A69145E38C1601DFF55E2658521;1
193+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
194+
9F;CE07372267DCB354DB216761B6E9C378;1
195+
9F;21A29A69145E38C1601DFF55E2658521;1
196+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
197+
9F;CE07372267DCB354DB216761B6E9C378;1
198+
9F;21A29A69145E38C1601DFF55E2658521;1
199+
9F;21A29A69145E38C1601DFF55E2658521;1
200+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
201+
9F;CE07372267DCB354DB216761B6E9C378;1
202+
9F;21A29A69145E38C1601DFF55E2658521;1
203+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
204+
9F;CE07372267DCB354DB216761B6E9C378;1
205+
9F;21A29A69145E38C1601DFF55E2658521;1
206+
9F;21A29A69145E38C1601DFF55E2658521;1
207+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
208+
9F;CE07372267DCB354DB216761B6E9C378;1
209+
9F;21A29A69145E38C1601DFF55E2658521;1
210+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
211+
9F;CE07372267DCB354DB216761B6E9C378;1
212+
9F;21A29A69145E38C1601DFF55E2658521;1
213+
9F;21A29A69145E38C1601DFF55E2658521;1
214+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
215+
9F;CE07372267DCB354DB216761B6E9C378;1
216+
9F;21A29A69145E38C1601DFF55E2658521;1
217+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
218+
9F;CE07372267DCB354DB216761B6E9C378;1
219+
9F;21A29A69145E38C1601DFF55E2658521;1
220+
9F;21A29A69145E38C1601DFF55E2658521;1
221+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
222+
9F;CE07372267DCB354DB216761B6E9C378;1
223+
9F;21A29A69145E38C1601DFF55E2658521;1
224+
9F;21A29A69145E38C1601DFF55E2658521;1
225+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
226+
9F;CE07372267DCB354DB216761B6E9C378;1
227+
9F;21A29A69145E38C1601DFF55E2658521;1
228+
9F;30B5CCF3F482A92E2F63A5C5E218149A;1
229+
9F;CE07372267DCB354DB216761B6E9C378;1
230+
9F;21A29A69145E38C1601DFF55E2658521;1

‎dut/zwave-js/handlers/behaviors/capabilities.ts‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
import { registerHandler, type PromptResponse } from "../../prompt-handlers.ts";
1+
import {
2+
registerHandler,
3+
type PromptContext,
4+
type PromptResponse,
5+
} from "../../prompt-handlers.ts";
26

3-
const questions: { pattern: RegExp; answer: PromptResponse }[] = [
7+
const questions: {
8+
pattern: RegExp;
9+
answer: PromptResponse | ((ctx: PromptContext) => PromptResponse);
10+
}[] = [
411
{ pattern: /allows the end user to establish association/i, answer: "No" },
512
{ pattern: /(capable|able) to display the last.+state/i, answer: "Yes" },
613
{
@@ -105,14 +112,26 @@ const questions: { pattern: RegExp; answer: PromptResponse }[] = [
105112

106113
// Generic
107114
{ pattern: /Retry\?/i, answer: "No" },
108-
{ pattern: /partial control behavior documented/i, answer: "No" },
115+
{
116+
pattern: /partial control behavior documented/i,
117+
answer: (ctx) => {
118+
if (ctx.testName.includes("CCR_EntryControlCC")) {
119+
return "Yes"; // Entry Control CC is marked as partial control in the certification portal
120+
}
121+
return "No";
122+
},
123+
},
109124
];
110125

111126
registerHandler(/.*/, {
112127
onPrompt: async (ctx) => {
113128
for (const q of questions) {
114129
if (q.pattern.test(ctx.promptText)) {
115-
return q.answer;
130+
if (typeof q.answer === "function") {
131+
return q.answer(ctx);
132+
} else {
133+
return q.answer;
134+
}
116135
}
117136
}
118137

‎dut/zwave-js/handlers/behaviors/sendSimpleCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ registerHandler(/.*/, {
6565
/\* (?<cmd>[A-Z_]+)(?: (to|on) end ?point (?<endpoint>\d+))?: \* Z-Wave Value = (?<targetValue>(0x)?[a-fA-F0-9]+)/i.exec(
6666
ctx.logText
6767
) ??
68-
/\* (?<cmd>[A-Z_]+)(?: (to|on) end ?point (?<endpoint>\d+))? with value='(?<targetValue>(0x)?[a-fA-F0-9]+)/.exec(
68+
/\* (?<cmd>[A-Z_]+)(?: (to|on) end ?point (?<endpoint>\d+))? with (target )?value='(?<targetValue>(0x)?[a-fA-F0-9]+)/.exec(
6969
ctx.logText
7070
) ??
7171
/\* (?<cmd>[A-Z_]+)(?: (to|on) end ?point (?<endpoint>\d+))?.+value = (?<targetValue>(0x)?[a-fA-F0-9]+)/i.exec(

‎dut/zwave-js/handlers/tests/CCR_EntryControlCC_Rev03.ts‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
1+
import { CommandClasses } from "@zwave-js/core";
12
import { registerHandler } from "../../prompt-handlers.ts";
3+
import {
4+
EntryControlEventTypes,
5+
type ZWaveNotificationCallbackArgs_EntryControlCC,
6+
} from "zwave-js";
27

38
registerHandler("CCR_EntryControlCC_Rev03", {
49
async onLog(ctx) {
510
const node = ctx.includedNodes.at(-1);
611
if (!node) return;
712

813
// Handle: * ENTRY_CONTROL_CONFIGURATION_SET with KeyCacheSize = 16 and KeyCacheTimeout = 5
9-
const match =
14+
const configSetMatch =
1015
/ENTRY_CONTROL_CONFIGURATION_SET.+KeyCacheSize\s*=\s*(?<size>\d+).+KeyCacheTimeout\s*=\s*(?<timeout>\d+)/i.exec(
1116
ctx.logText
1217
);
1318

14-
if (match?.groups) {
15-
const keyCacheSize = parseInt(match.groups.size!, 10);
16-
const keyCacheTimeout = parseInt(match.groups.timeout!, 10);
19+
if (configSetMatch?.groups) {
20+
const keyCacheSize = parseInt(configSetMatch.groups.size!, 10);
21+
const keyCacheTimeout = parseInt(configSetMatch.groups.timeout!, 10);
1722

1823
await node.commandClasses["Entry Control"].setConfiguration(
1924
keyCacheSize,
@@ -22,4 +27,34 @@ registerHandler("CCR_EntryControlCC_Rev03", {
2227
return true;
2328
}
2429
},
30+
31+
async onPrompt(ctx) {
32+
const node = ctx.includedNodes.at(-1);
33+
if (!node) return;
34+
35+
// Does the UI show a received Entry Control Notification event with Event Type 'Enter' and Event Data 'DummyEventData'?
36+
const notificationMatch =
37+
/UI show.+Entry Control Notification.+Event Type '(?<eventType>[^']+)'.+Event Data '(?<eventData>[^']+)'/i.exec(
38+
ctx.promptText
39+
);
40+
if (notificationMatch?.groups) {
41+
const eventType = notificationMatch.groups.eventType!;
42+
const eventData = notificationMatch.groups.eventData!;
43+
44+
const events = ctx.nodeNotifications.find(
45+
(n) => n.ccId === CommandClasses["Entry Control"]
46+
);
47+
if (!events) return "No";
48+
49+
const args = events.args as ZWaveNotificationCallbackArgs_EntryControlCC;
50+
if (
51+
args.eventType === (EntryControlEventTypes as any)[eventType] &&
52+
args.eventData === eventData
53+
) {
54+
return "Yes";
55+
}
56+
57+
return "No";
58+
}
59+
},
2560
});

0 commit comments

Comments
 (0)