Fix tests

galaxyproteomics · Jul 1, 2024 · a1f3bd7 · a1f3bd7
1 parent e3e7d8d
commit a1f3bd7
Show file tree

Hide file tree

Showing 7 changed files with 696 additions and 676 deletions.
diff --git a/tools/cardinal/spatial_DGMM.xml b/tools/cardinal/spatial_DGMM.xml
@@ -229,9 +229,19 @@ change in log-likelihood."/>
             <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"/>
+                    <assert_contents>
+                        <has_text text="files_"/>
+                        <has_text text="3"/>
+                        <has_text_matching expression="0\.\d+"/>
+                    </assert_contents>
             </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"/>
+                    <assert_contents>
+                        <has_text text="xy_16_1"/>
+                        <has_text text="3"/>
+                        <has_text_matching expression="0\.\d+"/>
+                    </assert_contents>
             </output_collection>
         </test>
         <test expect_num_outputs="6">
@@ -260,9 +270,19 @@ change in log-likelihood."/>
             <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"/>
+                    <assert_contents>
+                        <has_text text="circle"/>
+                        <has_text text="3"/>
+                        <has_text_matching expression="0\.\d+"/>
+                    </assert_contents>
             </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"/>
+                    <assert_contents>
+                        <has_text text="xy_9_1"/>
+                        <has_text text="3"/>
+                        <has_text_matching expression="0\.\d+"/>
+                    </assert_contents>
             </output_collection>
         </test>         
     </tests>

diff --git a/tools/cardinal/test-data/dgmm_test1.pdf b/tools/cardinal/test-data/dgmm_test1.pdf
diff --git a/tools/cardinal/test-data/dgmm_test2.pdf b/tools/cardinal/test-data/dgmm_test2.pdf
diff --git a/tools/cardinal/test-data/estimates_r1_k6_mz1135.93347167969.tabular b/tools/cardinal/test-data/estimates_r1_k6_mz1135.93347167969.tabular
@@ -1,4 +1,4 @@
 group	class	mean	var
 files_	1	0.224949111319976	0.133976695047921
-files_	2	5.01787928237365	0.301220362077463
-files_	3	6.64940193494161	0.752878508867188
+files_	2	4.8214570634499	0.301220362077463
+files_	3	6.6086885724357	0.752878508867188
diff --git a/tools/cardinal/test-data/estimates_r2_k10_mz1200.46533203125.tabular b/tools/cardinal/test-data/estimates_r2_k10_mz1200.46533203125.tabular
@@ -1,6 +1,6 @@
 group	class	mean	var
-bg	1	0.130130886344877	0.158967083338173
-bg	2	3.6019449523809	0.859771560896229
-circle	3	3.17173569221357	0.391470349751297
-circle	4	5.20965903593223	1.71946295137627
+bg	1	0.24404370080711	0.158967083338173
+bg	2	3.70987357402502	0.859771560896229
+circle	3	3.20052414013949	0.373783892349068
+circle	4	5.55910670518051	1.71747870891981
 square	5	3.8928901507304	1.21620428871296
diff --git a/tools/cardinal/test-data/probability_r1_k6_mz1023.70806884766.tabular b/tools/cardinal/test-data/probability_r1_k6_mz1023.70806884766.tabular
diff --git a/tools/cardinal/test-data/probability_r2_k10_mz1135.93347167969.tabular b/tools/cardinal/test-data/probability_r2_k10_mz1135.93347167969.tabular