Index: tests/natools-cron-tests.adb ================================================================== --- tests/natools-cron-tests.adb +++ tests/natools-cron-tests.adb @@ -155,11 +155,11 @@ -- Beat: set at 4.5, finalized at 9.5, run at 5.0, 6.0, 7.0, 8.0, 9.0. -- Slow: set at 4.5, finalized at 9.5, run at 6.5, 8.5. -- Fast: set at 6.5, reset at 8.0, -- run at 6.7, 6.9, 7.1, 7.3, 7.5, 7.7, 7.9 - Check (Test, Get (Log), "o.1.1.1.|.O.sff.fffff.s."); + Check (Test, "o.1.1.1.|.O.sff.fffff.s.", Get (Log)); exception when Error : others => Test.Report_Exception (Error); end Basic_Usage; @@ -177,13 +177,13 @@ Close => ')', Wait => Total / 4)); delay Total / 4; end; - Check (Test, Get (Log), "(", "Before wait"); + Check (Test, "(", Get (Log), "Before wait"); delay Total / 2; - Check (Test, Get (Log), "()", "After wait"); + Check (Test, "()", Get (Log), "After wait"); exception when Error : others => Test.Report_Exception (Error); end Delete_While_Busy; @@ -218,13 +218,13 @@ -- Triggers: * * -- Log: ( )< > ( -- End of Block: ^ -- End of Test: ^ - Check (Test, Get (Log), "("); + Check (Test, "(", Get (Log)); delay 4 * Tick; - Check (Test, Get (Log), "()<>"); + Check (Test, "()<>", Get (Log)); exception when Error : others => Test.Report_Exception (Error); end Delete_While_Collision; @@ -252,35 +252,35 @@ A_Tail.Set (First_Tick, Test_Callback' (Backend => Log'Access, Symbol => 'A')); delay Total / 8 + Total / 16; - Check (Test, Get (Log), "("); + Check (Test, "(", Get (Log)); B_Head.Set (Second_Tick, Test_Callback' (Backend => Log'Access, Symbol => 'B')); B_Tail.Set (Second_Tick, Test_Callback' (Backend => Log'Access, Symbol => 'b')); delay Total / 4 + Total / 8; - Check (Test, Get (Log), "()ABb()A"); + Check (Test, "()ABb()A", Get (Log)); A_Tail.Reset; B_Tail.Reset; delay Total / 4; - Check (Test, Get (Log), "()ABb()AB()"); + Check (Test, "()ABb()AB()", Get (Log)); end; -- Timeline: 0 . 1/4 . 1/2 . 3/4 . 1 -- Log: ( )A Bb( )A B( ) -- Code: * * * * * delay Total / 8; - Check (Test, Get (Log), "()ABb()AB()"); + Check (Test, "()ABb()AB()", Get (Log)); exception when Error : others => Test.Report_Exception (Error); end Event_List_Fusion; @@ -314,11 +314,11 @@ -- Finalize: * -- Ticks: L L S L S L S L S L -- Run: <----L---->S <----L---->S <----L----> delay Total / 8; - Check (Test, Get (Log), "().().()"); + Check (Test, "().().()", Get (Log)); exception when Error : others => Test.Report_Exception (Error); end Insert_While_Busy; @@ -341,11 +341,11 @@ ((Origin => Common.Origin, Period => 2 * Common.Period), Test_Callback'(Backend => Log'Access, Symbol => '3')); delay Total - Tick / 2; end; - Check (Test, Get (Log), "12312123"); + Check (Test, "12312123", Get (Log)); exception when Error : others => Test.Report_Exception (Error); end Time_Collision; end Natools.Cron.Tests;