diff --git a/src/util.cpp b/src/util.cpp index 2671caa98..9cef49e53 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -471,20 +471,20 @@ std::string taskInfoDifferences (const Task& before, const Task& after) std::string from; join (from, ",", deps_before); - out << "dependencies '" + out << "Dependencies '" << from - << "' deleted\n"; + << "' deleted.\n"; } else if (name->substr (0, 11) == "annotation_") { - out << "annotation '" + out << "Annotation '" << before.get (*name) - << "' deleted"; + << "' deleted.\n"; } else { - out << *name - << " deleted\n"; + out << ucFirst (*name) + << " deleted.\n"; } } @@ -497,22 +497,22 @@ std::string taskInfoDifferences (const Task& before, const Task& after) std::string to; join (to, ",", deps_after); - out << *name + out << ucFirst(*name) << " set to '" << to - << "'\n"; + << "'.\n"; } else if (name->substr (0, 11) == "annotation_") { - out << "annotation added '" + out << "Annotation of '" << after.get (*name) - << "'\n"; + << "' added.\n"; } else - out << *name + out << ucFirst(*name) << " set to '" << renderAttribute (*name, after.get (*name)) - << "'\n"; + << "'.\n"; } foreach (name, beforeAtts) @@ -531,26 +531,26 @@ std::string taskInfoDifferences (const Task& before, const Task& after) std::string to; join (to, ",", deps_after); - out << *name + out << ucFirst(*name) << " changed from '" << from << "' to '" << to - << "'\n"; + << "'.\n"; } else if (name->substr (0, 11) == "annotation_") { - out << "annotation '" + out << "Annotation changed to '" << after.get (*name) - << "'\n"; + << "'.\n"; } else - out << *name + out << ucFirst(*name) << " changed from '" << renderAttribute (*name, before.get (*name)) << "' to '" << renderAttribute (*name, after.get (*name)) - << "'\n"; + << "'.\n"; } diff --git a/test/feature.608.t b/test/feature.608.t index 7fe80b927..f7b4d4e49 100755 --- a/test/feature.608.t +++ b/test/feature.608.t @@ -49,7 +49,7 @@ qx{../src/task rc:bug.rc done 1}; # Check to ensure task was stopped my $output = qx{../src/task rc:bug.rc info 1}; -like ($output, qr/end set to/ms, 'Done command also stops started task.'); +like ($output, qr/End set to/ms, 'Done command also stops started task.'); # Cleanup. unlink 'pending.data'; diff --git a/test/sequence.t b/test/sequence.t index b63db13d7..61e61b79a 100755 --- a/test/sequence.t +++ b/test/sequence.t @@ -75,9 +75,9 @@ $output = qx{../src/task rc:seq.rc info 2}; like ($output, qr/Start/, 'sequence start 2'); qx{../src/task rc:seq.rc stop 1,2}; $output = qx{../src/task rc:seq.rc info 1}; -unlike ($output, qr/Start/, 'sequence stop 1'); +like ($output, qr/Start\sdeleted/, 'sequence stop 1'); $output = qx{../src/task rc:seq.rc info 2}; -unlike ($output, qr/Start/, 'sequence stop 2'); +like ($output, qr/Start\sdeleted/, 'sequence stop 2'); # Test sequences in modify qx{../src/task rc:seq.rc 1,2 +tag};