From 8bef62c63c67674b4a6bd2482f77c53e60503871 Mon Sep 17 00:00:00 2001
From: MarenStillger <maren.nicole@googlemail.com>
Date: Tue, 2 Jul 2024 11:19:45 +0200
Subject: [PATCH] Fix tests

---
 tools/cardinal/spatial_DGMM.xml | 40 ++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/tools/cardinal/spatial_DGMM.xml b/tools/cardinal/spatial_DGMM.xml
index a15a03924..de308fc6a 100644
--- a/tools/cardinal/spatial_DGMM.xml
+++ b/tools/cardinal/spatial_DGMM.xml
@@ -228,17 +228,21 @@ change in log-likelihood."/>
             <output name="file_info" file="dgmm_test1.pdf" compare="sim_size"/>
             <output name="dgmm_summary" file="dgmm_summary1.tabular"/>
             <output_collection name="estimates_output" type="list" count="10">
-                <element name="estimates_r1_k6_mz1135.93347167969" file="estimates_r1_k6_mz1135.93347167969.tabular">
-                    <has_text text="files_"/>
-                    <has_text text="3"/>
-                    <has_text_matching expression="0\.\d+"/>
+                <element name="estimates_r1_k6_mz1135.93347167969">
+                    <assert_contents>
+                        <has_text text="files_"/>
+                        <has_text text="3"/>
+                        <has_text_matching expression="0\.\d+"/>
+                    </assert_contents>
                 </element>
             </output_collection>
             <output_collection name="probability_output" type="list" count="10">
-                <element name="probability_r1_k6_mz1023.70806884766" file="probability_r1_k6_mz1023.70806884766.tabular">
-                    <has_text text="xy_16_1"/>
-                    <has_text text="3"/>
-                    <has_text_matching expression="0\.\d+"/>
+                <element name="probability_r1_k6_mz1023.70806884766">
+                    <assert_contents>
+                        <has_text text="xy_16_1"/>
+                        <has_text text="3"/>
+                        <has_text_matching expression="0\.\d+"/>
+                    </assert_contents>
                 </element>
             </output_collection>
         </test>
@@ -267,17 +271,21 @@ change in log-likelihood."/>
             <output name="dgmm_summary" file="dgmm_summary2.tabular"/>
             <output name="dgmm_rdata" file="dgmm_test2.RData" compare="sim_size"/>
             <output_collection name="estimates_output" type="list" count="10">
-                <element name="estimates_r2_k10_mz1200.46533203125" file="estimates_r2_k10_mz1200.46533203125.tabular">
-                    <has_text text="circle"/>
-                    <has_text text="3"/>
-                    <has_text_matching expression="0\.\d+"/>
+                <element name="estimates_r2_k10_mz1200.46533203125">
+                    <assert_contents>
+                        <has_text text="circle"/>
+                        <has_text text="3"/>
+                        <has_text_matching expression="0\.\d+"/>
+                    </assert_contents>
                 </element>
             </output_collection>
             <output_collection name="probability_output" type="list" count="10">
-                <element name="probability_r2_k10_mz1135.93347167969" file="probability_r2_k10_mz1135.93347167969.tabular">
-                    <has_text text="xy_9_1"/>
-                    <has_text text="3"/>
-                    <has_text_matching expression="0\.\d+"/>
+                <element name="probability_r2_k10_mz1135.93347167969">
+                    <assert_contents>
+                        <has_text text="xy_9_1"/>
+                        <has_text text="3"/>
+                        <has_text_matching expression="0\.\d+"/>
+                    </assert_contents>
                 </element>
             </output_collection>
         </test>