From 4581cfab518e7d96eed530ed15c12b97aa920b49 Mon Sep 17 00:00:00 2001 From: Elliot Glaysher Date: Wed, 29 Aug 2018 11:03:26 -0700 Subject: [PATCH] 9: Move clay test to expect-nu-eq --- tests/sys/vane/clay.hoon | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/sys/vane/clay.hoon b/tests/sys/vane/clay.hoon index f022ad5456..06e593fc50 100644 --- a/tests/sys/vane/clay.hoon +++ b/tests/sys/vane/clay.hoon @@ -35,25 +35,25 @@ :: ^- tang ;: weld - %- expect-eq !> - :_ i.moves - ^- move:clay-gate - :- duct=~[/info] - ^- (wind note:clay-gate gift:able:clay) - :+ %pass /castifying/~nul/home/~1111.1.1 - ^- note:clay-gate - :- %f - [%build ~nul live=%.n [%pin ~1111.1.1 [%list ~]]] + %+ expect-nu-eq + !> ^- move:clay-gate + :- duct=~[/info] + ^- (wind note:clay-gate gift:able:clay) + :+ %pass /castifying/~nul/home/~1111.1.1 + ^- note:clay-gate + :- %f + [%build ~nul live=%.n [%pin ~1111.1.1 [%list ~]]] + !> i.moves :: - %- expect-eq !> - :_ i.t.moves - ^- move:clay-gate - :- duct=~[/info] - ^- (wind note:clay-gate gift:able:clay) - :+ %pass /diffing/~nul/home/~1111.1.1 - ^- note:clay-gate - :- %f - [%build ~nul live=%.n [%pin ~1111.1.1 [%list ~]]] + %+ expect-nu-eq + !> ^- move:clay-gate + :- duct=~[/info] + ^- (wind note:clay-gate gift:able:clay) + :+ %pass /diffing/~nul/home/~1111.1.1 + ^- note:clay-gate + :- %f + [%build ~nul live=%.n [%pin ~1111.1.1 [%list ~]]] + !> i.t.moves :: ^- tang :: @@ -62,7 +62,7 @@ =/ card=(wind note:clay-gate gift:able:clay) q.move :: %+ weld - (expect-eq !>([~[/info] duct])) + (expect-nu-eq !>(~[/info]) !>(duct)) :: ?. ?=(%pass -.card) [%leaf "bad move, not a %pass: {}"]~ @@ -70,7 +70,7 @@ =/ =wire p.card :: %+ weld - (expect-eq !>([/inserting/~nul/home/~1111.1.1 wire])) + (expect-nu-eq !>(/inserting/~nul/home/~1111.1.1) !>(wire)) :: =/ note=note:clay-gate q.card :: @@ -78,16 +78,16 @@ [%leaf "bad move, not a %build: {}"]~ :: %+ weld - (expect-eq !>([~nul our.note])) + (expect-nu-eq !>(~nul) !>(our.note)) :: %+ weld - (expect-eq !>([%.n live.note])) + (expect-nu-eq !>(%.n) !>(live.note)) :: ?. ?=(%pin -.schematic.note) [%leaf "bad move, not a %pin: {}"]~ :: %+ weld - (expect-eq !>([~1111.1.1 date.schematic.note])) + (expect-nu-eq !>(~1111.1.1) !>(date.schematic.note)) :: =/ list-schematic=schematic:ford schematic.schematic.note :: @@ -111,7 +111,7 @@ =/ vase1=vase q.literal.path1 :: %+ weld - (expect-eq !>([[-:!>(*path) /file1/noun] vase1])) + (expect-nu-eq !>([-:!>(*path) /file1/noun]) !>(vase1)) :: =/ cast1=schematic:ford +.s1 :: @@ -121,7 +121,7 @@ =/ lit1=schematic:ford input.cast1 :: %+ weld - (expect-eq !>([[%$ %noun %noun 'file1'] lit1])) + (expect-nu-eq !>([%$ %noun %noun 'file1']) !>(lit1)) :: test :s2 :: ?. ?=([^ *] s2) @@ -134,7 +134,7 @@ =/ vase2=vase q.literal.path2 :: %+ weld - (expect-eq !>([[-:!>(*path) /file2/noun] vase2])) + (expect-nu-eq !>([-:!>(*path) /file2/noun]) !>(vase2)) :: =/ cast2=schematic:ford +.s2 :: @@ -143,7 +143,7 @@ :: =/ lit2=schematic:ford input.cast2 :: - (expect-eq !>([[%$ %noun %noun 'file2'] lit2])) + (expect-nu-eq !>([%$ %noun %noun 'file2']) !>(lit2)) == == :: ;: welp