Adapt packages that use "TEST get(...)" for new test behavior

currentFileDirectory will no likely no longer be the correct path to the test files, so we use the packages' "auxiliary files" keys to find them.
Macaulay2 · Sep 22, 2024 · 8e44b22 · 8e44b22
1 parent e46ceea
commit 8e44b22
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/M2/Macaulay2/packages/MinimalPrimes/tests.m2 b/M2/Macaulay2/packages/MinimalPrimes/tests.m2
@@ -39,13 +39,13 @@ TEST ///
   assert( intersect decompose J == J )
 ///
 
-TEST get(currentFileDirectory | "decompose-test.m2") -- FIXME: one test here may be wrong
-TEST get(currentFileDirectory | "decompose2-test.m2") -- FIXME: not testing anything
-TEST get(currentFileDirectory | "decompose4-test.m2")
-TEST get(currentFileDirectory | "decompose5-test.m2")
-TEST get(currentFileDirectory | "minprimes-test.m2")
-TEST get(currentFileDirectory | "minprimes2-test.m2") -- TODO: add Binomial strategy
-TEST get(currentFileDirectory | "radical-test.m2") -- FIXME: not testing anything
+TEST get(MinimalPrimes#"auxiliary files" | "decompose-test.m2") -- FIXME: one test here may be wrong
+TEST get(MinimalPrimes#"auxiliary files" | "decompose2-test.m2") -- FIXME: not testing anything
+TEST get(MinimalPrimes#"auxiliary files" | "decompose4-test.m2")
+TEST get(MinimalPrimes#"auxiliary files" | "decompose5-test.m2")
+TEST get(MinimalPrimes#"auxiliary files" | "minprimes-test.m2")
+TEST get(MinimalPrimes#"auxiliary files" | "minprimes2-test.m2") -- TODO: add Binomial strategy
+TEST get(MinimalPrimes#"auxiliary files" | "radical-test.m2") -- FIXME: not testing anything
 
 TEST ///
   R = ZZ/101[a..d]

diff --git a/M2/Macaulay2/packages/PrimaryDecomposition/tests.m2 b/M2/Macaulay2/packages/PrimaryDecomposition/tests.m2
@@ -37,9 +37,9 @@ TEST ///
   assert(primaryDecomposition M == {0})
 ///
 
-TEST get(currentFileDirectory | "associatedPrimes-test.m2")
-TEST get(currentFileDirectory | "associatedPrimes2-test.m2")
-TEST get(currentFileDirectory | "primaryDecomposition-test.m2")
+TEST get(PrimaryDecomposition#"auxiliary files" | "associatedPrimes-test.m2")
+TEST get(PrimaryDecomposition#"auxiliary files" | "associatedPrimes2-test.m2")
+TEST get(PrimaryDecomposition#"auxiliary files" | "primaryDecomposition-test.m2")
 
 testResult = method()
 testResult(Ideal,List) := (I,L) -> (

diff --git a/M2/Macaulay2/packages/Saturation/saturate-test.m2 b/M2/Macaulay2/packages/Saturation/saturate-test.m2
@@ -27,9 +27,9 @@ TEST ///
   assert(Q == quotient(Q, a))
 ///
 
-TEST get(currentFileDirectory | "saturate3.m2")
-TEST get(currentFileDirectory | "saturate4.m2")
-TEST get(currentFileDirectory | "saturate5.m2")
+TEST get(Saturation#"auxiliary files" | "saturate3.m2")
+TEST get(Saturation#"auxiliary files" | "saturate4.m2")
+TEST get(Saturation#"auxiliary files" | "saturate5.m2")
 
 TEST ///
   -- used to be in tests/quarantine/saturate.m2