Rewrite documentation for legacy app handler test

Removed the requirement to restart the system for each test, instead
just restart the node startup controller for each test. The downside of
this is that the dlt.log file is not reset so may become very large.

Reduced the number of DLT log messages to compare against the output.
Instead, only the most relevant lines are included for each test.

Added separate test that the Node Startup Controller registers itself.

Rewrote the descriptions for each test case to be more readable.

Numbered each test case.

Spelling and grammar fixes.

1 files changed, 102 insertions, 106 deletions

diff --git a/docs/reference/node-startup-controller/test-legacy-app-handling.xml b/docs/reference/node-startup-controller/test-legacy-app-handling.xml
index dd0d358..1bdbdc7 100644
--- a/docs/reference/node-startup-controller/test-legacy-app-handling.xml
+++ b/docs/reference/node-startup-controller/test-legacy-app-handling.xml
@@ -7,13 +7,13 @@
   <refmeta>
     <refentrytitle>Tests for legacy application handling</refentrytitle>
   </refmeta>
-  
+
   <refnamediv>
     <refname>Tests for legacy application handling</refname>
     <refpurpose>
-      How to verify that legacy app handler correctly registers the units as shutdown
+      How to verify that the legacy app handler correctly registers the units as shutdown
       consumers, and that it correctly shuts them down when the Node State manager dummy
-      tells them to.
+      tells it to.
     </refpurpose>
   </refnamediv>
 
@@ -23,11 +23,11 @@
       <title>Services units</title>
       <para>
         This test uses the "cups.service" and the "avahi-daemon.service" as units which
-        are going to be registering as shutdown consumers. This units might or might not
+        are going to be registered as shutdown consumers. These units may or may not
         exist in the system, but this does not affect to the result of the tests.
       </para>
     </refsect2>
-    
+
     <refsect2>
       <title>Starting the necessary services</title>
       <para>
@@ -38,6 +38,16 @@
       <programlisting>systemctl start nsm-dummy.service
 systemctl start node-startup-controller.service</programlisting>
     </refsect2>
+
+    <refsect2>
+      <title>Restarting the Node Startup Controller</title>
+      <para>
+        Between each test, the Node Startup Controller should be restarted to ensure that
+        it is available, and that no legacy apps are lingering from the last test. It can
+        be restarted with the following command:
+      </para>
+      <programlisting>systemctl restart node-startup-controller.service</programlisting>
+    </refsect2>
   </refsect1>
 
   <refsect1>
@@ -45,38 +55,67 @@ systemctl start node-startup-controller.service</programlisting>
     <para>
       The following test cases for LUC management are described in this document:
       <itemizedlist>
+        <listitem><para><xref linkend="test-lah-nsc-self-registers" endterm="test-lah-nsc-self-registers-title" /></para></listitem>
         <listitem><para><xref linkend="test-lah-register-fast-normal-consumers" endterm="test-lah-register-fast-normal-consumers-title" /></para></listitem>
         <listitem><para><xref linkend="test-lah-register-two-normal-consumers" endterm="test-lah-register-two-normal-consumers-title" /></para></listitem>
         <listitem><para><xref linkend="test-lah-reregister" endterm="test-lah-reregister-title" /></para></listitem>
         <listitem><para><xref linkend="test-lah-register-invalid-arguments" endterm="test-lah-register-invalid-arguments-title" /></para></listitem>
       </itemizedlist>
     </para>
-    <note>
-      All of these tests need to be executed atomically. After run one test the system
-      and the services should be restarted.
-    </note>
   </refsect1>
