diff --git a/src/build/mod.rs b/src/build/mod.rs index 19fdff7..7a4bf88 100644 --- a/src/build/mod.rs +++ b/src/build/mod.rs @@ -1378,11 +1378,14 @@ impl<'a> FileBuilder<'a> { } fn record_assert_result(&mut self, msg: &str, is_success: bool) { - let msg = format!("{}\n", msg); - self.assert_collector.summary.push_str(&msg); if !is_success { + let msg = format!("NOT OK - {}\n", msg); + self.assert_collector.summary.push_str(&msg); self.assert_collector.failures.push_str(&msg); self.assert_collector.success = false; + } else { + let msg = format!("OK - {}\n", msg); + self.assert_collector.summary.push_str(&msg); } } diff --git a/std/testing.ucg b/std/testing.ucg index d531beb..122b553 100644 --- a/std/testing.ucg +++ b/std/testing.ucg @@ -6,17 +6,13 @@ // desc will be a descriptive message. let asserts = module{ // allows you to specify a a prefix for messages. - ok_prefix = "OK - ", // specify the prefix to add when the condition is not true. - not_prefix = "NOT ", // A default description to use for messages. default_description = "TODO description", } => { // Test that a value is true. let ok = module{ - ok_prefix = mod.ok_prefix, - not_prefix = mod.not_prefix, // test value expected to be true for success. test=false, // descriptive message to use in output. @@ -24,16 +20,11 @@ let asserts = module{ } => { let ok = mod.test; - let desc = select ok, "NOT OK - ", { - true = "@@" % (mod.ok_prefix, mod.desc), - false = "@@@" % (mod.not_prefix, mod.ok_prefix, mod.desc), - }; + let desc = "@" % (mod.desc); }; // Test that a value is not true. let not_ok = module{ - ok_prefix = mod.ok_prefix, - not_prefix = mod.not_prefix, // Test value expected to to be false for success. test=true, // descriptive message to use in output. @@ -41,21 +32,12 @@ let asserts = module{ } => { let ok = mod.test != true; - let desc_prefix = select ok, "", { - true = "@@" % (mod.ok_prefix, mod.desc), - false = "@@@" % (mod.not_prefix, mod.ok_prefix, mod.desc), - }; + let desc = "@" % (mod.desc); - let desc = select (mod.desc == ""), "", { - true = "@ not succcessful" % (desc_prefix), - false = "@" % (desc_prefix), - }; }; // Asserts that two values are equal. Does deep equal comparisons. let equal = module{ - ok_prefix = mod.ok_prefix, - not_prefix = mod.not_prefix, // Left value for deep equal comparison. left=NULL, // right value for deep equal comparison. @@ -63,16 +45,11 @@ let asserts = module{ } => { let ok = mod.left == mod.right; - let desc = select ok, "", { - true = "@@ == @" % (mod.ok_prefix, mod.left, mod.right), - false = "@@@ != @" % (mod.not_prefix, mod.ok_prefix, mod.left, mod.right), - }; + let desc = "@ == @" % (mod.left, mod.right); }; // Asserts that two values are not equal. Does deep equal comparisons. let not_equal = module{ - ok_prefix = mod.ok_prefix, - not_prefix = mod.not_prefix, // Left value for deep equal comparison. left=NULL, // right value for deep equal comparison. @@ -80,9 +57,6 @@ let asserts = module{ } => { let ok = mod.left != mod.right; - let desc = select ok, "", { - true = "@@ != @" % (mod.ok_prefix, mod.left, mod.right), - false = "@@@ == @" % (mod.not_prefix, mod.ok_prefix, mod.left, mod.right), - }; + let desc = "@ != @" % (mod.left, mod.right); }; }; \ No newline at end of file diff --git a/std/tests/testing_test.ucg b/std/tests/testing_test.ucg index 086067b..5522fc5 100644 --- a/std/tests/testing_test.ucg +++ b/std/tests/testing_test.ucg @@ -9,7 +9,7 @@ let not_equal_result = asserts.not_equal{ assert not_equal_result; assert asserts.equal{ left=not_equal_result.desc, - right="OK - 1 != 2", + right="1 != 2", }; let bad_not_equal_result = asserts.not_equal{ @@ -19,7 +19,7 @@ let bad_not_equal_result = asserts.not_equal{ assert asserts.not_ok{test=bad_not_equal_result.ok}; assert asserts.equal{ left=bad_not_equal_result.desc, - right="NOT OK - 1 == 1", + right="1 != 1", }; @@ -30,7 +30,7 @@ let equal_result = asserts.equal{ assert equal_result; assert asserts.equal{ left=equal_result.desc, - right="OK - 1 == 1", + right="1 == 1", }; let bad_equal_result = asserts.equal{ @@ -39,7 +39,7 @@ let bad_equal_result = asserts.equal{ }; assert asserts.equal{ left=bad_equal_result.desc, - right="NOT OK - 1 != 2", + right="1 == 2", }; let ok_result = asserts.ok{ @@ -48,7 +48,7 @@ let ok_result = asserts.ok{ assert ok_result; assert asserts.equal{ left=ok_result.desc, - right="OK - TODO description", + right="TODO description", }; let bad_ok_result = t.asserts.ok{ @@ -56,7 +56,7 @@ let bad_ok_result = t.asserts.ok{ }; assert asserts.equal{ left=bad_ok_result.desc, - right="NOT OK - TODO description", + right="TODO description", }; let not_ok_result = asserts.not_ok{ @@ -65,5 +65,5 @@ let not_ok_result = asserts.not_ok{ assert not_ok_result; assert asserts.equal{ left=not_ok_result.desc, - right="OK - TODO description", + right="TODO description", }; \ No newline at end of file