Refactor tests for SwitchNode to enhance clarity and organization

Author: oldrev

crates/core/src/runtime/nodes/function_nodes/switch/mod.rs

@@ -199,7 +199,7 @@ impl SwitchRuleOperator {
                 (Variant::Object(a), Some(b)) => Ok(a.contains_key(b)),
                 _ => Ok(false),
             },
-            Self::Else => Ok(*a == Variant::Bool(true)),
+            Self::Else => Ok(false),
             _ => Err(EdgelinkError::NotSupported("Unsupported operator".to_owned()).into()),
         }
     }
@@ -406,32 +406,41 @@ impl SwitchNode {
         let msg = orig_msg.read().await;
         let from_value = self.eval_property_value(&msg).await?;
         let last_property_value = from_value.clone();
+        let mut matched = false;
         for (port, rule) in self.config.rules.iter().enumerate() {
-            if rule.value_type == SwitchPropertyType::Prev {
-                let prev_guard = self.prev_value.read().await;
-                if prev_guard.is_null() {
+            if rule.operator == SwitchRuleOperator::Else {
+                // only match if no previous rule matched
+                if !matched {
                     envelopes.push(Envelope { port, msg: orig_msg.clone() });
+                }
+                // else never match
+            } else {
+                if rule.value_type == SwitchPropertyType::Prev {
+                    let prev_guard = self.prev_value.read().await;
+                    if prev_guard.is_null() {
+                        envelopes.push(Envelope { port, msg: orig_msg.clone() });
+                        if !self.config.check_all {
+                            break;
+                        }
+                        continue;
+                    }
+                }
+                if rule.value2_type == Some(SwitchPropertyType::Prev) {
+                    let prev_guard = self.prev_value.read().await;
+                    if prev_guard.is_null() {
+                        continue;
+                    }
+                }
+                let v1 = self.get_v1(rule, &msg).await?;
+                let v2 = self.get_v2(rule, &msg).await?;
+                if rule.operator.apply(&from_value, &v1, &v2, rule.case, &[])? {
+                    envelopes.push(Envelope { port, msg: orig_msg.clone() });
+                    matched = true;
                     if !self.config.check_all {
                         break;
                     }
-                    continue;
-                }
-            }
-            if rule.value2_type == Some(SwitchPropertyType::Prev) {
-                let prev_guard = self.prev_value.read().await;
-                if prev_guard.is_null() {
-                    continue;
                 }
             }
-            let v1 = self.get_v1(rule, &msg).await?;
-            let v2 = self.get_v2(rule, &msg).await?;
-            if rule.operator.apply(&from_value, &v1, &v2, rule.case, &[])? {
-                envelopes.push(Envelope { port, msg: orig_msg.clone() });
-            }
-
-            if !self.config.check_all {
-                break;
-            }
         }
         // Update prev_value
         if !last_property_value.is_null() {

tests/nodes/function/test_switch_node.py

@@ -791,11 +791,9 @@ async def test_it_should_handle_persistable_flow_and_global_contexts_with_jsonat
              "checkall": True, "outputs": 1, "wires": [["3"]]},
             {"id": "3", "z": "100", "type": "test-once"}
         ]
-        
         injections = [
             {"nid": "1", "msg": {"payload": "pass"}},
         ]
-        
         msgs = await run_flow_with_msgs_ntimes(flows_obj=flows, msgs=injections, nexpected=1, timeout=0.5)
         assert len(msgs) == 1
         assert msgs[0]["payload"] == "pass"
@@ -812,9 +810,8 @@ async def test_it_should_handle_env_var_expression(self):
              "checkall": True, "outputs": 1, "wires": [["2"]]},
             {"id": "2", "z": "100", "type": "test-once"}
         ]
-        
-        # Set environment variable (this depends on your implementation)
-        # os.environ["VAR"] = "VAL"
+        # Set environment variable
+        os.environ["VAR"] = "VAL"
         await _custom_flow_switch_test(flow, True, "OK")
 
     # Sequence handling tests (these require sequence/parts support)