-  
+
+  <refsect1 id="test-lah-nsc-self-registers">
+    <title id="test-lah-nsc-self-registers-title">1. Node Startup Controller registers itself on startup</title>
+    <refsect2>
+      <title>Description</title>
+      <para>
+        Every GENIVI application that is managed by the Node State Manager must register
+        itself with the NSM as a shutdown client, and this includes the Node Startup
+        Controller. This test verifies that the Node Startup Controller registers itself
+        with the Node State Manager when it is started.
+      </para>
+    </refsect2>
+    <refsect2>
+      <title>Test commands</title>
+      <programlisting>kill -s HUP $(pidof nsm-dummy)</programlisting>
+    </refsect2>
+    <refsect2>
+      <title>Desired behaviour and output</title>
+      <para>
+        The DLT log should now contain the following log messages:
+      </para>
+      <informaltable><tgroup cols="3">
+        <thead>
+          <row><entry>APID</entry> <entry>CTID</entry> <entry>Payload</entry></row>
+        </thead>
+        <tbody>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutdown client registered: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/0 shutdown mode 1 timeout 1000]</entry></row>
+          <row><entry>NSC-</entry> <entry>CTRL</entry> <entry>[Successfully registered the node startup controller as a shutdown consumer]</entry></row>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutdown client unregistered: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/0]</entry></row>
+          <row><entry>NSC-</entry> <entry>CTRL</entry> <entry>[Successfully unregistered the node startup controller as a shutdown consumer]</entry></row>
+        </tbody>
+      </tgroup></informaltable>
+    </refsect2>
+  </refsect1>
+
   <refsect1 id="test-lah-register-fast-normal-consumers">
-    <title id="test-lah-register-fast-normal-consumers-title">Registration of a fast and a normal shutdown consumer</title>
+    <title id="test-lah-register-fast-normal-consumers-title">2. Registration of a fast and a normal shutdown consumer</title>
     <refsect2>
       <title>Description</title>
       <para>
-        Node Startup Controller registers itself as a normal shutdown consumer when it
-        starts; the Legacy App Handler registers shutdown consumers within the Node state
-        Manager; during shutdown process, the consumers are shutting down first the
-        shutdown consumer registered within "fast" mode and then shutdown consumer
-        registered within "normal" mode; each shutdown consumer is only shutting down for
-        its mode; every shutdown consumer is unregistered when it has been shutting down;
-        the Node Startup Controller unregisters itself as a shutdown consumer when it has
-        been shutting down.
+        Shutdown Consumers can be registered with two modes - fast and normal. Fast is
+        meant for vital applications which must be shut down gracefully, and normal
+        applies to everything else that requires a graceful shutdown. This test registers
+        shutdown consumers with either mode, and verifies that they are shut down by the
+        NSM dummy. The NSM dummy will shut down the fast consumers first, then the normal
+        consumers.
       </para>
     </refsect2>
     <refsect2>
       <title>Test commands</title>
       <programlisting>
-      /lib/node-startup-controller1/legacy-app-handler --unit "cups.service" -m 1
-      /lib/node-startup-controller1/legacy-app-handler --unit "avahi-daemon.service" -m 2
+      /lib/node-startup-controller-1/legacy-app-handler --unit "cups.service" -m 1
+      /lib/node-startup-controller-1/legacy-app-handler --unit "avahi-daemon.service" -m 2
       kill -s HUP $(pidof nsm-dummy)
       </programlisting>
     </refsect2>
@@ -90,61 +129,31 @@ systemctl start node-startup-controller.service</programlisting>
           <row><entry>APID</entry> <entry>CTID</entry> <entry>Payload</entry></row>
         </thead>
         <tbody>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutdown client registered: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/0 sutdown mode 1 timeout 1000]</entry></row>
