[lmi-commits] [lmi] master 11eedff 6/6: Improve concinnity

[Greg Chicares]

branch: master
commit 11eedffeeea7588f692734fd08e09f504c2f349c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Improve concinnity
    
    Show observed and expected in the same order for all three tests in
    check(), with more uniform (and more informative) descriptions.
---
 input_seq_test.cpp |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/input_seq_test.cpp b/input_seq_test.cpp
index f765625..3f1335e 100644
--- a/input_seq_test.cpp
+++ b/input_seq_test.cpp
@@ -48,10 +48,10 @@ void check
         {
         using osid = std::ostream_iterator<double>;
         std::cout << "\nExpression: '" << e << "'";
-        std::cout << "\n  expected: ";
-        std::copy(d        , d + n  , osid(std::cout, " "));
-        std::cout << "\n   but got: ";
+        std::cout << "\n      observed numbers: ";
         std::copy(v.begin(), v.end(), osid(std::cout, " "));
+        std::cout << "\n  differ from expected: ";
+        std::copy(d        , d + n  , osid(std::cout, " "));
         std::cout << std::endl;
         }
 
@@ -66,10 +66,10 @@ void check
         {
         using osis = std::ostream_iterator<std::string>;
         std::cout << "\nExpression: '" << e << "'";
-        std::cout << "\n  expected: ";
-        std::copy(t.begin(), t.end(), osis(std::cout, "|"));
-        std::cout << "\n   but got: ";
+        std::cout << "\n     observed keywords: ";
         std::copy(s.begin(), s.end(), osis(std::cout, "|"));
+        std::cout << "\n  differ from expected: ";
+        std::copy(t.begin(), t.end(), osis(std::cout, "|"));
         std::cout << std::endl;
         }