Fix more tests

NNPDF · Aug 6, 2024 · 2416f20 · 2416f20
1 parent 10da731
commit 2416f20
Show file tree

Hide file tree

Showing 4 changed files with 337 additions and 337 deletions.
diff --git a/pineappl_cli/src/read.rs b/pineappl_cli/src/read.rs
@@ -127,7 +127,7 @@ impl Subcommand for Opts {
                 for (pids, factor) in channel.entry() {
                     row.add_cell(cell!(format!(
                         "{factor} \u{d7} ({})",
-                        pids.iter().map(ToString::to_string).join(", ")
+                        pids.iter().map(|pid| format!("{pid:2}")).join(", ")
                     )));
                 }
             }

diff --git a/pineappl_cli/tests/export.rs b/pineappl_cli/tests/export.rs
@@ -23,11 +23,11 @@ Options:
 
 #[cfg(feature = "applgrid")]
 const EXPORT_APPLGRID_STR: &str =
-    "WARNING: the order O(as^1 a^2 lr^1 lf^0) isn't supported by APPLgrid and will be skipped.
-WARNING: the order O(as^1 a^2 lr^0 lf^1) isn't supported by APPLgrid and will be skipped.
-WARNING: the order O(as^0 a^3 lr^0 lf^0) isn't supported by APPLgrid and will be skipped.
-WARNING: the order O(as^0 a^3 lr^1 lf^0) isn't supported by APPLgrid and will be skipped.
-WARNING: the order O(as^0 a^3 lr^0 lf^1) isn't supported by APPLgrid and will be skipped.
+    "WARNING: the order O(as^1 a^2 lr^1 lf^0 la^0) isn't supported by APPLgrid and will be skipped.
+WARNING: the order O(as^1 a^2 lr^0 lf^1 la^0) isn't supported by APPLgrid and will be skipped.
+WARNING: the order O(as^0 a^3 lr^0 lf^0 la^0) isn't supported by APPLgrid and will be skipped.
+WARNING: the order O(as^0 a^3 lr^1 lf^0 la^0) isn't supported by APPLgrid and will be skipped.
+WARNING: the order O(as^0 a^3 lr^0 lf^1 la^0) isn't supported by APPLgrid and will be skipped.
 b    APPLgrid     PineAPPL     rel. diff
 --+------------+------------+--------------
 0   7.9566291e0  7.9566291e0 -2.5535130e-15
@@ -52,7 +52,7 @@ b    APPLgrid     PineAPPL     rel. diff
 
 #[cfg(feature = "applgrid")]
 const EXPORT_DIS_APPLGRID_STR: &str =
-    "WARNING: the order O(as^1 a^0 lr^0 lf^1) isn't supported by APPLgrid and will be skipped.
+    "WARNING: the order O(as^1 a^0 lr^0 lf^1 la^0) isn't supported by APPLgrid and will be skipped.
 b   APPLgrid    PineAPPL     rel. diff
 --+-----------+-----------+--------------
 0  2.8829972e0 2.8829972e0  3.3306691e-15

diff --git a/pineappl_cli/tests/read.rs b/pineappl_cli/tests/read.rs
@@ -54,26 +54,26 @@ const ORDERS_STR: &str = "o      order
 6 O(a^3 lf^1)
 ";
 
-const ORDERS_LONG_STR: &str = "o         order
--+---------------------
-0 O(as^0 a^2 lr^0 lf^0)
-1 O(as^1 a^2 lr^0 lf^0)
-2 O(as^1 a^2 lr^1 lf^0)
-3 O(as^1 a^2 lr^0 lf^1)
-4 O(as^0 a^3 lr^0 lf^0)
-5 O(as^0 a^3 lr^1 lf^0)
-6 O(as^0 a^3 lr^0 lf^1)
+const ORDERS_LONG_STR: &str = "o           order
+-+--------------------------
+0 O(as^0 a^2 lr^0 lf^0 la^0)
+1 O(as^1 a^2 lr^0 lf^0 la^0)
+2 O(as^1 a^2 lr^1 lf^0 la^0)
+3 O(as^1 a^2 lr^0 lf^1 la^0)
+4 O(as^0 a^3 lr^0 lf^0 la^0)
+5 O(as^0 a^3 lr^1 lf^0 la^0)
+6 O(as^0 a^3 lr^0 lf^1 la^0)
 ";
 
-const ORDERS_SPACES_STR: &str = "o         order
--+---------------------
-0 O(     a^2          )
-1 O(as^1 a^2          )
-2 O(as^1 a^2 lr^1     )
-3 O(as^1 a^2      lf^1)
-4 O(     a^3          )
-5 O(     a^3 lr^1     )
-6 O(     a^3      lf^1)
+const ORDERS_SPACES_STR: &str = "o           order
+-+--------------------------
+0 O(     a^2               )
+1 O(as^1 a^2               )
+2 O(as^1 a^2 lr^1          )
+3 O(as^1 a^2      lf^1     )
+4 O(     a^3               )
+5 O(     a^3 lr^1          )
+6 O(     a^3      lf^1     )
 ";
 
 const FKTABLE_STR: &str = "no