-          <row><entry>NSC-</entry> <entry>CTRL</entry> <entry>[Successfully registered the node startup controller as a shutdown consumer]</entry></row>
           <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutdown client registered: bus name org.genivi.NodeStartupController1 object path /org/genivi/nodeStartupController1/ShutdownConsumer/1 shutdown mode 1 timeout 1000]</entry></row>
           <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutdown client registered: bus name org.genivi.NodeStartupController1 object path /org/genivi/nodeStartupController1/ShutdownConsumer/2 shutdown mode 2 timeout 1000]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down next client in queue]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/2 shutdown mode 2 timeout 1000: request id XXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shutdown: request id XXXXXXX bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/2 shutdown mode 2]</entry></row>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/2 shutdown mode 2 timeout 1000 request id XXXXXXX]</entry></row>
           <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id XXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMD</entry> <entry>[Finished shutting down client:request id XXXXXXX status 1]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down next client in queue]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Skipping client /org/genivi/NodeStartupController1/ShutdownConsumer/1 as it is not registered for shutdown mode 2]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down next client in queue]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Skipping client /org/genivi/NodeStartupController1/ShutdownConsumer/0 as it is not registered for shutdown mode 2]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down next client in queue]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Processed all items in the queue for this mode]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Transitioning to normal shutdown mode]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Skipping client /org/genivi/NodeStartupController1/ShutdownConsumer/2 as it is not registered for shutdown mode 1]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down next client in queue]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/0 shutdown mode 1 time out 1000: request id YYYYYYY]</entry></row>
-          <row><entry>NSC-</entry>  <entry>LAH-</entry>  <entry>[Successfully notified NSM about completed lifecycle request: request id XXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shutdown: request id YYYYYYY bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/0 shutdown mode 1]</entry></row>
-         <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id YYYYYYY]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMD</entry> <entry>[Finished shutting down client:request id YYYYYYY status 1]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down next client in queue]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/0 shutdown mode 1 time out 1000: request id 3557696]</entry></row>
-          <row><entry>NSC-</entry>  <entry>LAH-</entry>  <entry>[Successfully notified NSM about completed lifecycle request: request id YYYYYYY]</entry></row>
-          <row><entry>NSMC</entry> <entry>NSMD</entry> <entry>[Shutdown client unregistered: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShudownConsumer/1]</entry></row>        
-          <row><entry>NSMC</entry> <entry>NSMD</entry> <entry>[Shutdown client unregistered: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShudownConsumer/2]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Successfully shutdown a client: bus name org.genivi.NodeStrartupController1 object path /org/genivi/NodeStraruController1/ShutdownConsumer/0 shutdown mode 1]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down next client in queue]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Processed all items in the queue for this mode]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[All clients have been shut down]</entry></row>
-          <row><entry>NSMC</entry> <entry>NSMD</entry> <entry>[Shutdown client unregistered: bus name org.genivi.NodeStartupController1 object path
-          /org/genivi/NodeStartupController1/ShudownConsumer/0]</entry></row>
-          <row><entry>NSC-</entry> <entry>CTRL</entry> <entry>[Successfully unregistered the node startu controller as a shutdown consumer]</entry></row>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/1 shutdown mode 1 timeout 1000 request id YYYYYYY]</entry></row>
+          <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id YYYYYYY]</entry></row>
         </tbody>
       </tgroup></informaltable>
     </refsect2>
   </refsect1>
-  
+
     <refsect1 id="test-lah-register-two-normal-consumers">
-    <title id="test-lah-register-two-normal-consumers-title">Registration of two normal shutdown consumers</title>
+    <title id="test-lah-register-two-normal-consumers-title">3. Registration of two normal shutdown consumers</title>
     <refsect2>
       <title>Description</title>
       <para>
-        The Legacy App Handler registers two "normal" shutdown consumers within the Node
-        state Manager; during shutdown process, the consumers are shutting down in
-        reverse order of registration;
+        The Node State Manager shuts down consumers in reverse order of their registration.
+        This test verifies this by registering the consumers with the same mode.
       </para>
     </refsect2>
     <refsect2>
       <title>Test commands</title>
       <programlisting>
-      /lib/node-startup-controller1/legacy-app-handler --unit "cups.service" -m 1
-      /lib/node-startup-controller1/legacy-app-handler --unit "avahi-daemon.service" -m 1
+      /lib/node-startup-controller-1/legacy-app-handler --unit "cups.service" -m 1
+      /lib/node-startup-controller-1/legacy-app-handler --unit "avahi-daemon.service" -m 1
       kill -s HUP $(pidof nsm-dummy)
       </programlisting>
     </refsect2>
