fix: make reorder tolerant

Agoric · Aug 1, 2023 · 9f69167 · 9f69167
1 parent 5839b0a
commit 9f69167
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/packages/inter-protocol/test/smartWallet/test-psm-integration.js b/packages/inter-protocol/test/smartWallet/test-psm-integration.js
@@ -465,7 +465,9 @@ test('agoricName invitation source errors', async t => {
     }),
     {
       message:
-        '{"instancePath":["psm-IST-AUSD"],"source":"agoricContract"} - Must have missing properties ["callPipe"]',
+        // TODO The pattern is here only as a temporary measure to tolerate
+        // the property order being sorted and not.
+        /\{("instancePath":\["psm-IST-AUSD"\]|,|"source":"agoricContract")*\} - Must have missing properties \["callPipe"\]/,
     },
   );
   t.is(await E.get(getBalanceFor(anchor.brand)).value, 0n);

diff --git a/packages/zoe/test/unitTests/test-cleanProposal.js b/packages/zoe/test/unitTests/test-cleanProposal.js
@@ -231,7 +231,9 @@ test('cleanProposal - other wrong stuff', t => {
     t,
     { exit: { afterDeadline: 'foo' } },
     'nat',
-    /"foo" - Must be a copyRecord to match a copyRecord pattern: \{"deadline":.*,"timer":.*\}/,
+    // TODO The outer pattern is here only as a temporary measure to tolerate
+    // the property order being sorted and not.
+    /"foo" - Must be a copyRecord to match a copyRecord pattern: \{("deadline":.*|,|"timer":.*)*\}/,
   );
   proposeBad(
     t,
@@ -249,7 +251,9 @@ test('cleanProposal - other wrong stuff', t => {
     t,
     { exit: { afterDeadline: { timer, deadline: 3n, extra: 'foo' } } },
     'nat',
-    'proposal: exit: afterDeadline?: {"deadline":"[3n]","extra":"foo","timer":"[Alleged: ManualTimer]"} - Must not have unexpected properties: ["extra"]',
+    // TODO The pattern is here only as a temporary measure to tolerate
+    // the property order being sorted and not.
+    /proposal: exit: afterDeadline\?: \{("deadline":"\[3n\]"|,|"extra":"foo"|,|"timer":"\[Alleged: ManualTimer\]")*\} - Must not have unexpected properties: \["extra"\]/,
   );
   proposeBad(
     t,

diff --git a/packages/zoe/test/unitTests/test-testHelpers.js b/packages/zoe/test/unitTests/test-testHelpers.js
@@ -72,8 +72,10 @@ test('assertAmountsEqual - Nat vs. Set', async t => {
     harden({ brand: shinyAmount.brand, value: 0n }),
   );
   const message =
-    'Asset kinds must match: got [{"description":"hat","name":"hat","power":"shiny"}], expected "[0n]"';
-  t.is(fakeT.getError(), message);
+    // TODO The pattern is here only as a temporary measure to tolerate
+    // the property order being sorted and not.
+    /Asset kinds must match: got \[\{("description":"hat"|,|"name":"hat"|,|"power":"shiny")*\}\], expected "\[0n\]"/;
+  t.assert(message.test(fakeT.getError()));
   await t.throwsAsync(resultP, { message });
 });
 
@@ -87,8 +89,10 @@ test('assertAmountsEqual - false Set', async t => {
   const fakeT = makeFakeT();
   const resultP = assertAmountsEqual(fakeT, shinyAmount, sparklyAmount);
   const message =
-    'Values must match: got [{"description":"hat","name":"hat","power":"shiny"}], expected [{"description":"hat","name":"hat","power":"sparkly"}]';
-  t.is(fakeT.getError(), message);
+    // TODO The pattern is here only as a temporary measure to tolerate
+    // the property order being sorted and not.
+    /Values must match: got \[\{("description":"hat"|,|"name":"hat"|,|"power":"shiny")*\}\], expected \[\{("description":"hat"|,|"name":"hat"|,|"power":"sparkly)*"\}\]/;
+  t.assert(message.test(fakeT.getError()));
   await t.throwsAsync(resultP, { message });
 });