From c2a7f2adcdb68b0730f3fb4ccd169792a23261ef Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Wed, 8 May 2024 14:06:28 +0200
Subject: [PATCH] Fix tests

---
 src/Models/ThemeConfig/Conversion/Validation.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Models/ThemeConfig/Conversion/Validation.ts b/src/Models/ThemeConfig/Conversion/Validation.ts
index 9d0f7ffa81..68ea1ba376 100644
--- a/src/Models/ThemeConfig/Conversion/Validation.ts
+++ b/src/Models/ThemeConfig/Conversion/Validation.ts
@@ -562,14 +562,16 @@ export class DetectNonErasedKeysInMappings extends DesugaringStep<QuestionableTa
 }
 
 export class DetectMappingsShadowedByCondition extends DesugaringStep<TagRenderingConfigJson> {
+    private readonly _forceError: boolean
 
-    constructor() {
+    constructor(forceError: boolean = false) {
         super("Checks that, if the tagrendering has a condition, that a mapping is not contradictory to it, i.e. that there are no dead mappings", [], "DetectMappingsShadowedByCondition")
+        this._forceError = forceError
     }
 
     /**
      *
-     * const validator = new DetectMappingsShadowedByCondition()
+     * const validator = new DetectMappingsShadowedByCondition(true)
      * const ctx = ConversionContext.construct([],["test"])
      * validator.convert({
      *     condition: "count>0",
@@ -602,7 +604,13 @@ export class DetectMappingsShadowedByCondition extends DesugaringStep<TagRenderi
             const tagIf = TagUtils.Tag(mapping.if, context.path.join("."))
             const optimized = new And([tagIf, condition]).optimize()
             if(optimized === false){
-                context.enters("mappings",i).warn("Detected a conflicting mapping and condition. The mapping requires tags " + tagIf.asHumanString()+", yet this can never happen because the set condition requires "+condition.asHumanString())
+                const msg = ("Detected a conflicting mapping and condition. The mapping requires tags " + tagIf.asHumanString() + ", yet this can never happen because the set condition requires " + condition.asHumanString())
+                const ctx = context.enters("mappings", i)
+                if (this._forceError) {
+                    ctx.err(msg)
+                } else {
+                    ctx.warn(msg)
+                }
             }
         }