@@ -160,42 +169,32 @@ systemctl start node-startup-controller.service</programlisting>
         <tbody>
           <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutdown client registered: bus name org.genivi.NodeStartupController1 object path /org/genivi/nodeStartupController1/ShutdownConsumer/1 shutdown mode 1 timeout 1000]</entry></row>
           <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutdown client registered: bus name org.genivi.NodeStartupController1 object path /org/genivi/nodeStartupController1/ShutdownConsumer/2 shutdown mode 1 timeout 1000]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/2 shutdown mode 1 timeout 1000: request id XXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shutdown: request id XXXXXXX bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/2 shutdown mode 1]</entry></row>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/2 shutdown mode 1 timeout 1000 request id XXXXXXX]</entry></row>
           <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id XXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMD</entry> <entry>[Finished shutting down client:request id XXXXXXX status 1]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down next client in queue]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path
-          /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 1 time out 1000: request id YYYYYYY]</entry></row>
-          <row><entry>NSC-</entry>  <entry>LAH-</entry>  <entry>[Successfully notified NSM about completed lifecycle request: request id XXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shutdown: request id YYYYYYY bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 1]</entry></row>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/1 shutdown mode 1 timeout 1000 request id YYYYYYY]</entry></row>
           <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id YYYYYYY]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMD</entry> <entry>[Finished shutting down client:request id YYYYYYY status 1]</entry></row>
-          <row><entry>NSC-</entry>  <entry>LAH-</entry>  <entry>[Successfully notified NSM about completed lifecycle request: request id YYYYYYY]</entry></row>
-          <row><entry>NSMC</entry> <entry>NSMD</entry> <entry>[Shutdown client unregistered: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShudownConsumer/1]</entry></row>
-          <row><entry>NSMC</entry> <entry>NSMD</entry> <entry>[Shutdown client unregistered: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShudownConsumer/2]</entry></row>
         </tbody>
       </tgroup></informaltable>
     </refsect2>
   </refsect1>
-  
+
   <refsect1 id="test-lah-reregister">
-    <title id="test-lah-reregister-title">Registration of the same unit twice with different modes and timeouts</title>
+    <title id="test-lah-reregister-title">4. Registration of the same unit twice with different modes and timeouts</title>
     <refsect2>
       <title>Description</title>
       <para>
-        The Legacy App Handler registers twice the same unit as a shutdown consumers
-        within the Node state Manager with different modes and timeouts. Verifies that
-        the unit is re-registered being its final mode is a combination between fast and
-        normal and its timeout corresponds to the last registration; during the process
-        of shutting down this consumer is shutting down for both modes.
+        The Legacy App Handler handles repeated registration (i.e. with different modes)
+        by registering the old shutdown consumer with the Node State Manager again. The
+        Node State Manager will register any new modes with itself, and use the new
+        timeout. This test verifies that registering with separate modes will shut the app
+        down in both modes with the new timeout.
       </para>
     </refsect2>
     <refsect2>
       <title>Test commands</title>
       <programlisting>
-      /lib/node-startup-controller1/legacy-app-handler --unit "cups.service" -m 1 -t 1500
-      /lib/node-startup-controller1/legacy-app-handler --unit "cups.service" -m 2 -t 500
+      /lib/node-startup-controller-1/legacy-app-handler --unit "cups.service" -m 1 -t 1500
+      /lib/node-startup-controller-1/legacy-app-handler --unit "cups.service" -m 2 -t 500
       kill -s HUP $(pidof nsm-dummy)
       </programlisting>
     </refsect2>
@@ -210,43 +209,40 @@ systemctl start node-startup-controller.service</programlisting>
         </thead>
         <tbody>
           <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutdown client registered: bus name org.genivi.NodeStartupController1 object path /org/genivi/nodeStartupController1/ShutdownConsumer/1 shutdown mode 1 timeout 1500]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Re-registered shutdown client: bus name org.genivi.NodeStartupController1 object path
-          /org/genivi/nodeStartupController1/ShutdownConsumer/1 shutdown mode 3 timeout 500]</entry></row>
-<row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 3 time out 500: request id XXXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shutdown: request id XXXXXXXX bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 2]</entry></row>
-          <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id XXXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMD</entry> <entry>[Finished shutting down client:request id XXXXXXXX status 1]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down next client in queue]</entry></row>
-          <row><entry>NSC-</entry>  <entry>LAH-</entry>  <entry>[Successfully notified NSM about completed lifecycle request: request id XXXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Processed all items in the queue for this mode]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Transitioning to normal shutdown mode]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 3 time out 500: request id XXXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shutdown: request id XXXXXXXX bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 1]</entry></row>
-          <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id XXXXXXXX]</entry></row>
-          <row><entry>NSMD</entry> <entry>NSMD</entry> <entry>[Finished shutting down client:request id XXXXXXXX status 1]</entry></row>
-          <row><entry>NSC-</entry>  <entry>LAH-</entry>  <entry>[Successfully notified NSM about completed lifecycle request: request id XXXXXXXX]</entry></row>              
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Re-registered shutdown client: bus name org.genivi.NodeStartupController1 object path /org/genivi/nodeStartupController1/ShutdownConsumer/1 new shutdown mode 3 new timeout 500]</entry></row>
+
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/1 shutdown mode 3 timeout 1000 request id XXXXXXX]</entry></row>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shut down: request id XXXXXXX bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 2]</entry></row>
+          <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id XXXXXXX]</entry></row>
+
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/1 shutdown mode 3 timeout 1000 request id XXXXXXX]</entry></row>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shut down: request id XXXXXXX bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 1]</entry></row>
+          <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id XXXXXXX]</entry></row>
         </tbody>
       </tgroup></informaltable>
     </refsect2>
   </refsect1>
-  
+
   <refsect1 id="test-lah-register-invalid-arguments">
-    <title id="test-lah-register-invalid-arguments-title">Registration with invalid parameters</title>
+    <title id="test-lah-register-invalid-arguments-title">5. Registration with invalid parameters</title>
     <refsect2>
       <title>Description</title>
       <para>
-        The Legacy App Handler tries to regigster a shutdown consumer with invalid
-        parameters. Tries to register a shutdown consumer without unit name, other within
-        mode 0 and other with negative timeout. Verifies that the previous examples of
-        registration fail.
+        The Legacy App Handler validates against the following rules:
+        <itemizedlist>
+          <listitem>There must be a unit name</listitem>
+          <listitem>The mode must be a combination of normal and fast, only (i.e. 1, 2 or 3)</listitem>
+          <listitem>The timeout must be non-negative</listitem>
+        </itemizedlist>
+        This test verifies that invalid input causes an error.
       </para>
     </refsect2>
     <refsect2>
       <title>Test commands</title>
       <programlisting>
-      /lib/node-startup-controller1/legacy-app-handler --unit
-      /lib/node-startup-controller1/legacy-app-handler --unit cups.service -m 0
-      /lib/node-startup-controller1/legacy-app-handler --unit cups.service -m 1 -t -2000 
+      /lib/node-startup-controller-1/legacy-app-handler --unit
+      /lib/node-startup-controller-1/legacy-app-handler --unit cups.service -m 0
+      /lib/node-startup-controller-1/legacy-app-handler --unit cups.service -m 1 -t -2000
       </programlisting>
     </refsect2>
      <refsect2>
@@ -266,5 +262,5 @@ systemctl start node-startup-controller.service</programlisting>
       </tgroup></informaltable>
     </refsect2>
   </refsect1>
-  
+
 </refentry>